summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2018-05-25 15:10:20 -0500
committerPaul Slaughter <pslaughter@gitlab.com>2018-05-31 11:23:49 -0500
commit288794bda5612069c5732017b7397efb0936361b (patch)
treeb977dd21a7e2df6ea93ae1b7827b29befb5ab4e0
parentaa627a712d5359dee1f0f4fa0d9e4192f3f1e438 (diff)
downloadgitlab-ce-288794bda5612069c5732017b7397efb0936361b.tar.gz
Update bootstrap paths in errors.scss
-rw-r--r--app/assets/stylesheets/errors.scss14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/stylesheets/errors.scss b/app/assets/stylesheets/errors.scss
index 7fe28a6f9a5..a5f9ff7d157 100644
--- a/app/assets/stylesheets/errors.scss
+++ b/app/assets/stylesheets/errors.scss
@@ -2,11 +2,11 @@
* This is a minimal stylesheet, meant to be used for error pages.
*/
@import 'framework/variables';
-@import 'framework/tw_bootstrap_variables';
-@import 'bootstrap/variables';
-@import 'bootstrap/mixins';
-@import 'bootstrap/buttons';
-@import 'bootstrap/forms';
+@import '../../../node_modules/bootstrap/scss/functions';
+@import '../../../node_modules/bootstrap/scss/variables';
+@import '../../../node_modules/bootstrap/scss/mixins';
+@import '../../../node_modules/bootstrap/scss/buttons';
+@import '../../../node_modules/bootstrap/scss/forms';
$body-color: #666;
$header-color: #456;
@@ -80,7 +80,7 @@ a {
margin-bottom: 1em;
}
- @media (min-width: $screen-xs-min) {
+ @include media-breakpoint-up(sm) {
flex-wrap: nowrap;
button {
@@ -103,7 +103,7 @@ a {
padding-bottom: 1em;
}
- @media (min-width: $screen-xs-min) {
+ @include media-breakpoint-up(sm) {
li {
display: inline-block;