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.

Sign up for GitHub

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: upgrade bootstrap to 4.6.0 #27751

Closed
wants to merge 6 commits into from
Closed

fix: upgrade bootstrap to 4.6.0 #27751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96cc047
fix: upgrade bootstrap to 4.6.0
May 27, 2021
47d9af0
import all bootstrap mixins in build
May 27, 2021
03f2c14
update includes of border-radius
May 27, 2021
228e121
increase contrast of all topics button in discussions
May 28, 2021
efb3833
Update _shame.scss
May 28, 2021
cbe8d88
remove background of all-topics button instead
May 28, 2021
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
2 changes: 1 addition & 1 deletion cms/static/sass/views/_updates.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 1 addition & 12 deletions lms/static/sass/base/_build.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';


Expand Down
2 changes: 2 additions & 0 deletions lms/static/sass/bootstrap/_components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@

.all-topics {
border: none;
color: $primary;
background-color: transparent;
}
}

Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/course/courseware/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions lms/static/sass/discussion/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/discussion/elements/_actions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/discussion/elements/_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions lms/static/sass/discussion/views/_response.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/discussion/views/_thread.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/multicourse/_home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lms/static/sass/shared/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down