Cleanup css variables

app/assets/stylesheets/generic/common.scss

@@ -71,7 +71,7 @@ pre {
 
 /** FLASH message **/
 .author_link {
-  color: $link_color;
+  color: $gl-link-color;
 }
 
 .help li { color:$style_color; }

app/assets/stylesheets/generic/typography.scss

@@ -2,28 +2,12 @@
  * Headers
  *
  */
-h1.page-title {
-  @include page-title;
-  font-size: 28px;
-}
-
-h2.page-title {
-  @include page-title;
-  font-size: 24px;
-}
-
-h3.page-title {
-  @include page-title;
-  font-size: 22px;
-}
-
-h4.page-title {
+.page-title {
   margin-top: 0px;
-}
-
-h6 {
-  color: #888;
-  text-transform: uppercase;
+  color: #333;
+  line-height: 1.5;
+  font-weight: normal;
+  margin-bottom: 5px;
 }
 
 /** CODE **/
@@ -36,52 +20,6 @@ pre {
   }
 }
 
-/**
- * Links
- *
- */
-a {
-  outline: none;
-  color: $link_color;
-  &:hover {
-    text-decoration: underline;
-    color: $link_hover_color;
-  }
-
-  &:focus {
-    text-decoration: underline;
-  }
-
-  &.darken {
-    color: $style_color;
-  }
-
-  &.lined {
-    text-decoration: underline;
-    &:hover { text-decoration: underline; }
-  }
-
-  &.gray {
-    color: gray;
-  }
-
-  &.supp_diff_link {
-    text-align: center;
-    padding: 20px 0;
-    background: #f1f1f1;
-    width: 100%;
-    float: left;
-  }
-
-  &.neib  {
-    margin-right: 15px;
-  }
-}
-
-a:focus {
-  outline: none;
-}
-
 .monospace {
   font-family: $monospace_font;
 }

app/assets/stylesheets/gl_bootstrap.scss

@@ -2,29 +2,7 @@
  * Twitter bootstrap with GitLab customizations/additions
  *
  */
-
-$font-size-base: 13px !default;
-$nav-pills-active-link-hover-bg: $gl-primary;
-$pagination-active-bg: $gl-primary;
-$list-group-active-bg: $gl-primary;
-
-$brand-primary:    $gl-primary;
-$brand-success:    $gl-success;
-$brand-info:       #029ACF;
-$brand-warning:    $gl-warning;
-$brand-danger:     $gl-danger;
-
-$state-primary-bg: lighten($gl-primary, 30%);
-$state-success-bg: lighten($gl-success, 10%);
-$state-info-bg:    lighten($gl-info, 30%);
-$state-warning-bg: lighten($gl-warning, 30%);
-$state-danger-bg:  lighten($gl-danger, 30%);
-
-$state-primary-txt: $gl-primary;
-$state-success-txt: $gl-success;
-$state-info-txt:    $gl-info;
-$state-warning-txt: $gl-warning;
-$state-danger-txt:  $gl-danger;
+@import "gl_variables";
 
 // Core variables and mixins
 @import "bootstrap/variables";

app/assets/stylesheets/main/mixins.scss

@@ -121,14 +121,6 @@
   }
 }
 
-@mixin page-title {
-  color: #333;
-  line-height: 1.5;
-  font-weight: normal;
-  margin-top: 0px;
-  margin-bottom: 10px;
-}
-
 @mixin str-truncated($max_width: 82%) {
   display: inline-block;
   overflow: hidden;

app/assets/stylesheets/main/variables.scss

-/*
- * General Colors
- */
 $style_color: #474D57;
 $hover: #FFF3EB;
 $box_bg: #F9F9F9;
-
-/*
- * Link colors
- */
-$link_color: #446e9b;
-$link_hover_color: darken($link-color, 10%);
-
-$btn-border: 1px solid #ccc;
+$gl-link-color: #446e9b;
+$nprogress-color: #c0392b;
+$gl-font-size: 13px;
+$list-font-size: 15px;
+$sidebar_width: 230px;
+$avatar_radius: 50%;
+$code_font_size: 13px;
+$code_line_height: 1.5;
 
 /*
  * State colors:
@@ -27,22 +24,3 @@ $gl-warning: #EB9532;
  */
 $added: #63c363;
 $deleted: #f77;
-
-/**
- * NProgress customize
- */
-$nprogress-color: #c0392b;
-
-/**
- * Font sizes
- */
-$list-font-size: 15px;
-
-/**
- * Sidebar navigation width
- */
-$sidebar_width: 230px;
-
-$avatar_radius: 50%;
-$code_font_size: 13px;
-$code_line_height: 1.5;

app/assets/stylesheets/sections/notes.scss

@@ -40,7 +40,7 @@ ul.notes {
       font-weight: bold;
       font-size: 14px;
       &:hover {
-        color: $link_color;
+        color: $gl-link-color;
       }
     }
     .author-username {
@@ -153,7 +153,6 @@ ul.notes {
       @extend .cgray;
 
       &:hover {
-        color: $link_hover_color;
         &.danger { @extend .cred; }
       }
     }
@@ -181,7 +180,7 @@ ul.notes {
     background: #FFF;
     padding: 4px;
     font-size: 16px;
-    color: $link_color;
+    color: $gl-link-color;
     margin-left: -60px;
     position: absolute;
     z-index: 10;

app/assets/stylesheets/sections/projects.scss

@@ -108,7 +108,7 @@
 
   .btn {
     background: none;
-    color: $link_color;
+    color: $gl-link-color;
 
     &.active {
       background-color: #f5f5f5;

app/assets/stylesheets/sections/tree.scss

@@ -39,11 +39,6 @@
     .tree-item-file-name {
       max-width: 320px;
       vertical-align: middle;
-      a {
-        &:hover {
-          color: $link_hover_color;
-        }
-      }
 
       i {
         color: $gl-primary;