summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework.scss
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-06 12:48:26 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-04-06 12:48:26 -0500
commitf853ef091b58b1da08d7ab4f89d6b41b886f6cc5 (patch)
treefdb9df2c9497715718bdb77da92e5af6ba56ebd0 /app/assets/stylesheets/framework.scss
parente058a94935b16e45a2624ee210a804af18c1ea92 (diff)
downloadgitlab-ce-f853ef091b58b1da08d7ab4f89d6b41b886f6cc5.tar.gz
Import bootstrap 4
Diffstat (limited to 'app/assets/stylesheets/framework.scss')
-rw-r--r--app/assets/stylesheets/framework.scss3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 2fccfa4011c..3b53d9f66c4 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -1,7 +1,6 @@
@import "framework/variables";
@import "framework/mixins";
-@import 'framework/tw_bootstrap_variables';
-@import 'framework/tw_bootstrap';
+@import "../../../node_modules/bootstrap/scss/bootstrap";
@import "framework/layout";
@import "framework/animations";