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/bootstrap_migration.scss | |
| 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/bootstrap_migration.scss')
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 7 |
1 files changed, 3 insertions, 4 deletions
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 { |