diff options
| -rw-r--r-- | app/assets/stylesheets/gl_bootstrap.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/variables.scss | 18 |
2 files changed, 8 insertions, 14 deletions
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss index 874c4f5b762..3312c762ed1 100644 --- a/app/assets/stylesheets/gl_bootstrap.scss +++ b/app/assets/stylesheets/gl_bootstrap.scss @@ -7,8 +7,8 @@ */ $font-size-base: 13px !default; -$nav-pills-active-link-hover-bg: $bg_style_color; -$pagination-active-bg: $bg_style_color; +$nav-pills-active-link-hover-bg: $bg_primary; +$pagination-active-bg: $bg_primary; // Core variables and mixins @import "bootstrap/variables"; diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss index ddfcdef8360..6ea6a8303f4 100644 --- a/app/assets/stylesheets/main/variables.scss +++ b/app/assets/stylesheets/main/variables.scss @@ -11,32 +11,26 @@ $hover: #D9EDF7; /* * Success colors (green) */ -$border_success: #4cae4c; -$bg_success: #5cb85c; -$bg_light_success: #dff0d8; -$color_success: #3c763d; +$border_success: #469408; +$bg_success: #469408; /* * Danger colors (red) */ $border_danger: #d43f3a; $bg_danger: #d9534f; -$bg_light_danger: #f2dede; -$color_danger: #a94442; /* * Primary colors (blue) */ -$border_primary: #358ebd; -$bg_primary: #429bca; -$bg_light_primary: #d9edf7; -$color_primary: #31708f; +$border_primary: #446e9b; +$bg_primary: #446e9b; /* * Warning colors (yellow) */ -$bg_warning: #f39c12; -$border_warning: #f39c12; +$bg_warning: #d9831f; +$border_warning: #d9831f; /** * Commit Diff Colors |