Download as
Browse Code »

Commit d7e9eda24d26dfe5782e503f3e3d7d523000ce05

Authored by Koen Punt
1 parent df0bd0c2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

renamed blue_link var to primary_color

Showing 6 changed files with 9 additions and 10 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @d7e9eda
@@ -467,7 +467,7 @@ p.time { @@ -467,7 +467,7 @@ p.time {
467 padding: 10px; 467 padding: 10px;
468 } 468 }
469 .current { 469 .current {
470 - border-bottom:2px solid $style_color; 470 + border-bottom: 2px solid $style_color;
471 } 471 }
472 } 472 }
473 473
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @d7e9eda
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 color: #fff; 14 color: #fff;
15 text-shadow: 0 1px 1px #268; 15 text-shadow: 0 1px 1px #268;
16 &:hover { 16 &:hover {
17 - background: $blue_link; 17 + background: $primary_color;
18 color: #fff; 18 color: #fff;
19 } 19 }
20 20
@@ -26,11 +26,11 @@ @@ -26,11 +26,11 @@
26 26
27 &.btn-info { 27 &.btn-info {
28 background: #5aB9C3; 28 background: #5aB9C3;
29 - border-color: $blue_link; 29 + border-color: $primary_color;
30 color: #fff; 30 color: #fff;
31 text-shadow: 0 1px 1px #268; 31 text-shadow: 0 1px 1px #268;
32 &:hover { 32 &:hover {
33 - background: $blue_link; 33 + background: $primary_color;
34 color: #fff; 34 color: #fff;
35 } 35 }
36 36
app/assets/stylesheets/gitlab_bootstrap/typography.scss
  Diff comments   View file @d7e9eda
@@ -38,7 +38,7 @@ a { @@ -38,7 +38,7 @@ a {
38 color: $link_color; 38 color: $link_color;
39 &:hover { 39 &:hover {
40 text-decoration: none; 40 text-decoration: none;
41 - color: $blue_link; 41 + color: $primary_color;
42 } 42 }
43 43
44 &.btn { 44 &.btn {
app/assets/stylesheets/sections/tree.scss
  Diff comments   View file @d7e9eda
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 vertical-align: middle; 31 vertical-align: middle;
32 a { 32 a {
33 &:hover { 33 &:hover {
34 - color: $blue_link; 34 + color: $primary_color;
35 } 35 }
36 } 36 }
37 37
app/assets/stylesheets/themes/ui_basic.scss
  Diff comments   View file @d7e9eda
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 color: $link_color; 12 color: $link_color;
13 &:hover { 13 &:hover {
14 text-decoration: none; 14 text-decoration: none;
15 - color: $blue_link; 15 + color: $primary_color;
16 } 16 }
17 } 17 }
18 18
app/assets/stylesheets/variables.scss
  Diff comments   View file @d7e9eda
1 /** Colors **/ 1 /** Colors **/
  2 +$primary_color: #2FA0BB;
2 $link_color: #3A89A3; 3 $link_color: #3A89A3;
3 -$blue_link: #2FA0BB;  
4 $style_color: #474D57; 4 $style_color: #474D57;
5 -$hover: #D9EDF7;  
6 -$hover_border: #ADF; 5 +$hover: #D9EDF7;
7 \ No newline at end of file 6 \ No newline at end of file