Refactor colors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

7 files changed, 17 insertions, 14 deletions

diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss
index b0cf1cb6f06..b87f16eed0a 100644
--- a/app/assets/stylesheets/base/variables.scss
+++ b/app/assets/stylesheets/base/variables.scss
@@ -1,6 +1,5 @@
-$style_color: #474D57;
 $hover: #FFFAF1;
-$gl-text-color: #7f8fa4;
+$gl-text-color: #54565b;
 $gl-header-color: #4c4e54;
 $gl-link-color: #333c48;
 $nprogress-color: #c0392b;
diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss
index 16619502a5b..01dec66e3d0 100644
--- a/app/assets/stylesheets/generic/blocks.scss
+++ b/app/assets/stylesheets/generic/blocks.scss
@@ -1,18 +1,18 @@
 .light-well {
-  background: #f9f9f9;
+  background-color: #f8fafc;
   padding: 15px;
 }
 
 .centered-light-block {
   text-align: center;
-  color: #888;
+  color: $gl-gray;
   margin: 20px;
 }
 
 .nothing-here-block {
   text-align: center;
   padding: 20px;
-  color: #666;
+  color: $gl-gray;
   font-weight: normal;
   font-size: 16px;
   line-height: 36px;
@@ -25,4 +25,9 @@
   margin-bottom: 0px;
   border-top: 1px solid #e7e9ed;
   border-bottom: 1px solid #e7e9ed;
+  color: $gl-gray;
+
+  .title {
+    color: $gl-text-color;
+  }
 }
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 55569bebfa8..1f5e972eed4 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -74,8 +74,6 @@ pre {
   color: $gl-link-color;
 }
 
-.help li { color:$style_color; }
-
 .back-link {
   font-size: 14px;
 }
diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss
index 04a98fc6958..7302f84c3aa 100644
--- a/app/assets/stylesheets/generic/lists.scss
+++ b/app/assets/stylesheets/generic/lists.scss
@@ -109,10 +109,16 @@ ul.content-list {
     padding: 18px;
     border-color: #f1f2f4;
     margin: 0 -18px;
+    color: $gl-gray;
 
     .avatar {
       margin-right: 15px;
     }
+
+    .controls {
+      padding-top: 10px;
+      float: right;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index e7125c03993..5436c6dad97 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -61,10 +61,6 @@
   }
 }
 
-.file-stats a {
-  color: $style_color;
-}
-
 .file-stats {
   .new-file {
     a {
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml
index 0c7f8a6f2f9..9307812d495 100644
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -7,8 +7,7 @@
       = link_to new_group_path, class: "btn btn-new" do
         %i.fa.fa-plus
         New Group
-  Welcome to the groups!
-  %br
+  .title Welcome to the groups!
   Group members have access to all group projects.
 
 %ul.content-list
diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml
index 444410b2584..55e6370811d 100644
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -1,7 +1,7 @@
 - group_member = local_assigns[:group_member]
 %li
   - if group_member
-    .pull-right.hidden-xs
+    .controls.hidden-xs
       - if can?(current_user, :admin_group, group)
         = link_to edit_group_path(group), class: "btn-sm btn btn-grouped" do
           %i.fa.fa-cogs