diff --git a/package-lock.json b/package-lock.json index fec2ba06a1..54dc36a0dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -233,13 +233,13 @@ } }, "@edx/edx-bootstrap": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@edx/edx-bootstrap/-/edx-bootstrap-0.4.2.tgz", - "integrity": "sha512-wvt1ZyQC1JHkT3WPmuRz5AafIj6wVGOIPfMRkLjxv1Y6g+vUF/UNCIvZYQ3JiK89UwKdv/BMKeYE0Xe2A894bA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@edx/edx-bootstrap/-/edx-bootstrap-1.0.0.tgz", + "integrity": "sha512-ZVoGAqWo9NtPKoNRgOgiW+Qr83TyZ+CWiKFpTmqaG3fm0qBgysnYYRooh1pyaJPedgFw2ljGrAAHYpn94R3pfw==", "requires": { - "bootstrap": "4.0.0-beta.2", - "jquery": "3.2.1", - "popper.js": "1.12.9" + "bootstrap": "4.0.0", + "jquery": "3.3.1", + "popper.js": "1.14.1" } }, "@marionebl/sander": { @@ -3302,9 +3302,9 @@ } }, "bootstrap": { - "version": "4.0.0-beta.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-beta.2.tgz", - "integrity": "sha512-DzGtdTlKbrMoGMpz0LigKSqJ+MgtFKxA791PU/q062OlRG0HybNZcTLH7rpDAmLS66Y3esN9yzKHLLbqa5UR3w==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0.tgz", + "integrity": "sha512-gulJE5dGFo6Q61V/whS6VM4WIyrlydXfCgkE+Gxe5hjrJ8rXLLZlALq7zq2RPhOc45PSwQpJkrTnc2KgD6cvmA==" }, "bowser": { "version": "1.9.1", @@ -10158,9 +10158,9 @@ } }, "jquery": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", - "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", + "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" }, "js-base64": { "version": "2.4.0", @@ -12553,9 +12553,9 @@ } }, "popper.js": { - "version": "1.12.9", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.9.tgz", - "integrity": "sha1-DfvC3/lsRRuzMu3Pz6r1ZtMx1bM=" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.1.tgz", + "integrity": "sha1-uIFeXNpvYvwgQuR2GGSfdYZuZ1M=" }, "portfinder": { "version": "1.0.13", diff --git a/package.json b/package.json index b3d4783b3a..1b0997957a 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/CssJail/CssJail.scss b/src/CssJail/CssJail.scss index cdee78690d..1f887020f0 100644 --- a/src/CssJail/CssJail.scss +++ b/src/CssJail/CssJail.scss @@ -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"; diff --git a/src/utils/paragon-reset.scss b/src/utils/paragon-reset.scss index 636db2750c..0feab20990 100644 --- a/src/utils/paragon-reset.scss +++ b/src/utils/paragon-reset.scss @@ -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; @@ -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;