Merge branch '25701-standardize-text-colors' into 'master'

25701 standardize text colors

Closes #25701

See merge request !8383

app/assets/stylesheets/pages/projects.scss

@@ -292,7 +292,7 @@
     .option-title {
       font-weight: normal;
       display: inline-block;
-      color: $gl-gray-dark;
+      color: $gl-text-color;
     }
     .option-descr {
@@ -331,7 +331,7 @@
 a.deploy-project-label {
   padding: 5px;
   margin-right: 5px;
-  color: $gl-gray;
+  color: $gl-text-color;
   background-color: $row-hover;
   &:hover {
@@ -372,7 +372,7 @@ a.deploy-project-label {
   }
   a {
-    color: $gl-dark-link-color;
+    color: $gl-text-color;
   }
   .dropdown-menu {
@@ -426,7 +426,7 @@ a.deploy-project-label {
         width: 100%;
         height: 100%;
         padding-top: $gl-padding;
-        color: $gl-gray;
+        color: $gl-text-color;
         .caption {
           min-height: 30px;
@@ -552,7 +552,7 @@ pre.light-well {
   margin: 0 7px 7px;
   h5 {
-    color: $gl-text-color-dark;
+    color: $gl-text-color;
   }
   .light-well {
@@ -662,7 +662,7 @@ pre.light-well {
   }
   .commit-row-message {
-    color: $gl-gray;
+    color: $gl-text-color;
   }
   .commit_short_id {
@@ -750,7 +750,7 @@ pre.light-well {
 .protected-branches-list {
   a {
-    color: $gl-gray;
+    color: $gl-text-color;
     &:hover {
       color: $gl-link-color;

app/assets/stylesheets/pages/settings.scss

 .settings-list-icon {
-  color: $gl-gray-light;
+  color: $gl-text-color-secondary;
   font-size: $settings-icon-size;
   line-height: 42px;
 }

app/assets/stylesheets/pages/status.scss

@@ -61,15 +61,15 @@
     &.ci-canceled,
     &.ci-disabled {
-      color: $gl-gray;
-      border-color: $gl-gray;
+      color: $gl-text-color;
+      border-color: $gl-text-color;
       &:not(span):hover {
-        background-color: rgba($gl-gray, .07);
+        background-color: rgba($gl-text-color, .07);
       }
       svg {
-        fill: $gl-gray;
+        fill: $gl-text-color;
       }
     }
@@ -101,15 +101,15 @@
     &.ci-created,
     &.ci-skipped {
-      color: $gl-gray-light;
-      border-color: $gl-gray-light;
+      color: $gl-text-color-secondary;
+      border-color: $gl-text-color-secondary;
       &:not(span):hover {
-        background-color: rgba($gl-gray-light, .07);
+        background-color: rgba($gl-text-color-secondary, .07);
       }
       svg {
-        fill: $gl-gray-light;
+        fill: $gl-text-color-secondary;
       }
     }

app/assets/stylesheets/pages/todos.scss

@@ -90,7 +90,7 @@
         }
         p {
-          color: $gl-text-color-dark;
+          color: $gl-text-color;
         }
       }

app/assets/stylesheets/pages/tree.scss

@@ -78,7 +78,7 @@
       i,
       a {
-        color: $gl-dark-link-color;
+        color: $gl-text-color;
       }
       img {
@@ -104,21 +104,21 @@
     padding-right: 8px;
     .commit-author-name {
-      color: $gl-gray;
+      color: $gl-text-color;
     }
   }
   .tree-time-ago {
     min-width: 135px;
-    color: $gl-gray-light;
+    color: $gl-text-color-secondary;
   }
   .tree-commit {
     max-width: 320px;
-    color: $gl-gray-light;
+    color: $gl-text-color-secondary;
     .tree-commit-link {
-      color: $gl-gray-light;
+      color: $gl-text-color-secondary;
       &:hover {
         text-decoration: underline;

app/assets/stylesheets/pages/wiki.scss

@@ -15,7 +15,7 @@
   }
   .wiki-last-edit-by {
-    color: $gl-gray-light;
+    color: $gl-text-color-secondary;
     strong {
       color: $gl-text-color;
@@ -24,7 +24,7 @@
   .light {
     font-weight: normal;
-    color: $gl-gray-light;
+    color: $gl-text-color-secondary;
   }
   .git-access-header {

app/views/layouts/nav/_admin.html.haml

@@ -31,7 +31,7 @@
       = link_to admin_abuse_reports_path, title: "Abuse Reports" do
         %span
           Abuse Reports
-          %span.badge.badge-dark.count= number_with_delimiter(AbuseReport.count(:all))
+          %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
     - if askimet_enabled?
       = nav_link(controller: :spam_logs) do

app/views/layouts/nav/_group.html.haml

@@ -26,13 +26,13 @@
         %span
           Issues
           - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-          %span.badge.badge-dark.count= number_with_delimiter(issues.count)
+          %span.badge.count= number_with_delimiter(issues.count)
     = nav_link(path: 'groups#merge_requests') do
       = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
         %span
           Merge Requests
           - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute
-          %span.badge.badge-dark.count= number_with_delimiter(merge_requests.count)
+          %span.badge.count= number_with_delimiter(merge_requests.count)
     = nav_link(controller: [:group_members]) do
       = link_to group_group_members_path(@group), title: 'Members' do
         %span

app/views/layouts/nav/_project.html.haml

@@ -61,14 +61,14 @@
           %span
             Issues
             - if @project.default_issues_tracker?
-              %span.badge.badge-dark.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count)
+              %span.badge.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count)
     - if project_nav_tab? :merge_requests
       = nav_link(controller: :merge_requests) do
         = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
           %span
             Merge Requests
-            %span.badge.badge-dark.count.merge_counter= number_with_delimiter(MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.count)
+            %span.badge.count.merge_counter= number_with_delimiter(MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.count)
     - if project_nav_tab? :wiki
       = nav_link(controller: :wikis) do

changelogs/unreleased/25701-standardize-text-colors.yml

+---
+title: 25701 standardize text colors
+merge_request:
+author: