Download as
Browse Code »

Commit 28cc199128d64d8a84b555bea76fde0af9c7a783

Authored by Dmitriy Zaporozhets
2 parents c7f8bb4c 133d231f
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'ui-colors' into 'master' 

Refactoring ui colors
Showing 8 changed files with 16 additions and 12 deletions   Show diff stats
app/assets/stylesheets/generic/common.scss
  Diff comments   View file @28cc199
... ... @@ -60,7 +60,7 @@ pre {
60 60  
61 61 .dropdown-menu > li > a:hover,
62 62 .dropdown-menu > li > a:focus {
63   - background: #29b;
  63 + background: $bg_style_color;
64 64 color: #FFF
65 65 }
66 66  
... ...
app/assets/stylesheets/generic/typography.scss
  Diff comments   View file @28cc199
... ... @@ -40,7 +40,7 @@ a {
40 40 color: $link_color;
41 41 &:hover {
42 42 text-decoration: none;
43   - color: $primary_color;
  43 + color: $link_hover_color;
44 44 }
45 45  
46 46 &:focus {
... ...
app/assets/stylesheets/gl_bootstrap.scss
  Diff comments   View file @28cc199
... ... @@ -9,6 +9,7 @@
9 9 $font-size-base: 13px !default;
10 10 $nav-pills-active-link-hover-bg: $bg_primary;
11 11 $pagination-active-bg: $bg_primary;
  12 +$list-group-active-bg: $bg_style_color;
12 13  
13 14 // Core variables and mixins
14 15 @import "bootstrap/variables";
... ...
app/assets/stylesheets/main/variables.scss
  Diff comments   View file @28cc199
1   -/**
  1 +/*
2 2 * General Colors
3 3 */
4   -$primary_color: #2FA0BB;
5   -$link_color: #3A89A3;
6 4 $style_color: #474D57;
7 5 $bg_style_color: #2299BB;
8   -$list-group-active-bg: $bg_style_color;
9 6 $hover: #D9EDF7;
10 7  
11 8 /*
  9 + * Link colors
  10 + */
  11 +$link_color: #446e9b;
  12 +$link_hover_color: #2FA0BB;
  13 +
  14 +/*
12 15 * Success colors (green)
13 16 */
14 17 $border_success: #469408;
... ...
app/assets/stylesheets/sections/nav.scss
  Diff comments   View file @28cc199
... ... @@ -64,7 +64,7 @@
64 64 left: 50%;
65 65 width: 0;
66 66 height: 0;
67   - border-color: transparent transparent #29b transparent;
  67 + border-color: transparent transparent $link_color transparent;
68 68 border-style: solid;
69 69 border-width: 6px;
70 70 margin-left: -6px;
... ... @@ -116,7 +116,7 @@
116 116 padding: 5px 0;
117 117  
118 118 &.active {
119   - background-color: $primary_color;
  119 + background-color: $link_hover_color;
120 120  
121 121 a {
122 122 color: #fff;
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @28cc199
... ... @@ -37,7 +37,7 @@ ul.notes {
37 37 font-weight: bold;
38 38 font-size: 14px;
39 39 &:hover {
40   - color: $primary_color;
  40 + color: $link_hover_color;
41 41 }
42 42 }
43 43 }
... ... @@ -172,7 +172,7 @@ ul.notes {
172 172 @extend .cgray;
173 173  
174 174 &:hover {
175   - color: $primary_color;
  175 + color: $link_hover_color;
176 176 &.danger { @extend .cred; }
177 177 }
178 178 }
... ...
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @28cc199
... ... @@ -85,7 +85,7 @@
85 85  
86 86 .btn {
87 87 background: none;
88   - color: #29b;
  88 + color: $link_color;
89 89  
90 90 &.active {
91 91 color: #333;
... ...
app/assets/stylesheets/sections/tree.scss
  Diff comments   View file @28cc199
... ... @@ -53,7 +53,7 @@
53 53 vertical-align: middle;
54 54 a {
55 55 &:hover {
56   - color: $primary_color;
  56 + color: $link_hover_color;
57 57 }
58 58 }
59 59  
... ...