diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-29 10:37:17 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-29 10:37:17 +0000 |
| commit | 4997a1e321a8f45fc7788cd5704d09ca00e13efa (patch) | |
| tree | df2869f1db5359d3db03f191662e144f954fd731 | |
| parent | 10f84f99cb663faae37139495f547bb68bd8aced (diff) | |
| parent | 9ef18c6c8bdcdf859845da66d7246872f90fef35 (diff) | |
| download | gitlab-ce-4997a1e321a8f45fc7788cd5704d09ca00e13efa.tar.gz | |
Merge branch 'dz-update-outdated-colors' into 'master'
Replace outdated bluish colors with default bg color
cc @skyruler
See merge request !3973
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap_variables.scss | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 62b2af0dbf7..e72e4aa47ef 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -1,5 +1,5 @@ .light-well { - background-color: #f8fafc; + background-color: $background-color; padding: 15px; } diff --git a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss index d91e35911d8..371c1bf17e1 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss @@ -153,8 +153,8 @@ $nav-link-padding: 13px $gl-padding; //== Code // //## -$pre-bg: #f4f7fd !default; +$pre-bg: $background-color !default; $pre-color: $gl-gray !default; -$pre-border-color: #e7e9ed; +$pre-border-color: $border-color; $table-bg-accent: $background-color; |