summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-17 18:01:33 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-17 18:01:33 -0700
commitd659c1d1fddcb4d915f07ad1152b1d8a999a1f64 (patch)
tree6f59d919b05642ebc84fd1009f2fa8d93d0ea20a /app/assets/stylesheets/pages
parentcb3b671839ccb99fbe100ae1fe684d391a30f191 (diff)
downloadgitlab-ce-d659c1d1fddcb4d915f07ad1152b1d8a999a1f64.tar.gz
More actively use css variabled to prevent colors duplication
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/diff.scss2
-rw-r--r--app/assets/stylesheets/pages/editor.scss2
-rw-r--r--app/assets/stylesheets/pages/events.scss2
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss2
-rw-r--r--app/assets/stylesheets/pages/tree.scss2
5 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 5a9f93dc03d..83f65913ee6 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -89,7 +89,7 @@
margin: 0px;
padding: 0px;
border: none;
- background: #F5F5F5;
+ background: $background-color;
color: rgba(0,0,0,0.3);
padding: 0px 5px;
border-right: 1px solid $border-color;
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 851f126318d..759ba6b1c22 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -37,7 +37,7 @@
}
.editor-ref {
- background: #f5f5f5;
+ background: $background-color;
padding: 11px 15px;
border-right: 1px solid #CCC;
display: inline-block;
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 3e9e36e477e..480cc2c50a9 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -188,7 +188,7 @@
li a {
font-size: 13px;
padding: 5px 10px;
- background: rgba(0,0,0,0.045);
+ background: $background-color;
margin-left: 4px;
}
}
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index d41e34caba1..fe5667a587f 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -129,7 +129,7 @@
font-size: 15px;
border-bottom: 1px solid #BBB;
color: #777;
- background-color: #F5F5F5;
+ background-color: $background-color;
&.ci-success {
color: $gl-success;
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index ce02cdb1652..b0e6a05fa06 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -27,7 +27,7 @@
}
&.selected {
td {
- background: #f5f5f5;
+ background: $background-color;
border-top: 1px solid #EEE;
border-bottom: 1px solid #EEE;
}