Merge branch 'remove-scss-variables-3' into 'master'

Remove more variable reassignments and unused styles

See merge request gitlab-org/gitlab-ce!21262

app/assets/stylesheets/framework/awards.scss

@@ -141,8 +141,8 @@
   &:hover,
   &:active,
   &.is-active {
-    background-color: $row-hover;
-    border-color: $row-hover-border;
+    background-color: $blue-50;
+    border-color: $blue-200;
     box-shadow: none;
     outline: 0;

app/assets/stylesheets/framework/common.scss

@@ -71,7 +71,7 @@ pre {
   }
   &.card.card-body-pre {
-    border: 1px solid $well-pre-bg;
+    border: 1px solid $gray-darker;
     background: $gray-light;
     border-radius: 0;
     color: $well-pre-color;
@@ -233,7 +233,7 @@ li.note {
 .error-message {
   padding: 10px;
-  background: $error-bg;
+  background: $red-400;
   margin: 0;
   color: $white-light;
@@ -244,11 +244,11 @@ li.note {
 }
 .warning_message {
-  border-left: 4px solid $warning-message-border;
-  color: $warning-message-color;
+  border-left: 4px solid $orange-200;
+  color: $orange-700;
   padding: 10px;
   margin-bottom: 10px;
-  background: $warning-message-bg;
+  background: $orange-100;
   padding-left: 20px;
   &.centered {
@@ -348,15 +348,6 @@ img.emoji {
   }
 }
-.profiler-results {
-  top: 73px !important;
-
-  .profiler-button,
-  .profiler-controls {
-    border-color: $profiler-border !important;
-  }
-}
-
 .dropzone .dz-preview .dz-progress {
   border-color: $border-color !important;

app/assets/stylesheets/framework/files.scss

@@ -112,7 +112,7 @@
     &.image_file,
     &.video {
-      background: $file-image-bg;
+      background: $gray-darker;
       text-align: center;
       padding: 30px;
@@ -131,7 +131,7 @@
     }
     &.blob-no-preview {
-      background: $blob-bg;
+      background: $gray-darker;
       text-shadow: 0 1px 2px $white-light;
       padding: 100px 0;
     }
@@ -146,7 +146,7 @@
       }
       tr {
-        border-bottom: 1px solid $blame-border;
+        border-bottom: 1px solid $gray-darker;
         &:last-child {
           border-bottom: 0;
@@ -211,7 +211,7 @@
     }
     &.logs {
-      background: $logs-bg;
+      background: $gray-darker;
       max-height: 700px;
       overflow-y: auto;
@@ -233,7 +233,7 @@
           }
           &:hover {
-            background: $row-hover;
+            background: $blue-50;
           }
         }
       }

app/assets/stylesheets/framework/issue_box.scss

@@ -39,7 +39,7 @@
   }
   &.status-box-expired {
-    background-color: $issue-status-expired;
+    background-color: $orange-500;
   }
   &.status-box-upcoming {

app/assets/stylesheets/framework/lists.scss

@@ -21,11 +21,11 @@
     }
     &.disabled {
-      color: $list-text-disabled-color;
+      color: $gl-text-color-tertiary;
     }
     &:not(.ui-sort-disabled):hover {
-      background: $row-hover;
+      background: $blue-50;
     }
     &.unstyled {
@@ -35,12 +35,12 @@
     }
     &.warning-row {
-      background-color: $list-warning-row-bg;
-      border-color: $list-warning-row-border;
-      color: $list-warning-row-color;
+      background-color: $orange-100;
+      border-color: $orange-200;
+      color: $orange-700;
       &:hover {
-        background: $list-warning-row-bg;
+        background: $orange-100;
       }
     }
@@ -73,7 +73,7 @@
     }
     .card.card-body-title {
-      font-size: $list-font-size;
+      font-size: $gl-font-size;
       line-height: 18px;
     }
   }
@@ -109,8 +109,8 @@ ul.content-list {
   li {
     border-color: $white-normal;
-    font-size: $list-font-size;
-    color: $list-text-color;
+    font-size: $gl-font-size;
+    color: $gl-text-color;
     &.no-description {
       .title {

app/assets/stylesheets/framework/mixins.scss

@@ -50,7 +50,7 @@
     @include clearfix;
     padding: 10px 0;
-    border-bottom: 1px solid $list-border-light;
+    border-bottom: 1px solid $gray-darker;
     display: block;
     margin: 0;

app/assets/stylesheets/framework/typography.scss

@@ -7,7 +7,7 @@
   }
   a {
-    color: $md-link-color;
+    color: $blue-600;
   }
   img:not(.emoji) {

app/assets/stylesheets/framework/variables.scss

@@ -203,21 +203,12 @@ $gl-header-color: #4c4e54;
 /*
  * Lists
  */
-$list-font-size: $gl-font-size;
-$list-title-color: $gl-text-color;
-$list-text-color: $gl-text-color;
-$list-text-disabled-color: $gl-text-color-tertiary;
-$list-border-light: #eee;
 $list-border: rgba(0, 0, 0, 0.05);
 $list-text-height: 42px;
-$list-warning-row-bg: $orange-100;
-$list-warning-row-border: $orange-200;
-$list-warning-row-color: $orange-700;
 /*
  * Markdown
  */
-$md-link-color: $blue-600;
 $md-area-border: #ddd;
 /*
@@ -249,8 +240,6 @@ $gl-bar-padding: 3px;
 /*
  * Misc
  */
-$row-hover: $blue-50;
-$row-hover-border: $blue-200;
 $progress-color: #c0392b;
 $header-height: 40px;
 $ide-statusbar-height: 25px;
@@ -258,19 +247,13 @@ $fixed-layout-width: 1280px;
 $limited-layout-width: 990px;
 $container-text-max-width: 540px;
 $gl-avatar-size: 40px;
-$error-exclamation-point: $red-500;
 $border-radius-default: 4px;
 $border-radius-small: 2px;
 $settings-icon-size: 18px;
-$provider-btn-not-active-color: $blue-500;
-$link-underline-blue: $blue-500;
-$active-item-blue: $blue-500;
 $layout-link-gray: #7e7c7c;
 $btn-side-margin: 10px;
 $btn-sm-side-margin: 7px;
 $btn-margin-5: 5px;
-$issue-status-expired: $orange-500;
-$issuable-sidebar-color: $gl-text-color-secondary;
 $sidebar-block-hover-color: #ebebeb;
 $group-path-color: #999;
 $namespace-kind-color: #aaa;
@@ -292,7 +275,6 @@ $breadcrumb-min-height: 48px;
 * Common component specific colors
 */
 $hint-color: #999;
-$well-pre-bg: #eee;
 $well-pre-color: #555;
 $loading-color: #555;
 $update-author-color: #999;
@@ -301,10 +283,6 @@ $user-mention-bg-hover: rgba($blue-500, 0.15);
 $time-color: #999;
 $project-member-show-color: #aaa;
 $gl-promo-color: #aaa;
-$error-bg: $red-400;
-$warning-message-bg: $orange-100;
-$warning-message-border: $orange-200;
-$warning-message-color: $orange-700;
 $control-group-descr-color: #666;
 $table-permission-x-bg: #d9edf7;
 $username-color: #666;
@@ -374,7 +352,7 @@ $dropdown-min-height: 40px;
 $dropdown-max-height: 312px;
 $dropdown-vertical-offset: 4px;
 $dropdown-link-color: #555;
-$dropdown-link-hover-bg: $row-hover;
+$dropdown-link-hover-bg: $blue-50;
 $dropdown-empty-row-bg: rgba(#000, 0.04);
 $dropdown-border-color: $border-color;
 $dropdown-shadow-color: rgba(#000, 0.1);
@@ -592,11 +570,7 @@ $events-body-border: #ddd;
 /*
 * Files
 */
-$file-image-bg: #eee;
-$blob-bg: #eee;
-$blame-border: #eee;
 $blame-line-numbers-border: #ddd;
-$logs-bg: #eee;
 $logs-li-color: #888;
 $logs-p-color: #333;
@@ -667,7 +641,6 @@ $login-devise-error-color: $red-700;
 * Nav
 */
 $nav-link-gray: #959494;
-$nav-badge-bg: #eee;
 $nav-toggle-gray: #666;
 /*

app/assets/stylesheets/pages/boards.scss

@@ -288,7 +288,7 @@
   &.is-active,
   &.is-active .board-card-assignee:hover a {
-    background-color: $row-hover;
+    background-color: $blue-50;
   }
   .badge {

app/assets/stylesheets/pages/cycle_analytics.scss

@@ -165,7 +165,7 @@
         border-right-color: transparent;
         border-top-color: $border-color;
         border-bottom-color: $border-color;
-        box-shadow: inset 2px 0 0 0 $active-item-blue;
+        box-shadow: inset 2px 0 0 0 $blue-500;
         .stage-name {
           font-weight: $gl-font-weight-bold;

app/assets/stylesheets/pages/diff.scss

@@ -186,7 +186,7 @@
   }
   .image {
-    background: $file-image-bg;
+    background: $gray-darker;
     text-align: center;
     padding: 30px;

app/assets/stylesheets/pages/events.scss

@@ -6,7 +6,7 @@
   font-size: $gl-font-size;
   padding: $gl-padding-top 0 $gl-padding-top 40px;
   border-bottom: 1px solid $white-normal;
-  color: $list-text-color;
+  color: $gl-text-color;
   position: relative;
   &.event-inline {
@@ -58,7 +58,7 @@
   .event-title {
     @include str-truncated(calc(100% - 174px));
     font-weight: $gl-font-weight-bold;
-    color: $list-text-color;
+    color: $gl-text-color;
   }
   .event-body {

app/assets/stylesheets/pages/groups.scss

@@ -385,8 +385,8 @@
     padding: $gl-padding-top;
     &:hover {
-      border-color: $row-hover-border;
-      background-color: $row-hover;
+      border-color: $blue-200;
+      background-color: $blue-50;
       cursor: pointer;
     }

app/assets/stylesheets/pages/issuable.scss

@@ -423,10 +423,10 @@
       width: 100%;
       text-align: center;
       margin-bottom: 10px;
-      color: $issuable-sidebar-color;
+      color: $gl-text-color-secondary;
       svg {
-        fill: $issuable-sidebar-color;
+        fill: $gl-text-color-secondary;
       }
       &:hover:not(.disabled),
@@ -457,14 +457,14 @@
       }
       .avatar-counter:hover {
-        color: $issuable-sidebar-color;
-        border-color: $issuable-sidebar-color;
+        color: $gl-text-color-secondary;
+        border-color: $gl-text-color-secondary;
       }
       .btn-clipboard {
         border: 0;
         background: transparent;
-        color: $issuable-sidebar-color;
+        color: $gl-text-color-secondary;
         &:hover {
           color: $gl-text-color;
@@ -821,7 +821,7 @@
     svg {
       width: 16px;
       height: 16px;
-      fill: $issuable-sidebar-color;
+      fill: $gl-text-color-secondary;
     }
     &:hover svg {

app/assets/stylesheets/pages/profile.scss

@@ -20,7 +20,7 @@
 .account-btn-link,
 .profile-settings-sidebar a,
 .settings-sidebar a {
-  color: $md-link-color;
+  color: $blue-600;
 }
 .private-tokens-reset div.reset-action:not(:first-child) {
@@ -137,7 +137,7 @@
 .profile-settings-content {
   a {
-    color: $md-link-color;
+    color: $blue-600;
   }
 }
@@ -170,7 +170,7 @@
   background-color: $gray-light;
   &.not-active {
-    color: $provider-btn-not-active-color;
+    color: $blue-500;
   }
 }

app/assets/stylesheets/pages/projects.scss

@@ -449,8 +449,8 @@
   &:hover:not(.disabled),
   &.forked {
-    background-color: $row-hover;
-    border-color: $row-hover-border;
+    background-color: $blue-50;
+    border-color: $blue-200;
   }
   .avatar-container,
@@ -894,7 +894,7 @@ pre.light-well {
 .cannot-be-merged,
 .cannot-be-merged:hover {
-  color: $error-exclamation-point;
+  color: $red-500;
   margin-top: 2px;
 }

app/assets/stylesheets/pages/settings.scss

@@ -113,9 +113,9 @@
 .settings-message {
   padding: 5px;
   line-height: 1.3;
-  color: $warning-message-color;
-  background-color: $warning-message-bg;
-  border: 1px solid $warning-message-border;
+  color: $orange-700;
+  background-color: $orange-100;
+  border: 1px solid $orange-200;
   border-radius: $border-radius-base;
 }
@@ -303,7 +303,7 @@
 }
 .mirror-error-badge {
-  background-color: $error-bg;
+  background-color: $red-400;
   border-radius: $border-radius-default;
   color: $white-light;
 }

app/assets/stylesheets/pages/todos.scss

@@ -12,8 +12,8 @@
   flex-direction: row;
   &:hover {
-    background-color: $row-hover;
-    border-color: $row-hover-border;
+    background-color: $blue-50;
+    border-color: $blue-200;
     cursor: pointer;
   }
@@ -22,7 +22,7 @@
     border-bottom: 1px solid transparent;
     &:hover {
-      border-color: $row-hover-border;
+      border-color: $blue-200;
     }
   }

app/assets/stylesheets/pages/tree.scss

@@ -111,9 +111,9 @@
       &:hover:not(.tree-truncated-warning) {
         td {
-          background-color: $row-hover;
-          border-top: 1px solid $row-hover-border;
-          border-bottom: 1px solid $row-hover-border;
+          background-color: $blue-50;
+          border-top: 1px solid $blue-200;
+          border-bottom: 1px solid $blue-200;
           cursor: pointer;
         }
       }
@@ -229,7 +229,7 @@
 .upload-link {
   font-weight: $gl-font-weight-normal;
-  color: $md-link-color;
+  color: $blue-600;
 }
 .repo-charts {