summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-18 17:48:52 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-18 17:48:52 +0100
commit5e2728891ecc375ee51d17aad1c40898cf3e16c1 (patch)
tree333cd180b6875989deee26c64a6351f0fc2f8dc5
parent3837f4413a0773d7d57a659d2ab8ccfcbe67ea7e (diff)
downloadgitlab-ce-5e2728891ecc375ee51d17aad1c40898cf3e16c1.tar.gz
Cleanup somce css colors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/framework/variables.scss25
-rw-r--r--app/assets/stylesheets/pages/events.scss7
-rw-r--r--app/assets/stylesheets/pages/issues.scss6
-rw-r--r--app/assets/stylesheets/pages/todos.scss7
4 files changed, 25 insertions, 20 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 61b52136c67..d455a3d8e29 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -17,25 +17,29 @@ $background-color: #faf9f9;
/*
* Text
*/
-$secondary-text: #555;
-$placeholder-color: #8f8f8f;
-$gl-text-color: #54565b;
+$gl-font-size: 15px;
+$gl-title-color: #333;
+$gl-text-color: #555;
+$gl-placeholder-color: #8f8f8f;
$gl-text-green: #4a2;
$gl-text-red: #d12f19;
$gl-text-orange: #d90;
-$gl-header-color: #323232;
+$gl-header-color: $gl-title-color;
$gl-link-color: #333c48;
-$gl-gray: #5a5a5a;
-$md-text-color: #444;
-$md-link-color: #3084bb;
+$gl-gray: $gl-text-color;
/*
* Lists
*/
-$list-title-color: #333;
-$list-text-color: #555;
-$list-font-size: 15px;
+$list-font-size: $gl-font-size;
+$list-title-color: $gl-title-color;
+$list-text-color: $gl-text-color;
+/*
+ * Markdown
+ */
+$md-text-color: #444;
+$md-link-color: #3084bb;
/*
* Code
@@ -56,7 +60,6 @@ $gl-padding-top: 10px;
*/
$row-hover: #f4f8fe;
$progress-color: #c0392b;
-$gl-font-size: 15px;
$avatar_radius: 50%;
$header-height: 58px;
$fixed-layout-width: 1280px;
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index b39a9abf40f..040e1d38678 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -6,7 +6,7 @@
font-size: $gl-font-size;
padding: $gl-padding-top 0 $gl-padding-top ($gl-avatar-size + $gl-padding-top);
border-bottom: 1px solid $table-border-color;
- color: #7f8fa4;
+ color: $list-text-color;
&.event-inline {
.avatar {
@@ -31,9 +31,10 @@
.event-title {
@include str-truncated(calc(100% - 174px));
font-weight: 600;
+ color: $list-title-color;
- .author_name {
- color: #333;
+ a {
+ color: $list-title-color;
}
}
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 7ac4bc468d6..76bd6d9a8a7 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -130,14 +130,14 @@ form.edit-issue {
}
.issue-closed-by-widget {
- color: $secondary-text;
+ color: $gl-text-color;
margin-left: 52px;
}
.editor-details {
display: block;
-
+
@media (min-width: $screen-sm-min) {
display: inline-block;
}
-} \ No newline at end of file
+}
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index 27970eba159..dbd6585fc31 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -16,7 +16,7 @@
.todo-item {
font-size: $gl-font-size;
padding-left: $gl-avatar-size + $gl-padding-top;
- color: $secondary-text;
+ color: $gl-text-color;
a {
color: #4c4e54;
@@ -29,9 +29,10 @@
.todo-title {
@include str-truncated(calc(100% - 174px));
font-weight: 600;
+ color: $list-title-color;
- .author-name {
- color: #333;
+ a {
+ color: $list-title-color;
}
}