Merge branch 'refactor-css'

app/assets/stylesheets/base/variables.scss

 $style_color: #474D57;
 $hover: #FFF3EB;
+$gl-text-color: #222222;
 $gl-link-color: #446e9b;
 $nprogress-color: #c0392b;
 $gl-font-size: 14px;
@@ -8,23 +9,18 @@ $sidebar_width: 230px;
 $avatar_radius: 50%;
 $code_font_size: 13px;
 $code_line_height: 1.5;
-$border-color: #dce4ec;
-$background-color: #ECF0F1;
+$border-color: #E5E5E5;
+$background-color: #f5f5f5;
 
 /*
  * State colors:
  */
-$gl-success: #019875;
-$gl-danger: #d9534f;
 $gl-primary: #446e9b;
+$gl-success: #019875;
 $gl-info: #029ACF;
 $gl-warning: #EB9532;
+$gl-danger: #d9534f;
 
-$gl-primary:         #2C3E50;
-$gl-success:         #18BC9C;
-$gl-info:            #3498DB;
-$gl-warning:         #F39C12;
-$gl-danger:          #E74C3C;
 /*
  * Commit Diff Colors
  */

app/assets/stylesheets/generic/forms.scss

@@ -29,8 +29,8 @@ fieldset legend {
   padding: 17px 20px 18px;
   margin-top: 18px;
   margin-bottom: 18px;
-  background-color: #ecf0f1;
-  border-top: 1px solid #e5e5e5;
+  background-color: $background-color;
+  border-top: 1px solid $border-color;
 }
 
 @media (min-width: $screen-sm-min) {

app/assets/stylesheets/generic/lists.scss

@@ -61,7 +61,7 @@
     p {
       padding-top: 1px;
       margin: 0;
-      color: #222;
+      color: $gray-dark;
       img {
         position: relative;
         top: 3px;
@@ -74,7 +74,7 @@
     }
 
     .row_title {
-      color: $text-color;
+      color: $gray-dark;
 
       &:hover {
         color: $text-color;

app/assets/stylesheets/generic/nav_sidebar.scss

@@ -58,8 +58,6 @@
 }
 
 .nav-sidebar li {
-  text-shadow: 0 1px 1px $border-color;
-
   &.separate-item {
     border-top: 1px solid $border-color;
     padding-top: 10px;
@@ -67,7 +65,7 @@
   }
 
   a {
-    color: #3b5a5b;
+    color: $gray;
     display: block;
     text-decoration: none;
     padding: 8px 15px;
@@ -78,7 +76,7 @@
     &:hover {
       text-decoration: none;
       color: $text-color;
-      background: #f2f6f7;
+      background: $border-color;
     }
 
     &:active, &:focus {
@@ -87,7 +85,7 @@
 
     i {
       width: 20px;
-      color: $gray-dark;
+      color: $gray-light;
       margin-right: 23px;
     }
   }

app/assets/stylesheets/generic/timeline.scss

@@ -54,7 +54,7 @@
 
       .timeline-content {
         position: relative;
-        background: #f5f5f6;
+        background: $background-color;
         padding: 10px 15px;
         margin-left: 60px;
 
@@ -70,7 +70,7 @@
           height: 0;
           border-style: solid;
           border-width: 9px 9px 9px 0;
-          border-color: transparent #f5f5f6 transparent transparent;
+          border-color: transparent $background-color transparent transparent;
           left: 0;
           top: 10px;
           margin-left: -9px;