diff options
author | Simon Knox <psimyn@gmail.com> | 2019-03-14 18:48:50 +1100 |
---|---|---|
committer | Enrique Alcantara <ealcantara@gitlab.com> | 2019-06-17 14:38:28 -0400 |
commit | b8a0f1e646ef3c37d73def402225b5acc8051b09 (patch) | |
tree | 5cc5e7d47fc31f130a663a3c0a6095bf9be322a1 /app/assets/stylesheets | |
parent | d2929d6edb3a04054a5218cb1b21cb0759ec1ec8 (diff) | |
download | gitlab-ce-b8a0f1e646ef3c37d73def402225b5acc8051b09.tar.gz |
Import bootstrap styles from gitlab-ui
Use gitlab_ui.scss instead of all the bootstrap imports
Allow the ../node_modules path from gitlab_ui.scss to resolve
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/bootstrap.scss | 37 | ||||
-rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/framework.scss | 3 |
3 files changed, 5 insertions, 42 deletions
diff --git a/app/assets/stylesheets/bootstrap.scss b/app/assets/stylesheets/bootstrap.scss deleted file mode 100644 index 4a09da3d580..00000000000 --- a/app/assets/stylesheets/bootstrap.scss +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Includes specific styles from the bootstrap4 folder in node_modules - */ - -@import "../../../node_modules/bootstrap/scss/functions"; -@import "../../../node_modules/bootstrap/scss/variables"; -@import "../../../node_modules/bootstrap/scss/mixins"; -@import "../../../node_modules/bootstrap/scss/root"; -@import "../../../node_modules/bootstrap/scss/reboot"; -@import "../../../node_modules/bootstrap/scss/type"; -@import "../../../node_modules/bootstrap/scss/images"; -@import "../../../node_modules/bootstrap/scss/code"; -@import "../../../node_modules/bootstrap/scss/grid"; -@import "../../../node_modules/bootstrap/scss/tables"; -@import "../../../node_modules/bootstrap/scss/forms"; -@import "../../../node_modules/bootstrap/scss/buttons"; -@import "../../../node_modules/bootstrap/scss/transitions"; -@import "../../../node_modules/bootstrap/scss/dropdown"; -@import "../../../node_modules/bootstrap/scss/button-group"; -@import "../../../node_modules/bootstrap/scss/input-group"; -@import "../../../node_modules/bootstrap/scss/custom-forms"; -@import "../../../node_modules/bootstrap/scss/nav"; -@import "../../../node_modules/bootstrap/scss/navbar"; -@import "../../../node_modules/bootstrap/scss/card"; -@import "../../../node_modules/bootstrap/scss/breadcrumb"; -@import "../../../node_modules/bootstrap/scss/pagination"; -@import "../../../node_modules/bootstrap/scss/badge"; -@import "../../../node_modules/bootstrap/scss/alert"; -@import "../../../node_modules/bootstrap/scss/progress"; -@import "../../../node_modules/bootstrap/scss/media"; -@import "../../../node_modules/bootstrap/scss/list-group"; -@import "../../../node_modules/bootstrap/scss/close"; -@import "../../../node_modules/bootstrap/scss/modal"; -@import "../../../node_modules/bootstrap/scss/tooltip"; -@import "../../../node_modules/bootstrap/scss/popover"; -@import "../../../node_modules/bootstrap/scss/utilities"; -@import "../../../node_modules/bootstrap/scss/print"; diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 802d58779d0..29473da21cc 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -1,7 +1,3 @@ -/* - * Scss to help with bootstrap 3 to 4 migration - */ - $text-color: $gl-text-color; $brand-primary: $blue-500; @@ -18,6 +14,9 @@ $input-border: $border-color; $padding-base-vertical: $gl-vert-padding; $padding-base-horizontal: $gl-padding; +/* + * Scss to help with bootstrap 3 to 4 migration + */ body, .form-control, .search form { diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 9b0d19b0ef0..14f4652e847 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -2,7 +2,8 @@ @import 'framework/variables_overrides'; @import 'framework/mixins'; -@import 'bootstrap'; +@import '../../../node_modules/@gitlab/ui/scss/gitlab_ui'; + @import 'bootstrap_migration'; @import 'framework/layout'; |