From 59a2956ce100664c9d97c75d8302b8d291908384 Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Wed, 4 Dec 2024 15:13:09 -0500 Subject: [PATCH 1/6] CONCD-1007 in a larger browser window, fill the entire screen --- concordia/static/scss/base.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/concordia/static/scss/base.scss b/concordia/static/scss/base.scss index a5369c1db..31d428bff 100644 --- a/concordia/static/scss/base.scss +++ b/concordia/static/scss/base.scss @@ -147,9 +147,13 @@ $bg-not-started: #fff; /* stylelint-disable-next-line color-function-notation */ $shadow-color: rgba(51, 51, 51, 80%); /* #333333 */ -html { +.container { @include media-breakpoint-up(xl) { - width: 1200px; + max-width: 1200px; + } + + @include media-breakpoint-up(xxl) { + max-width: 1400px; } } From 26a97818d008c78bc6da925a1f902640bc159415 Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Wed, 4 Dec 2024 15:26:36 -0500 Subject: [PATCH 2/6] CONCD-1007 Invert filter slider should be centered --- .../templates/transcriptions/asset_detail/viewer_filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concordia/templates/transcriptions/asset_detail/viewer_filters.html b/concordia/templates/transcriptions/asset_detail/viewer_filters.html index b636aa152..85a3b7aaf 100644 --- a/concordia/templates/transcriptions/asset_detail/viewer_filters.html +++ b/concordia/templates/transcriptions/asset_detail/viewer_filters.html @@ -70,7 +70,7 @@
-
+
From 70a77d3140a3dba6bc6643c4376666fe554073ac Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Wed, 4 Dec 2024 15:56:33 -0500 Subject: [PATCH 3/6] CONCD-1007 Invert filter slider should be on the same vertical line as the label text --- .../templates/transcriptions/asset_detail/viewer_filters.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/concordia/templates/transcriptions/asset_detail/viewer_filters.html b/concordia/templates/transcriptions/asset_detail/viewer_filters.html index 85a3b7aaf..1464009f6 100644 --- a/concordia/templates/transcriptions/asset_detail/viewer_filters.html +++ b/concordia/templates/transcriptions/asset_detail/viewer_filters.html @@ -68,9 +68,9 @@
-
+ -
+
From b1844ba05bec40540629e79ff8ea587583837419 Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Thu, 5 Dec 2024 09:52:46 -0500 Subject: [PATCH 4/6] CONCD-1007 trying to fix another issue where the status goes missing --- concordia/static/js/src/contribute.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/concordia/static/js/src/contribute.js b/concordia/static/js/src/contribute.js index 522de45c0..557716965 100644 --- a/concordia/static/js/src/contribute.js +++ b/concordia/static/js/src/contribute.js @@ -339,9 +339,8 @@ function setupPage() { .done(function (data) { $('#transcription-status-display') .children() - .attr('hidden', 'hidden') - .filter('#display-submitted') - .removeAttr('hidden'); + .attr('hidden', 'hidden'); + $('#display-submitted').removeAttr('hidden'); let messageChildren = $( '#transcription-status-display', ).children(); From 6919963ff4f959839c2d87fa9ba7bbeca299ab5f Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Thu, 5 Dec 2024 11:23:27 -0500 Subject: [PATCH 5/6] CONCD-1007 fixing a bug in the previous commit --- concordia/static/js/src/contribute.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concordia/static/js/src/contribute.js b/concordia/static/js/src/contribute.js index 557716965..fbab6ccc0 100644 --- a/concordia/static/js/src/contribute.js +++ b/concordia/static/js/src/contribute.js @@ -340,7 +340,6 @@ function setupPage() { $('#transcription-status-display') .children() .attr('hidden', 'hidden'); - $('#display-submitted').removeAttr('hidden'); let messageChildren = $( '#transcription-status-display', ).children(); @@ -348,6 +347,7 @@ function setupPage() { .attr('hidden', 'hidden') .filter('#message-submitted') .removeAttr('hidden'); + $('#display-submitted').removeAttr('hidden'); messageChildren .filter('#message-contributors') .removeAttr('hidden') From 9569a2f61f42d4705afc6f127971ec594bcc9ed5 Mon Sep 17 00:00:00 2001 From: Rajit Sarkar Date: Thu, 5 Dec 2024 15:04:59 -0500 Subject: [PATCH 6/6] CONCD-1007 trying to revert our carousel dimensions to what it was (before the bootstrap upgrade) --- concordia/static/scss/base.scss | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/concordia/static/scss/base.scss b/concordia/static/scss/base.scss index 31d428bff..2d75f995e 100644 --- a/concordia/static/scss/base.scss +++ b/concordia/static/scss/base.scss @@ -147,16 +147,6 @@ $bg-not-started: #fff; /* stylelint-disable-next-line color-function-notation */ $shadow-color: rgba(51, 51, 51, 80%); /* #333333 */ -.container { - @include media-breakpoint-up(xl) { - max-width: 1200px; - } - - @include media-breakpoint-up(xxl) { - max-width: 1400px; - } -} - html, #contribute-main-content { background-color: $white; @@ -1112,7 +1102,7 @@ body .disabled > .page-link { #homepage-carousel { @include media-breakpoint-up(xl) { - max-width: 1200px; + max-width: 1140px; } }