Merge branch…

Merge branch '35069-stop-using-rgba-for-text-color-as-it-leads-to-worse-readability-on-non-retina-screens' into 'master' Resolve "Stop using RGBA for text color as it leads to worse readability on non-retina screens" Closes #35069 See merge request !12873

Merge branch…
d9ed329b · Annabel Dunstone Gray · d9dd621a · 43f6bb2e · d9ed329b · d9ed329b
Commit d9ed329b authored Jul 14, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

variables.scss app/assets/stylesheets/framework/variables.scss +6 -6

new_nav.scss app/assets/stylesheets/new_nav.scss +3 -3

No files found.
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -110,10 +110,10 @@ $well-light-text-color: #5b6169;
 * Text
 */
 $gl-font-size: 14px;
-$gl-text-color: rgba(0, 0, 0, .85);
-$gl-text-color-light: rgba(0, 0, 0, .7);
-$gl-text-color-secondary: rgba(0, 0, 0, .55);
-$gl-text-color-disabled: rgba(0, 0, 0, .35);
+$gl-text-color: #2e2e2e;
+$gl-text-color-secondary: #707070;
+$gl-text-color-tertiary: #949494;
+$gl-text-color-quaternary: #d6d6d6;
 $gl-text-color-inverted: rgba(255, 255, 255, 1.0);
 $gl-text-color-secondary-inverted: rgba(255, 255, 255, .85);
 $gl-text-green: $green-600;
@@ -127,7 +127,7 @@ $gl-gray-dark: #313236;
 $gl-gray-light: #5c5c5c;
 $gl-header-color: #4c4e54;
 $gl-header-nav-hover-color: #434343;
-$placeholder-text-color: rgba(0, 0, 0, .42);
+$placeholder-text-color: $gl-text-color-tertiary;

 /*
 * Lists
@@ -135,7 +135,7 @@ $placeholder-text-color: rgba(0, 0, 0, .42);
 $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-disabled;
+$list-text-disabled-color: $gl-text-color-tertiary;
 $list-border-light: #eee;
 $list-border: rgba(0, 0, 0, 0.05);
 $list-text-height: 42px;

--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -284,7 +284,7 @@ header.navbar-gitlab-new {
    position: relative;
    top: -1px;
    padding: 0 5px;
-    color: rgba($black, .65);
+    color: $gl-text-color-secondary;
    font-size: 10px;
    line-height: 1;
    background: none;
@@ -310,10 +310,10 @@ header.navbar-gitlab-new {
 .breadcrumbs-links {
  flex: 1;
  align-self: center;
-  color: $black-transparent;
+  color: $gl-text-color-quaternary;

  a {
-    color: rgba($black, .65);
+    color: $gl-text-color-secondary;

    &:not(:first-child),
    &.group-path {