-
Notifications
You must be signed in to change notification settings - Fork 30
Bootstrap 5 #265
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Bootstrap 5 #265
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
4b05169
updated imports for bs5, removed themeswitcher
pikachu0542 096fad1
fixed profile image size
pikachu0542 b58da75
fixed role badges
pikachu0542 e70f9e8
fixed name of var to look for in .env
pikachu0542 20327d9
fixed script link
pikachu0542 5dfbf28
bump to bootstrap 5.3.11, fix navbar
pikachu0542 bf30542
fixed image upload
pikachu0542 869544a
add logo to use in navbar
pikachu0542 944f60c
changed inline styles to bootstrap classes (and a tiny bit of custom …
pikachu0542 30565c0
fixed a couple position badges
pikachu0542 936b2f7
updated listing pages
pikachu0542 4bbff66
a couple misc fixes
pikachu0542 eba2896
fixed searchbar being off center on listing pages
pikachu0542 ca82e3c
Converted indentation to 4 spaces
pikachu0542 cccddb5
Updated search style, vertical centered title text
pikachu0542 4ca476d
Custom css classes for each ldap group badge
pikachu0542 e1f6790
Added color modes
pikachu0542 92d56d4
Fixed theme switcher in mobile navbar
pikachu0542 98f3aa5
addressed feedback
pikachu0542 8228079
fixed bg on other pages
pikachu0542 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,55 @@ | ||
| <head> | ||
|
|
||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content="Computer Science House"> | ||
|
|
||
| <title>CSH Profiles</title> | ||
|
|
||
| <link rel="manifest" href="/static/manifest.json"> | ||
| <meta name="theme-color" href="https://themeswitcher.csh.rit.edu/api/colour"> | ||
| <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}"> | ||
|
|
||
| <link rel="stylesheet" type="text/css" | ||
| href="https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css"> | ||
| <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.16/css/dataTables.bootstrap4.min.css"> | ||
|
|
||
|
|
||
| <!-- <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css"> --> | ||
| <link href="https://cdn.datatables.net/v/bs5/dt-3.0.2/rg-2.0.0/datatables.min.css" rel="stylesheet" integrity="sha384-Fz1bxJyFg3EBy0ujYq4j/XF5Ow3QmJNNjSaAHRT+fIz+d3EymzrRRXUa57NREved" crossorigin="anonymous"> | ||
|
|
||
| <!-- Bootstrap core CSS --> | ||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" | ||
| integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> | ||
| <link rel="stylesheet" href="https://themeswitcher.csh.rit.edu/api/get" media="screen"> | ||
|
|
||
| <link rel="stylesheet" href="https://assets.csh.rit.edu/csh-material-bootstrap/5.3.11/dist/css/csh-material-bootstrap.min.css" media="screen"> | ||
| <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.13.1/font/bootstrap-icons.min.css"> | ||
|
|
||
| <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet"/> | ||
|
|
||
| <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> | ||
|
|
||
| <link rel="stylesheet" href="/static/style.css"> | ||
|
|
||
| <script defer src="https://use.fontawesome.com/releases/v5.0.9/js/all.js"></script> | ||
|
|
||
| <script> | ||
| (function(h,o,u,n,d) { | ||
| h = h[d] = h[d] || { q: [], onReady: function (c) { h.q.push(c) } } | ||
| d = o.createElement(u); d.async = 1; d.src = n; d.crossOrigin='' | ||
| n = o.getElementsByTagName(u)[0]; n.parentNode.insertBefore(d, n) | ||
| })(window, document, 'script', 'https://www.datadoghq-browser-agent.com/us1/v6/datadog-rum.js', 'DD_RUM') | ||
|
|
||
| window.DD_RUM.onReady(function () { | ||
| window.DD_RUM.init({ | ||
| applicationId: '65be0cac-59ab-4ad7-8c23-5a3e577893fe', | ||
| clientToken: 'pub2f0696fe063adeb0dc204547f4584f55', | ||
| site: 'datadoghq.com', | ||
| service: 'profiles', | ||
| env: '{{ DATADOG_ENV }}', | ||
| version: '{{ DATADOG_APP_VERSION }}', | ||
| sessionSampleRate: 100, // capture 100% of sessions | ||
| sessionReplaySampleRate: 100, // capture 100% of sessions with replay | ||
| trackResources: true, // Enable Resource tracking | ||
| trackUserInteractions: true, // Enable Action tracking | ||
| trackLongTasks: true, // Enable Long Tasks tracking | ||
|
|
||
| allowedTracingUrls: [ 'http://localhost:8080', 'https://profiles.csh.rit.edu', 'https://profiles-dev.csh.rit.edu'], | ||
| defaultPrivacyLevel: 'mask-user-input', | ||
| (function(h,o,u,n,d) { | ||
| h = h[d] = h[d] || { q: [], onReady: function (c) { h.q.push(c) } } | ||
| d = o.createElement(u); d.async = 1; d.src = n; d.crossOrigin='' | ||
| n = o.getElementsByTagName(u)[0]; n.parentNode.insertBefore(d, n) | ||
| })(window, document, 'script', 'https://www.datadoghq-browser-agent.com/us1/v6/datadog-rum.js', 'DD_RUM') | ||
|
|
||
| window.DD_RUM.onReady(function () { | ||
| window.DD_RUM.init({ | ||
| applicationId: '65be0cac-59ab-4ad7-8c23-5a3e577893fe', | ||
| clientToken: 'pub2f0696fe063adeb0dc204547f4584f55', | ||
| site: 'datadoghq.com', | ||
| service: 'profiles', | ||
| env: '{{ DATADOG_ENV }}', | ||
| version: '{{ DATADOG_APP_VERSION }}', | ||
| sessionSampleRate: 100, // capture 100% of sessions | ||
| sessionReplaySampleRate: 100, // capture 100% of sessions with replay | ||
| trackResources: true, // Enable Resource tracking | ||
| trackUserInteractions: true, // Enable Action tracking | ||
| trackLongTasks: true, // Enable Long Tasks tracking | ||
|
|
||
| allowedTracingUrls: [ 'http://localhost:8080', 'https://profiles.csh.rit.edu', 'https://profiles-dev.csh.rit.edu'], | ||
| defaultPrivacyLevel: 'mask-user-input', | ||
| }); | ||
| }); | ||
| }); | ||
| </script> | ||
|
|
||
| </head> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.