Improve paddings and set new colors for links

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

10 files changed, 21 insertions, 22 deletions

diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss
index 734b95e26c0..b91c15d8910 100644
--- a/app/assets/stylesheets/base/layout.scss
+++ b/app/assets/stylesheets/base/layout.scss
@@ -21,7 +21,6 @@ html {
   margin-top: 30px;
 }
 
-
 .container-limited {
   max-width: $fixed-layout-width;
 }
diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss
index 5471a93dad8..7d7f481cc43 100644
--- a/app/assets/stylesheets/base/variables.scss
+++ b/app/assets/stylesheets/base/variables.scss
@@ -1,7 +1,7 @@
 $style_color: #474D57;
 $hover: #FFFAF1;
 $gl-text-color: #222222;
-$gl-link-color: #446e9b;
+$gl-link-color: #4c4e54;
 $nprogress-color: #c0392b;
 $gl-font-size: 16px;
 $list-font-size: 16px;
@@ -14,6 +14,7 @@ $border-color: #E5E5E5;
 $background-color: #f5f5f5;
 $header-height: 73px;
 $fixed-layout-width: 1200px;
+$gl-gray: #7f8fa4;
 
 
 /*
diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss
index 1080bc1baa0..16619502a5b 100644
--- a/app/assets/stylesheets/generic/blocks.scss
+++ b/app/assets/stylesheets/generic/blocks.scss
@@ -19,7 +19,7 @@
 }
 
 .gray-content-block {
-  margin: -15px;
+  margin: -18px;
   background-color: #f8fafc;
   padding: 18px;
   margin-bottom: 0px;
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index eaa1fe07b01..17dec228611 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -1,5 +1,5 @@
 /** COLORS **/
-.cgray { color: gray }
+.cgray { color: $gl-gray; }
 .clgray { color: #BBB }
 .cred { color: #D12F19 }
 .cgreen { color: #4a2 }
@@ -20,7 +20,7 @@
 
 .underlined-link { text-decoration: underline; }
 .hint { font-style: italic; color: #999; }
-.light { color: #888 }
+.light { color: $gl-gray; }
 
 .slead {
   color: #666;
@@ -376,10 +376,10 @@ table {
   list-style: none;
   text-align: center;
   margin-top: 5px;
-  margin-bottom: 12px;
+  margin-bottom: 19px;
   height: 60px;
-  margin-top: -15px;
-  padding-top: 15px;
+  margin-top: -18px;
+  padding-top: 18px;
 
   li {
     display: inline-block;
diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss
index d8e0dc028d1..c6a1047e019 100644
--- a/app/assets/stylesheets/generic/selects.scss
+++ b/app/assets/stylesheets/generic/selects.scss
@@ -3,9 +3,9 @@
   .select2-choice {
     background: #FFF;
     border-color: #DDD;
-    height: 34px;
-    padding: 6px 14px;
-    font-size: 14px;
+    height: 42px;
+    padding: 8px 18px;
+    font-size: $gl-font-size;
     line-height: 1.42857143;
 
     @include border-radius(4px);
@@ -13,7 +13,7 @@
     .select2-arrow {
       background: #FFF;
       border-left: none;
-      padding-top: 3px;
+      padding-top: 5px;
     }
   }
 }
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index 88d6c7ca6d6..7f3688801aa 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -25,8 +25,7 @@
 
   .container-fluid {
     background: #FFF;
-    padding-top: 15px;
-    padding-bottom: 15px;
+    padding: 18px;
     border: 1px solid #e7e9ed;
     min-height: 90vh;
   }
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index c570bb1e430..a90b05da293 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -5,7 +5,7 @@
 .event-item {
   font-size: 16px;
   padding: 18px;
-  margin: 0 -15px;
+  margin: 0 -18px;
   border-bottom: 1px solid #f1f2f4;
   color: #7f8fa4;
 
@@ -36,7 +36,7 @@
   }
 
   .event-body {
-    margin-left: 60px;
+    margin-left: 63px;
     margin-right: 80px;
 
     .event-note {
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index e0f9b8cd19b..f8e3d861c08 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -253,7 +253,7 @@ pre.light-well {
 }
 
 .projects-search-form {
-  margin: -15px;
+  margin: -18px;
   background-color: #f8fafc;
   padding: 18px;
   margin-bottom: 0px;
@@ -281,7 +281,7 @@ pre.light-well {
   .project-row {
     padding: 18px;
     border-color: #f1f2f4;
-    margin: 0 -15px;
+    margin: 0 -18px;
 
     &.no-description {
       .project {
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 81e2aa7bb9c..587d09a04a5 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -63,15 +63,15 @@
     padding-right: 8px;
 
     .commit-author-name {
-      color: gray;
+      color: $gl-gray;
     }
   }
 
   .tree_commit {
-    color: gray;
+    color: $gl-gray;
 
     .tree-commit-link {
-      color: gray;
+      color: $gl-gray;
 
       &:hover {
         text-decoration: underline;
diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml
index 742b74a67c7..ad63841ccf3 100644
--- a/app/views/events/_commit.html.haml
+++ b/app/views/events/_commit.html.haml
@@ -1,5 +1,5 @@
 %li.commit
   .commit-row-title
     = link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: ''
-     
+    ·
     = gfm event_commit_title(commit[:message]), project: project