Commit 6854be80a85ae8bc8203a3ae768e2bab7d5daa34
1 parent
660585ca
Exists in
spb-stable
and in
2 other branches
Refactor scss variables. Use darker color for links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
6 changed files
with
13 additions
and
9 deletions
Show diff stats
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/gl_bootstrap.scss
| @@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
| 9 | $font-size-base: 13px !default; | 9 | $font-size-base: 13px !default; |
| 10 | $nav-pills-active-link-hover-bg: $bg_primary; | 10 | $nav-pills-active-link-hover-bg: $bg_primary; |
| 11 | $pagination-active-bg: $bg_primary; | 11 | $pagination-active-bg: $bg_primary; |
| 12 | +$list-group-active-bg: $bg_style_color; | ||
| 12 | 13 | ||
| 13 | // Core variables and mixins | 14 | // Core variables and mixins |
| 14 | @import "bootstrap/variables"; | 15 | @import "bootstrap/variables"; |
app/assets/stylesheets/main/variables.scss
| 1 | -/** | 1 | +/* |
| 2 | * General Colors | 2 | * General Colors |
| 3 | */ | 3 | */ |
| 4 | -$primary_color: #2FA0BB; | ||
| 5 | -$link_color: #3A89A3; | ||
| 6 | $style_color: #474D57; | 4 | $style_color: #474D57; |
| 7 | $bg_style_color: #2299BB; | 5 | $bg_style_color: #2299BB; |
| 8 | -$list-group-active-bg: $bg_style_color; | ||
| 9 | $hover: #D9EDF7; | 6 | $hover: #D9EDF7; |
| 10 | 7 | ||
| 11 | /* | 8 | /* |
| 9 | + * Link colors | ||
| 10 | + */ | ||
| 11 | +$link_color: #446e9b; | ||
| 12 | +$link_hover_color: #2FA0BB; | ||
| 13 | + | ||
| 14 | +/* | ||
| 12 | * Success colors (green) | 15 | * Success colors (green) |
| 13 | */ | 16 | */ |
| 14 | $border_success: #469408; | 17 | $border_success: #469408; |
app/assets/stylesheets/sections/nav.scss
app/assets/stylesheets/sections/notes.scss
| @@ -37,7 +37,7 @@ ul.notes { | @@ -37,7 +37,7 @@ ul.notes { | ||
| 37 | font-weight: bold; | 37 | font-weight: bold; |
| 38 | font-size: 14px; | 38 | font-size: 14px; |
| 39 | &:hover { | 39 | &:hover { |
| 40 | - color: $primary_color; | 40 | + color: $link_hover_colory; |
| 41 | } | 41 | } |
| 42 | } | 42 | } |
| 43 | } | 43 | } |
| @@ -172,7 +172,7 @@ ul.notes { | @@ -172,7 +172,7 @@ ul.notes { | ||
| 172 | @extend .cgray; | 172 | @extend .cgray; |
| 173 | 173 | ||
| 174 | &:hover { | 174 | &:hover { |
| 175 | - color: $primary_color; | 175 | + color: $link_hover_colory; |
| 176 | &.danger { @extend .cred; } | 176 | &.danger { @extend .cred; } |
| 177 | } | 177 | } |
| 178 | } | 178 | } |