summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/common.scss2
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/buttons.scss6
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/typography.scss2
-rw-r--r--app/assets/stylesheets/sections/tree.scss2
-rw-r--r--app/assets/stylesheets/themes/ui_basic.scss2
-rw-r--r--app/assets/stylesheets/variables.scss5
6 files changed, 9 insertions, 10 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 4b7af54e4c4..3abc796ae6d 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -467,7 +467,7 @@ p.time {
padding: 10px;
}
.current {
- border-bottom:2px solid $style_color;
+ border-bottom: 2px solid $style_color;
}
}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index bb2cfbb954d..883a8773962 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -14,7 +14,7 @@
color: #fff;
text-shadow: 0 1px 1px #268;
&:hover {
- background: $blue_link;
+ background: $primary_color;
color: #fff;
}
@@ -26,11 +26,11 @@
&.btn-info {
background: #5aB9C3;
- border-color: $blue_link;
+ border-color: $primary_color;
color: #fff;
text-shadow: 0 1px 1px #268;
&:hover {
- background: $blue_link;
+ background: $primary_color;
color: #fff;
}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
index 926c5bc82b4..81fb79a43f2 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@@ -38,7 +38,7 @@ a {
color: $link_color;
&:hover {
text-decoration: none;
- color: $blue_link;
+ color: $primary_color;
}
&.btn {
diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss
index 1dbc63611c5..b0d795f4d5a 100644
--- a/app/assets/stylesheets/sections/tree.scss
+++ b/app/assets/stylesheets/sections/tree.scss
@@ -31,7 +31,7 @@
vertical-align: middle;
a {
&:hover {
- color: $blue_link;
+ color: $primary_color;
}
}
diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss
index 3a85b6e9bf6..fee179899ce 100644
--- a/app/assets/stylesheets/themes/ui_basic.scss
+++ b/app/assets/stylesheets/themes/ui_basic.scss
@@ -12,7 +12,7 @@
color: $link_color;
&:hover {
text-decoration: none;
- color: $blue_link;
+ color: $primary_color;
}
}
diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss
index 8e5394c84a0..ba78c8351f4 100644
--- a/app/assets/stylesheets/variables.scss
+++ b/app/assets/stylesheets/variables.scss
@@ -1,6 +1,5 @@
/** Colors **/
+$primary_color: #2FA0BB;
$link_color: #3A89A3;
-$blue_link: #2FA0BB;
$style_color: #474D57;
-$hover: #D9EDF7;
-$hover_border: #ADF;
+$hover: #D9EDF7; \ No newline at end of file