Skip to content
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

fix: update libsass to v0.21.0 #27683

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cms/static/sass/bootstrap/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -145,7 +145,7 @@
display: block;

.icon {
@extend %t-icon4;
@extend %t-icon4 !optional;

vertical-align: middle;
margin-right: $baseline/4;
Expand Down
2 changes: 1 addition & 1 deletion cms/static/sass/bootstrap/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
padding: $baseline;

footer.primary {
@extend %t-copy-sub2;
@extend %t-copy-sub2 !optional;

@include clearfix();

Expand Down
12 changes: 6 additions & 6 deletions cms/static/sass/bootstrap/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -163,8 +163,8 @@
}

.course-title {
@extend %t-action2;
@extend %t-strong;
@extend %t-action2 !optional;
@extend %t-strong !optional;

display: block;
width: 100%;
Expand Down Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions cms/static/sass/bootstrap/_layouts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
}
}
Expand Down Expand Up @@ -164,7 +164,7 @@
color: $body-color;

&.navigation-current {
@extend %ui-disabled;
@extend %ui-disabled !optional;

color: color("gray");
max-width: 250px;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -247,15 +247,15 @@
padding-bottom: ($baseline/2);

.title-sub {
@extend %t-copy-sub1;
@extend %t-copy-sub1 !optional;

display: block;
margin: 0;
color: $gray-500;
}

.title-1 {
@extend %t-title3;
@extend %t-title3 !optional;
@extend %t-strong;

margin: 0;
Expand Down Expand Up @@ -283,7 +283,7 @@
}

.title-3 {
@extend %t-title6;
@extend %t-title6 !optional;

margin: 0 0 ($baseline/2) 0;
}
Expand Down
1 change: 1 addition & 0 deletions lms/static/sass/_build-footer-edx.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lms/static/sass/course/_info.scss
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ div.info-wrapper {
filter: alpha(opacity=60);

+ h4 {
@extend a:hover;

opacity: 1;
filter: alpha(opacity=100);
text-decoration: underline;
}
}
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/course/_profile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@

header {
@extend .clearfix;
@extend h1.top-header;
@extend %h1-top-header;

margin-bottom: lh();

Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/course/courseware/_courseware.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions lms/static/sass/course/layout/_courseware_preview.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $proctoring-banner-text-size: 14px;
}

.preview-menu {
@extend %inner-wrapper;
@extend %inner-wrapper !optional;

width: auto;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/discussion/_discussion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/discussion/elements/_editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
}

.wmd-prompt-dialog {
@extend .modal;
@extend .modal !optional;

background: $forum-color-background;
padding: $baseline;
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/discussion/elements/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/discussion/views/_response.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

// CASE: larger username for responses
.username {
@extend %t-weight5;
@extend %t-weight5 !optional;

font-size: $forum-base-font-size;
}
Expand Down
4 changes: 2 additions & 2 deletions lms/static/sass/features/_bookmarks.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
5 changes: 0 additions & 5 deletions lms/static/sass/multicourse/_dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,6 @@
display: inline-block;
margin-bottom: ($baseline/2);
text-decoration: none;

// Responsive behavior
@include media-breakpoint-down(sm) {
@extend %t-title4;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/shared/_alerts_pattern_library_shim.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/shared/_help-tab.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

.help-tab {
@extend %ui-depth2;
@extend %ui-depth2 !optional;
@extend %ui-print-excluded;

transform: rotate(-90deg);
Expand Down
15 changes: 7 additions & 8 deletions lms/static/sass/shared/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}

.modal {
@extend %ui-depth1;
@extend %ui-depth1 !optional;

display: none;
position: absolute;
Expand Down Expand Up @@ -51,7 +51,7 @@
}

.inner-wrapper {
@extend %ui-depth1;
@extend %ui-depth1 !optional;

background: $modal-content-bg;
border-radius: 0;
Expand All @@ -69,7 +69,7 @@
}

header {
@extend %ui-depth1;
@extend %ui-depth1 !optional;

margin-bottom: ($baseline*1.5);
overflow: hidden;
Expand All @@ -89,15 +89,15 @@
}

hr {
@extend %faded-hr-divider-light;
@extend %faded-hr-divider-light !optional;

border: none;
margin: 0;
position: relative;
z-index: 2;

&::after {
@extend %faded-hr-divider;
@extend %faded-hr-divider !optional;

bottom: 0;
content: "";
Expand Down Expand Up @@ -352,7 +352,7 @@
// general reset
.list-input,
.list-actions {
@extend %ui-no-list;
@extend %ui-no-list !optional;
}

.settings-language-select .select {
Expand All @@ -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;
Expand All @@ -379,4 +379,3 @@
}
}
}

2 changes: 1 addition & 1 deletion requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/paver.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/paver.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down