diff --git a/cms/static/sass/bootstrap/_components.scss b/cms/static/sass/bootstrap/_components.scss index 14e816f5bc16..98f25b8ff6af 100644 --- a/cms/static/sass/bootstrap/_components.scss +++ b/cms/static/sass/bootstrap/_components.scss @@ -70,8 +70,8 @@ list-style: none; .cta-show-sock { - @extend %ui-btn-pill; - @extend %t-action4; + @extend %ui-btn-pill !optional; + @extend %t-action4 !optional; background: theme-color("light"); padding: ($baseline/2) $baseline; @@ -145,7 +145,7 @@ display: block; .icon { - @extend %t-icon4; + @extend %t-icon4 !optional; vertical-align: middle; margin-right: $baseline/4; diff --git a/cms/static/sass/bootstrap/_footer.scss b/cms/static/sass/bootstrap/_footer.scss index 985a741f0d26..f7a84aa83673 100644 --- a/cms/static/sass/bootstrap/_footer.scss +++ b/cms/static/sass/bootstrap/_footer.scss @@ -13,7 +13,7 @@ padding: $baseline; footer.primary { - @extend %t-copy-sub2; + @extend %t-copy-sub2 !optional; @include clearfix(); diff --git a/cms/static/sass/bootstrap/_header.scss b/cms/static/sass/bootstrap/_header.scss index b90a7ee5ed9c..5fc34b8c312c 100644 --- a/cms/static/sass/bootstrap/_header.scss +++ b/cms/static/sass/bootstrap/_header.scss @@ -74,8 +74,8 @@ // basic layout - nav items nav { > ol > .nav-item { - @extend %t-action3; - @extend %t-strong; + @extend %t-action3 !optional; + @extend %t-strong !optional; display: inline-block; vertical-align: middle; @@ -163,8 +163,8 @@ } .course-title { - @extend %t-action2; - @extend %t-strong; + @extend %t-action2 !optional; + @extend %t-strong !optional; display: block; width: 100%; @@ -422,8 +422,8 @@ } .nav-item { - @extend %t-action3; - @extend %t-regular; + @extend %t-action3 !optional; + @extend %t-regular !optional; display: block; margin: 0 0 ($baseline/4) 0; diff --git a/cms/static/sass/bootstrap/_layouts.scss b/cms/static/sass/bootstrap/_layouts.scss index 7bee47228bc9..0d8b7596ff4a 100644 --- a/cms/static/sass/bootstrap/_layouts.scss +++ b/cms/static/sass/bootstrap/_layouts.scss @@ -119,8 +119,8 @@ // buttons .button { - @extend %btn-primary-blue; - @extend %sizing; + @extend %btn-primary-blue !optional; + @extend %sizing !optional; .action-button-text { display: inline-block; @@ -135,8 +135,8 @@ // CASE: new/create button &.new-button, &.button-new { - @extend %btn-primary-green; - @extend %sizing; + @extend %btn-primary-green !optional; + @extend %sizing !optional; } } } @@ -164,7 +164,7 @@ color: $body-color; &.navigation-current { - @extend %ui-disabled; + @extend %ui-disabled !optional; color: color("gray"); max-width: 250px; @@ -199,7 +199,7 @@ // CASE: wizard-based mast .mast-wizard { .page-header-sub { - @extend %t-title4; + @extend %t-title4 !optional; color: color("gray"); font-weight: 300; @@ -247,7 +247,7 @@ padding-bottom: ($baseline/2); .title-sub { - @extend %t-copy-sub1; + @extend %t-copy-sub1 !optional; display: block; margin: 0; @@ -255,7 +255,7 @@ } .title-1 { - @extend %t-title3; + @extend %t-title3 !optional; @extend %t-strong; margin: 0; @@ -283,7 +283,7 @@ } .title-3 { - @extend %t-title6; + @extend %t-title6 !optional; margin: 0 0 ($baseline/2) 0; } diff --git a/lms/static/sass/_build-footer-edx.scss b/lms/static/sass/_build-footer-edx.scss index f2d63df5c55f..dc58059ad1b9 100644 --- a/lms/static/sass/_build-footer-edx.scss +++ b/lms/static/sass/_build-footer-edx.scss @@ -2,6 +2,7 @@ // LMS edx.org Footer: Shared Build Compile @import 'lms/theme/variables'; @import 'bootstrap/variables'; +@import 'bootstrap/scss/functions'; @import 'bootstrap/scss/variables'; @import 'bootstrap/scss/mixins/breakpoints'; @import '../variables'; diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index b1331985c61b..7aeb436bb02d 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -325,8 +325,8 @@ div.info-wrapper { filter: alpha(opacity=60); + h4 { - @extend a:hover; - + opacity: 1; + filter: alpha(opacity=100); text-decoration: underline; } } diff --git a/lms/static/sass/course/_profile.scss b/lms/static/sass/course/_profile.scss index 76fece68f72a..3f2277fe6005 100644 --- a/lms/static/sass/course/_profile.scss +++ b/lms/static/sass/course/_profile.scss @@ -134,7 +134,7 @@ header { @extend .clearfix; - @extend h1.top-header; + @extend %h1-top-header; margin-bottom: lh(); diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index 67a5a704050b..e8249611400c 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -570,7 +570,7 @@ html.video-fullscreen { } header { - @extend h1.top-header; + @extend %h1-top-header !optional; border-radius: 0 4px 0 0; margin-bottom: -16px; diff --git a/lms/static/sass/course/layout/_courseware_preview.scss b/lms/static/sass/course/layout/_courseware_preview.scss index ee408151c15c..243be796eebc 100644 --- a/lms/static/sass/course/layout/_courseware_preview.scss +++ b/lms/static/sass/course/layout/_courseware_preview.scss @@ -13,7 +13,7 @@ $proctoring-banner-text-size: 14px; } .preview-menu { - @extend %inner-wrapper; + @extend %inner-wrapper !optional; width: auto; @@ -65,7 +65,7 @@ $proctoring-banner-text-size: 14px; .proctored_exam_status { // STATE: Fixed to viewport (used for scrolling) &.is-fixed { - @extend %ui-depth4; + @extend %ui-depth4 !optional; box-shadow: 0 3px 3px $shadow-d1; position: fixed; @@ -170,9 +170,9 @@ $proctoring-banner-text-size: 14px; } .exam-button-turn-in-exam { - @extend %btn-pl-primary-base; - @extend %t-action3; - @extend %t-weight4; + @extend %btn-pl-primary-base !optional; + @extend %t-action3 !optional; + @extend %t-weight4 !optional; margin-right: $baseline; border: 0; diff --git a/lms/static/sass/discussion/_discussion.scss b/lms/static/sass/discussion/_discussion.scss index 68643e0c9921..6c26aa281f08 100644 --- a/lms/static/sass/discussion/_discussion.scss +++ b/lms/static/sass/discussion/_discussion.scss @@ -128,7 +128,7 @@ section.discussion { } .xblock-student_view-discussion { - @extend %ui-print-excluded; + @extend %ui-print-excluded !optional; // Overrides overspecific courseware CSS from: // https://github.com/edx/edx-platform/blob/master/lms/static/sass/course/courseware/_courseware.scss#L499 padding-top: 15px !important; diff --git a/lms/static/sass/discussion/elements/_editor.scss b/lms/static/sass/discussion/elements/_editor.scss index 750b0ad9a2b4..9f45f4cf016c 100644 --- a/lms/static/sass/discussion/elements/_editor.scss +++ b/lms/static/sass/discussion/elements/_editor.scss @@ -120,7 +120,7 @@ } .wmd-prompt-dialog { - @extend .modal; + @extend .modal !optional; background: $forum-color-background; padding: $baseline; diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss index ad5daead77e0..ddce06225a76 100644 --- a/lms/static/sass/discussion/elements/_navigation.scss +++ b/lms/static/sass/discussion/elements/_navigation.scss @@ -340,7 +340,7 @@ .forum-nav-thread-comments-count { @extend %forum-nav-thread-wrapper-2-content; - @extend %t-weight4; + @extend %t-weight4 !optional; position: relative; diff --git a/lms/static/sass/discussion/views/_response.scss b/lms/static/sass/discussion/views/_response.scss index 5cd9bfd56f37..d995aefa9ffb 100644 --- a/lms/static/sass/discussion/views/_response.scss +++ b/lms/static/sass/discussion/views/_response.scss @@ -49,7 +49,7 @@ // CASE: larger username for responses .username { - @extend %t-weight5; + @extend %t-weight5 !optional; font-size: $forum-base-font-size; } diff --git a/lms/static/sass/features/_bookmarks.scss b/lms/static/sass/features/_bookmarks.scss index 2aaa1ec208ef..aa0963286e3d 100644 --- a/lms/static/sass/features/_bookmarks.scss +++ b/lms/static/sass/features/_bookmarks.scss @@ -103,11 +103,11 @@ $bookmarked-icon: "\f02e"; // .fa-bookmark } .bookmarks-empty-header { - @extend %t-title5; + @extend %t-title5 !optional; margin-bottom: ($baseline/2); } .bookmarks-empty-detail { - @extend %t-copy-sub1; + @extend %t-copy-sub1 !optional; } diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index d63f9a9f0827..3c02af11d90b 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -149,11 +149,6 @@ display: inline-block; margin-bottom: ($baseline/2); text-decoration: none; - - // Responsive behavior - @include media-breakpoint-down(sm) { - @extend %t-title4; - } } } diff --git a/lms/static/sass/shared/_alerts_pattern_library_shim.scss b/lms/static/sass/shared/_alerts_pattern_library_shim.scss index e22217d63960..af266c02bd10 100644 --- a/lms/static/sass/shared/_alerts_pattern_library_shim.scss +++ b/lms/static/sass/shared/_alerts_pattern_library_shim.scss @@ -142,7 +142,7 @@ $bp-screen-md: 768px !default; .alert-title { @extend %hd-5; - @extend %headings-emphasized; + @extend %headings-emphasized !optional; @media (min-width: $bp-screen-md) { // shift the section up to make the alert more compact diff --git a/lms/static/sass/shared/_help-tab.scss b/lms/static/sass/shared/_help-tab.scss index ea48096d10f1..a0016822c8e7 100644 --- a/lms/static/sass/shared/_help-tab.scss +++ b/lms/static/sass/shared/_help-tab.scss @@ -18,7 +18,7 @@ } .help-tab { - @extend %ui-depth2; + @extend %ui-depth2 !optional; @extend %ui-print-excluded; transform: rotate(-90deg); diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss index 88eb6c354d53..7288fc561075 100644 --- a/lms/static/sass/shared/_modal.scss +++ b/lms/static/sass/shared/_modal.scss @@ -10,7 +10,7 @@ } .modal { - @extend %ui-depth1; + @extend %ui-depth1 !optional; display: none; position: absolute; @@ -51,7 +51,7 @@ } .inner-wrapper { - @extend %ui-depth1; + @extend %ui-depth1 !optional; background: $modal-content-bg; border-radius: 0; @@ -69,7 +69,7 @@ } header { - @extend %ui-depth1; + @extend %ui-depth1 !optional; margin-bottom: ($baseline*1.5); overflow: hidden; @@ -89,7 +89,7 @@ } hr { - @extend %faded-hr-divider-light; + @extend %faded-hr-divider-light !optional; border: none; margin: 0; @@ -97,7 +97,7 @@ z-index: 2; &::after { - @extend %faded-hr-divider; + @extend %faded-hr-divider !optional; bottom: 0; content: ""; @@ -352,7 +352,7 @@ // general reset .list-input, .list-actions { - @extend %ui-no-list; + @extend %ui-no-list !optional; } .settings-language-select .select { @@ -367,7 +367,7 @@ padding: 0 ($baseline*2) $baseline ($baseline*2); .list-actions-item { - @extend %t-copy-sub1; + @extend %t-copy-sub1 !optional; color: $body-color; text-align: center; @@ -379,4 +379,3 @@ } } } - diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 351bc4271e8f..57ad3a68a792 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -589,7 +589,7 @@ lazy==1.4 # acid-xblock # lti-consumer-xblock # ora2 -libsass==0.10.0 +libsass==0.21.0 # via # -r requirements/edx/paver.txt # ora2 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index ada2c78dc73a..0565500d84c7 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -768,7 +768,7 @@ lazy==1.4 # bok-choy # lti-consumer-xblock # ora2 -libsass==0.10.0 +libsass==0.21.0 # via # -r requirements/edx/testing.txt # ora2 diff --git a/requirements/edx/paver.in b/requirements/edx/paver.in index c5e80916e9fd..c7e31e4622eb 100644 --- a/requirements/edx/paver.in +++ b/requirements/edx/paver.in @@ -12,7 +12,7 @@ edx-opaque-keys # Create and introspect course and xblock identities lazy # Lazily-evaluated attributes for Python objects -libsass==0.10.0 # Python bindings for the LibSass CSS compiler +libsass==0.21.0 # Python bindings for the LibSass CSS compiler markupsafe # XML/HTML/XHTML Markup safe strings mock # Stub out code with mock objects and make assertions about how they have been used path # Easier manipulation of filesystem paths diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 9ec2fd8de0e1..8fd2df6f333e 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -14,7 +14,7 @@ idna==2.10 # via requests lazy==1.4 # via -r requirements/edx/paver.in -libsass==0.10.0 +libsass==0.21.0 # via -r requirements/edx/paver.in markupsafe==1.1.1 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 13a70ba9335c..ef4ff26d6f8c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -733,7 +733,7 @@ lazy==1.4 # bok-choy # lti-consumer-xblock # ora2 -libsass==0.10.0 +libsass==0.21.0 # via # -r requirements/edx/base.txt # ora2