Skip to content

Commit fd9d7b0

Browse files
authored
Merge pull request #26 from edx/thallada/upgrade-bootstrap-v4
Upgrade to Bootstrap v4.0.0. Bump to 1.0.0.
2 parents 0c85f96 + 0f95f3c commit fd9d7b0

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@edx/edx-bootstrap",
3-
"version": "0.4.3",
3+
"version": "1.0.0",
44
"description": "The Bootstrap theme for Open edX",
55
"license": "Apache-2.0",
66
"repository": {
@@ -14,7 +14,7 @@
1414
],
1515
"homepage": "https://github.com/edx/edx-bootstrap#readme",
1616
"dependencies": {
17-
"bootstrap": "v4.0.0-beta.2",
17+
"bootstrap": "4.0.0",
1818
"jquery": "^3.2.1",
1919
"popper.js": "^1.12.6"
2020
},

sass/_legacy-reset.scss

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// To use, include this reset before all other Bootstrap references
77
// within the consuming application or package's pipeline.
88

9-
@import "~bootstrap/scss/bootstrap-reboot";
9+
@import "~bootstrap/scss/reboot";
1010
@import "edx/_theme";
1111

1212
// The Open edX platform's legacy base font size is 62.5%. This
@@ -43,21 +43,18 @@ $input-btn-padding-y-sm: $input-btn-padding-y-sm / $base-rem-size;
4343
$input-btn-padding-x-lg: $input-btn-padding-x-lg / $base-rem-size;
4444
$input-btn-padding-y-lg: $input-btn-padding-y-lg / $base-rem-size;
4545
$form-text-margin-top: $form-text-margin-top / $base-rem-size;
46-
$form-check-margin-bottom: $form-check-margin-bottom / $base-rem-size;
4746
$form-check-input-gutter: $form-check-input-gutter / $base-rem-size;
4847
$form-check-input-margin-y: $form-check-input-margin-y / $base-rem-size;
4948
$form-check-input-margin-x: $form-check-input-margin-x / $base-rem-size;
5049
$form-check-inline-margin-x: $form-check-inline-margin-x / $base-rem-size;
5150
$custom-control-gutter: $custom-control-gutter / $base-rem-size;
5251
$custom-control-spacer-x: $custom-control-spacer-x / $base-rem-size;
53-
$custom-control-spacer-y: $custom-control-spacer-y / $base-rem-size;
5452
$custom-control-indicator-size: $custom-control-indicator-size / $base-rem-size;
5553
$custom-control-indicator-box-shadow: $custom-control-indicator-box-shadow / $base-rem-size;
5654
$custom-select-padding-x: $custom-select-padding-x / $base-rem-size;
5755
$custom-select-padding-y: $custom-select-padding-y / $base-rem-size;
5856
$custom-select-indicator-padding: $custom-select-indicator-padding / $base-rem-size;
5957
$custom-file-height: $custom-file-height / $base-rem-size;
60-
$custom-file-width: $custom-file-width / $base-rem-size;
6158
$custom-file-focus-box-shadow: $custom-file-focus-box-shadow / $base-rem-size;
6259
$custom-file-padding-x: $custom-file-padding-x / $base-rem-size;
6360
$custom-file-padding-y: $custom-file-padding-y / $base-rem-size;
@@ -94,5 +91,5 @@ $thumbnail-padding: $thumbnail-padding / $base-rem-size;
9491
$breadcrumb-padding-y: $breadcrumb-padding-y / $base-rem-size;
9592
$breadcrumb-padding-x: $breadcrumb-padding-x / $base-rem-size;
9693
$breadcrumb-item-padding: $breadcrumb-item-padding / $base-rem-size;
97-
$code-padding-x: $code-padding-x / $base-rem-size;
98-
$code-padding-y: $code-padding-y / $base-rem-size;
94+
$kbd-padding-x: $code-padding-x / $base-rem-size;
95+
$kbd-padding-y: $code-padding-y / $base-rem-size;

0 commit comments

Comments
 (0)