Skip to content

Commit

Permalink
Merge pull request #26 from edx/thallada/upgrade-bootstrap-v4
Browse files Browse the repository at this point in the history
Upgrade to Bootstrap v4.0.0. Bump to 1.0.0.
  • Loading branch information
thallada authored Apr 4, 2018
2 parents 0c85f96 + 0f95f3c commit fd9d7b0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@edx/edx-bootstrap",
"version": "0.4.3",
"version": "1.0.0",
"description": "The Bootstrap theme for Open edX",
"license": "Apache-2.0",
"repository": {
Expand All @@ -14,7 +14,7 @@
],
"homepage": "https://github.com/edx/edx-bootstrap#readme",
"dependencies": {
"bootstrap": "v4.0.0-beta.2",
"bootstrap": "4.0.0",
"jquery": "^3.2.1",
"popper.js": "^1.12.6"
},
Expand Down
9 changes: 3 additions & 6 deletions sass/_legacy-reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// To use, include this reset before all other Bootstrap references
// within the consuming application or package's pipeline.

@import "~bootstrap/scss/bootstrap-reboot";
@import "~bootstrap/scss/reboot";
@import "edx/_theme";

// The Open edX platform's legacy base font size is 62.5%. This
Expand Down Expand Up @@ -43,21 +43,18 @@ $input-btn-padding-y-sm: $input-btn-padding-y-sm / $base-rem-size;
$input-btn-padding-x-lg: $input-btn-padding-x-lg / $base-rem-size;
$input-btn-padding-y-lg: $input-btn-padding-y-lg / $base-rem-size;
$form-text-margin-top: $form-text-margin-top / $base-rem-size;
$form-check-margin-bottom: $form-check-margin-bottom / $base-rem-size;
$form-check-input-gutter: $form-check-input-gutter / $base-rem-size;
$form-check-input-margin-y: $form-check-input-margin-y / $base-rem-size;
$form-check-input-margin-x: $form-check-input-margin-x / $base-rem-size;
$form-check-inline-margin-x: $form-check-inline-margin-x / $base-rem-size;
$custom-control-gutter: $custom-control-gutter / $base-rem-size;
$custom-control-spacer-x: $custom-control-spacer-x / $base-rem-size;
$custom-control-spacer-y: $custom-control-spacer-y / $base-rem-size;
$custom-control-indicator-size: $custom-control-indicator-size / $base-rem-size;
$custom-control-indicator-box-shadow: $custom-control-indicator-box-shadow / $base-rem-size;
$custom-select-padding-x: $custom-select-padding-x / $base-rem-size;
$custom-select-padding-y: $custom-select-padding-y / $base-rem-size;
$custom-select-indicator-padding: $custom-select-indicator-padding / $base-rem-size;
$custom-file-height: $custom-file-height / $base-rem-size;
$custom-file-width: $custom-file-width / $base-rem-size;
$custom-file-focus-box-shadow: $custom-file-focus-box-shadow / $base-rem-size;
$custom-file-padding-x: $custom-file-padding-x / $base-rem-size;
$custom-file-padding-y: $custom-file-padding-y / $base-rem-size;
Expand Down Expand Up @@ -94,5 +91,5 @@ $thumbnail-padding: $thumbnail-padding / $base-rem-size;
$breadcrumb-padding-y: $breadcrumb-padding-y / $base-rem-size;
$breadcrumb-padding-x: $breadcrumb-padding-x / $base-rem-size;
$breadcrumb-item-padding: $breadcrumb-item-padding / $base-rem-size;
$code-padding-x: $code-padding-x / $base-rem-size;
$code-padding-y: $code-padding-y / $base-rem-size;
$kbd-padding-x: $code-padding-x / $base-rem-size;
$kbd-padding-y: $code-padding-y / $base-rem-size;

0 comments on commit fd9d7b0

Please sign in to comment.