Skip to content

Commit

Permalink
CONCD-924 additional fixes (#2534)
Browse files Browse the repository at this point in the history
* CONCD-924 used bootstrap-5-migrate-tool to update templates

* CONCD-924 only import components we need

* CONCD-924 updated django templates

* CONCD-924 a few more components that we need (nav, dropdown, etc.)

* CONCD-924 updating Pipfile.lock

* CONCD-924 updated unit tests

* CONCD-924 various fixes for bootstrap changes

* CONCD-924 additional fixes for bootstrap changes

* CONCD-924 still more fixes for bootsrap 5 (WiP)

* CONCD-924 close button should be white

* CONCD-924 close buttons

* CONCD-924 contrast between foreground and background colors
  • Loading branch information
rasarkar authored Sep 23, 2024
1 parent a7bbfaa commit aed4615
Show file tree
Hide file tree
Showing 15 changed files with 451 additions and 141 deletions.
3 changes: 2 additions & 1 deletion concordia/static/js/src/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function displayHtmlMessage(level, message, uniqueId) {
/*
Display a dismissable message at a level which will match one of the
Bootstrap alert classes
(https://getbootstrap.com/docs/4.1/components/alerts/)
(https://getbootstrap.com/docs/5.3/components/alerts/)
If provided, uniqueId will be used to remove any existing elements which
have that ID, allowing old messages to be replaced automatically.
Expand Down Expand Up @@ -298,6 +298,7 @@ $twitterShareButton.on('click', function () {
return true;
});

// eslint-disable-next-line no-unused-vars
function trackUIInteraction(element, category, action, label) {
if ('loc_ux_tracking' in window) {
let loc_ux_tracking = window['loc_ux_tracking'];
Expand Down
26 changes: 14 additions & 12 deletions concordia/static/js/src/guide.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,20 @@ $('#open-guide').on('click', openOffcanvas);

$('#close-guide').on('click', closeOffcanvas);

$('#guide-carousel')
.carousel({
interval: false,
wrap: false,
})
.on('slide.bs.carousel', function (event) {
if (event.to == 0) {
$('#guide-bars').addClass('d-none');
} else {
$('#guide-bars').removeClass('d-none');
}
});
$(function () {
$('#guide-carousel')
.carousel({
interval: false,
wrap: false,
})
.on('slide.bs.carousel', function (event) {
if (event.to == 0) {
$('#guide-bars-col').addClass('d-none');
} else {
$('#guide-bars-col').removeClass('d-none');
}
});
});

$('#previous-card').hide();

Expand Down
4 changes: 2 additions & 2 deletions concordia/static/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ $theme-colors: (
'primary': $primary,
);

$link-color: theme-color('primary');
$link-hover-color: darken($link-color, 15%);
$link-color: map.get($theme-colors, 'primary');
$link-hover-color: color.adjust($link-color, $lightness: 15%);

$kbd-color: $gray-900;
$kbd-bg: $gray-200;
Expand Down
Loading

0 comments on commit aed4615

Please sign in to comment.