Skip to content

Commit

Permalink
fix(css): upgrade edx-bootstrap to 1.0.0 (#201)
Browse files Browse the repository at this point in the history
edx-bootstrap 1.0.0 upgrades bootstrap to 4.0.0.

Remove variables from paragon-reset.scss that no longer exist in 4.0.0.

Only import bootstrap reboot in CssJail.scss at the top-level so that it does
not overwrite with component-specific styling.
  • Loading branch information
thallada authored Apr 4, 2018
1 parent 716f8b6 commit d8a524f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 36 deletions.
30 changes: 15 additions & 15 deletions package-lock.json

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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"travis-deploy-once": "travis-deploy-once"
},
"dependencies": {
"@edx/edx-bootstrap": "^0.4.2",
"@edx/edx-bootstrap": "^1.0.0",
"babel-polyfill": "^6.26.0",
"classnames": "^2.2.5",
"email-prop-type": "^1.1.5",
Expand Down
16 changes: 1 addition & 15 deletions src/CssJail/CssJail.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
.css-jail {
@import "~bootstrap/scss/_reboot";

-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
box-sizing: border-box;
line-height: 1.15;

font-size: $font-size-base;
font-weight: $font-weight-base;
line-height: $line-height-base;
margin: 0;
color: $body-color;
background-color: $body-bg;
}
@import "~bootstrap/scss/_reboot";
7 changes: 2 additions & 5 deletions src/utils/paragon-reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,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 @@ -100,5 +97,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: $kbd-padding-x / $base-rem-size;
$kbd-padding-y: $kbd-padding-y / $base-rem-size;

0 comments on commit d8a524f

Please sign in to comment.