From 96cc04777350bcf02f8a0f9228884bfaed27fa2e Mon Sep 17 00:00:00 2001 From: Adam Butterworth Date: Thu, 27 May 2021 13:45:33 -0400 Subject: [PATCH 1/6] fix: upgrade bootstrap to 4.6.0 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index dc9b4f21e1be..36cdd53c939d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2182,9 +2182,9 @@ "dev": true }, "bootstrap": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0.tgz", - "integrity": "sha512-gulJE5dGFo6Q61V/whS6VM4WIyrlydXfCgkE+Gxe5hjrJ8rXLLZlALq7zq2RPhOc45PSwQpJkrTnc2KgD6cvmA==" + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", + "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==" }, "brace-expansion": { "version": "1.1.11", diff --git a/package.json b/package.json index 4b7ec1e81f4f..f2e0b6fe10cb 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "backbone": "1.4.0", "backbone-associations": "0.6.2", "backbone.paginator": "2.0.8", - "bootstrap": "4.0.0", + "bootstrap": "^4.6.0", "camelize": "1.0.0", "classnames": "2.2.5", "css-loader": "0.28.8", From 47d9af0258269de140db1ba76d81b48c9ce5752e Mon Sep 17 00:00:00 2001 From: Adam Butterworth Date: Thu, 27 May 2021 13:46:14 -0400 Subject: [PATCH 2/6] import all bootstrap mixins in build Do this since some mixins in bootstrap depend on others --- lms/static/sass/base/_build.scss | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/lms/static/sass/base/_build.scss b/lms/static/sass/base/_build.scss index 3aa8501618df..25ff94e94a5c 100644 --- a/lms/static/sass/base/_build.scss +++ b/lms/static/sass/base/_build.scss @@ -7,18 +7,7 @@ @import 'bootstrap/variables'; @import 'bootstrap/scss/functions'; @import 'bootstrap/scss/variables'; -@import 'bootstrap/scss/mixins/background-variant'; -@import 'bootstrap/scss/mixins/box-shadow'; -@import 'bootstrap/scss/mixins/breakpoints'; -@import 'bootstrap/scss/mixins/float'; -@import 'bootstrap/scss/mixins/grid'; -@import 'bootstrap/scss/mixins/hover'; -@import 'bootstrap/scss/mixins/reset-text'; -@import 'bootstrap/scss/mixins/screen-reader'; -@import 'bootstrap/scss/mixins/text-truncate'; -@import 'bootstrap/scss/mixins/text-emphasis'; -@import 'bootstrap/scss/mixins/text-hide'; -@import 'bootstrap/scss/mixins/visibility'; +@import 'bootstrap/scss/mixins'; @import 'bootstrap/scss/utilities'; From 03f2c14130a6a6ff87eb556b3e205b167ce55162 Mon Sep 17 00:00:00 2001 From: Adam Butterworth Date: Thu, 27 May 2021 13:47:01 -0400 Subject: [PATCH 3/6] update includes of border-radius The mixin changed to accept a single parameter --- cms/static/sass/views/_updates.scss | 2 +- lms/static/sass/course/courseware/_sidebar.scss | 2 +- lms/static/sass/discussion/_mixins.scss | 4 ++-- lms/static/sass/discussion/elements/_actions.scss | 2 +- lms/static/sass/discussion/elements/_navigation.scss | 2 +- lms/static/sass/discussion/views/_response.scss | 8 ++++---- lms/static/sass/discussion/views/_thread.scss | 2 +- lms/static/sass/multicourse/_home.scss | 2 +- lms/static/sass/shared/_header.scss | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cms/static/sass/views/_updates.scss b/cms/static/sass/views/_updates.scss index 96e3129c328a..cfc87f874132 100644 --- a/cms/static/sass/views/_updates.scss +++ b/cms/static/sass/views/_updates.scss @@ -196,7 +196,7 @@ padding: 20px 30px; margin: 0; - @include border-radius(0, 3px, 3px, 0); + @include border-radius(0 3px 3px 0); @include border-left(none); background: $uxpl-light-blue-base; diff --git a/lms/static/sass/course/courseware/_sidebar.scss b/lms/static/sass/course/courseware/_sidebar.scss index b0c948933482..b8b0ec06b74b 100644 --- a/lms/static/sass/course/courseware/_sidebar.scss +++ b/lms/static/sass/course/courseware/_sidebar.scss @@ -1,7 +1,7 @@ .course-index { @include transition(all 0.2s $ease-in-out-quad 0s); @include border-right(1px solid $border-color-2); - @include border-radius(3px, 0, 0, 3px); + @include border-radius(3px 0 0 3px); display: table-cell; // needed to extend the sidebar the full height of the area diff --git a/lms/static/sass/discussion/_mixins.scss b/lms/static/sass/discussion/_mixins.scss index abe967621b06..ad0af430cdfe 100644 --- a/lms/static/sass/discussion/_mixins.scss +++ b/lms/static/sass/discussion/_mixins.scss @@ -29,7 +29,7 @@ } @mixin discussion-wmd-input { - @include border-radius($forum-border-radius, $forum-border-radius, 0, 0); + @include border-radius($forum-border-radius $forum-border-radius 0 0); box-sizing: border-box; margin-top: 0; @@ -44,7 +44,7 @@ } @mixin discussion-wmd-preview-container { - @include border-radius(0, 0, $forum-border-radius, $forum-border-radius); + @include border-radius(0 0 $forum-border-radius $forum-border-radius); box-sizing: border-box; border: 1px solid $forum-color-border; diff --git a/lms/static/sass/discussion/elements/_actions.scss b/lms/static/sass/discussion/elements/_actions.scss index 91b6ee7ec2b9..16bd522cbe46 100644 --- a/lms/static/sass/discussion/elements/_actions.scss +++ b/lms/static/sass/discussion/elements/_actions.scss @@ -162,7 +162,7 @@ } .action-icon { - @include border-radius(0, $forum-border-radius, $forum-border-radius, 0); + @include border-radius(0 $forum-border-radius $forum-border-radius 0); } } diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss index ddce06225a76..dc6207ad038c 100644 --- a/lms/static/sass/discussion/elements/_navigation.scss +++ b/lms/static/sass/discussion/elements/_navigation.scss @@ -115,7 +115,7 @@ .forum-nav-refine-bar { @include clearfix(); - @include border-radius($forum-border-radius, $forum-border-radius, 0, 0); + @include border-radius($forum-border-radius $forum-border-radius 0 0); font-size: $forum-small-font-size; border-bottom: 1px solid $forum-color-border; diff --git a/lms/static/sass/discussion/views/_response.scss b/lms/static/sass/discussion/views/_response.scss index d995aefa9ffb..a41d25271758 100644 --- a/lms/static/sass/discussion/views/_response.scss +++ b/lms/static/sass/discussion/views/_response.scss @@ -32,7 +32,7 @@ .discussion-response { box-sizing: border-box; - @include border-radius($forum-border-radius, $forum-border-radius, 0, 0); + @include border-radius($forum-border-radius $forum-border-radius 0 0); padding: $baseline; background-color: $forum-color-background; @@ -98,7 +98,7 @@ // CASE: banner - staff response .staff-banner { - @include border-radius($forum-border-radius, $forum-border-radius, 0, 0); + @include border-radius($forum-border-radius $forum-border-radius 0 0); @include left(0); position: absolute; @@ -115,7 +115,7 @@ // CASE: banner - community TA response .community-ta-banner { - @include border-radius($forum-border-radius, $forum-border-radius, 0, 0); + @include border-radius($forum-border-radius $forum-border-radius 0 0); @include left(0); position: absolute; @@ -144,7 +144,7 @@ .discussion .comments { @extend %ui-no-list; - @include border-radius(0, 0, $forum-border-radius, $forum-border-radius); + @include border-radius(0 0 $forum-border-radius $forum-border-radius); background: theme-color("lightest"); box-shadow: 0 1px 3px -1px $shadow inset; diff --git a/lms/static/sass/discussion/views/_thread.scss b/lms/static/sass/discussion/views/_thread.scss index baa81109474a..255e5b20cb19 100644 --- a/lms/static/sass/discussion/views/_thread.scss +++ b/lms/static/sass/discussion/views/_thread.scss @@ -217,7 +217,7 @@ @include transition(all 0.2s linear 0s); .thread-wrapper { - @include border-radius($forum-border-radius, $forum-border-radius, 0, 0); + @include border-radius($forum-border-radius $forum-border-radius 0 0); position: relative; overflow-x: hidden; diff --git a/lms/static/sass/multicourse/_home.scss b/lms/static/sass/multicourse/_home.scss index 3ca7761fc722..3e0e8a89e579 100644 --- a/lms/static/sass/multicourse/_home.scss +++ b/lms/static/sass/multicourse/_home.scss @@ -140,7 +140,7 @@ $course-search-input-height: ($button-size); .search-button { @include right($baseline*1.5); - @include border-radius(1px, 3px, 3px, 1px); + @include border-radius(1px 3px 3px 1px); @extend %ui-depth2; @extend %t-icon3; diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index 898933685b26..3e718ff32909 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -561,7 +561,7 @@ &:last-child { > a { - @include border-radius(0, 4px, 4px, 0); + @include border-radius(0 4px 4px 0); @include border-left(none); padding: ($baseline/2) ($baseline/2); From 228e1211632853211f655fa186b9f98b0361bdd8 Mon Sep 17 00:00:00 2001 From: Adam Butterworth Date: Fri, 28 May 2021 09:44:14 -0400 Subject: [PATCH 4/6] increase contrast of all topics button in discussions --- lms/static/sass/bootstrap/_components.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/static/sass/bootstrap/_components.scss b/lms/static/sass/bootstrap/_components.scss index 64282e83fc4e..be6ede842ccf 100644 --- a/lms/static/sass/bootstrap/_components.scss +++ b/lms/static/sass/bootstrap/_components.scss @@ -92,6 +92,7 @@ .all-topics { border: none; + color: $primary; } } From efb3833aaf2f3acbf01fd0a72b884b71183770b0 Mon Sep 17 00:00:00 2001 From: Adam Butterworth Date: Fri, 28 May 2021 10:10:06 -0400 Subject: [PATCH 5/6] Update _shame.scss --- lms/static/sass/discussion/utilities/_shame.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/static/sass/discussion/utilities/_shame.scss b/lms/static/sass/discussion/utilities/_shame.scss index b1cdb031f9b7..a043a71008fa 100644 --- a/lms/static/sass/discussion/utilities/_shame.scss +++ b/lms/static/sass/discussion/utilities/_shame.scss @@ -9,6 +9,7 @@ .all-topics { font-size: 14px; + color: $primary; .fa { @include margin-right(10px); From cbe8d881c4b9253626303073baa47a9d9139dcf0 Mon Sep 17 00:00:00 2001 From: Adam Butterworth Date: Fri, 28 May 2021 10:12:56 -0400 Subject: [PATCH 6/6] remove background of all-topics button instead --- lms/static/sass/bootstrap/_components.scss | 1 + lms/static/sass/discussion/utilities/_shame.scss | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/static/sass/bootstrap/_components.scss b/lms/static/sass/bootstrap/_components.scss index be6ede842ccf..50cb5893b6e4 100644 --- a/lms/static/sass/bootstrap/_components.scss +++ b/lms/static/sass/bootstrap/_components.scss @@ -93,6 +93,7 @@ .all-topics { border: none; color: $primary; + background-color: transparent; } } diff --git a/lms/static/sass/discussion/utilities/_shame.scss b/lms/static/sass/discussion/utilities/_shame.scss index a043a71008fa..b1cdb031f9b7 100644 --- a/lms/static/sass/discussion/utilities/_shame.scss +++ b/lms/static/sass/discussion/utilities/_shame.scss @@ -9,7 +9,6 @@ .all-topics { font-size: 14px; - color: $primary; .fa { @include margin-right(10px);