diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
| commit | 74894a38779adb32a8b8a3cdad8358fc98693403 (patch) | |
| tree | 4bf957d7b513797b03e571f451a760e2eb1524d8 /app/assets/stylesheets/framework/variables.scss | |
| parent | 6f4935bcee76a7af532399945f440a8fbd15658e (diff) | |
| parent | d219ed25fa0b67984984f0b5f60f1eff7a0c34c9 (diff) | |
| download | gitlab-ce-74894a38779adb32a8b8a3cdad8358fc98693403.tar.gz | |
Merge branch 'bootstrap4' into 'master'
Upgrade to Bootstrap 4
Closes #45185 and #46710
See merge request gitlab-org/gitlab-ce!18232
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 86f82ec14ce..89b61530ddb 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -142,6 +142,11 @@ $border-gray-normal-dashed: darken($gray-normal, $darken-border-dashed-factor); $border-gray-dark: darken($white-normal, $darken-border-factor); /* + * Override Bootstrap 4 variables + */ +$secondary: $gray-light; + +/* * UI elements */ $border-color: #e5e5e5; @@ -306,6 +311,11 @@ $gl-warning: $orange-500; $gl-danger: $red-500; $gl-btn-active-background: rgba(0, 0, 0, 0.16); $gl-btn-active-gradient: inset 0 2px 3px $gl-btn-active-background; +// Bootstrap override states +$success: $gl-success; +$info: $gl-info; +$warning: $gl-warning; +$danger: $gl-danger; /* * Commit Diff Colors |