Add latest changes from gitlab-org/gitlab@master

9 files changed, 25 insertions, 34 deletions

diff --git a/app/assets/javascripts/behaviors/markdown/render_math.js b/app/assets/javascripts/behaviors/markdown/render_math.js
index 9d33f051ad0..b1bf6ebcb13 100644
--- a/app/assets/javascripts/behaviors/markdown/render_math.js
+++ b/app/assets/javascripts/behaviors/markdown/render_math.js
@@ -90,7 +90,7 @@ class SafeMathRenderer {
 
       const html = `
           <div class="alert gl-alert gl-alert-warning alert-dismissible lazy-render-math-container js-lazy-render-math-container fade show" role="alert">
-            ${spriteIcon('warning', 'text-warning-600 s16 gl-alert-icon')}
+            ${spriteIcon('warning', 'gl-text-orange-600 s16 gl-alert-icon')}
             <div class="display-flex gl-alert-content">
               <div>${message}</div>
               <div class="gl-alert-actions">
diff --git a/app/assets/javascripts/boards/components/issue_due_date.vue b/app/assets/javascripts/boards/components/issue_due_date.vue
index b09b1d48ca5..c3f7c7d3ca2 100644
--- a/app/assets/javascripts/boards/components/issue_due_date.vue
+++ b/app/assets/javascripts/boards/components/issue_due_date.vue
@@ -102,7 +102,7 @@ export default {
     <gl-tooltip :target="() => $refs.issueDueDate" :placement="tooltipPlacement">
       <span class="bold">{{ __('Due date') }}</span>
       <br />
-      <span :class="{ 'text-danger-muted': isPastDue }">{{ title }}</span>
+      <span :class="{ 'gl-text-red-300': isPastDue }">{{ title }}</span>
     </gl-tooltip>
   </span>
 </template>
diff --git a/app/assets/javascripts/ci/reports/codequality_report/constants.js b/app/assets/javascripts/ci/reports/codequality_report/constants.js
index 5e81245037f..e1486649dbb 100644
--- a/app/assets/javascripts/ci/reports/codequality_report/constants.js
+++ b/app/assets/javascripts/ci/reports/codequality_report/constants.js
@@ -1,10 +1,10 @@
 export const SEVERITY_CLASSES = {
-  info: 'text-primary-400',
-  minor: 'text-warning-200',
-  major: 'text-warning-400',
-  critical: 'text-danger-600',
-  blocker: 'text-danger-800',
-  unknown: 'text-secondary-400',
+  info: 'gl-text-blue-400',
+  minor: 'gl-text-orange-200',
+  major: 'gl-text-orange-400',
+  critical: 'gl-text-red-600',
+  blocker: 'gl-text-red-800',
+  unknown: 'gl-text-gray-400',
 };
 
 export const SEVERITY_ICONS = {
diff --git a/app/assets/javascripts/clusters/agents/constants.js b/app/assets/javascripts/clusters/agents/constants.js
index 76af552181f..e97d6500260 100644
--- a/app/assets/javascripts/clusters/agents/constants.js
+++ b/app/assets/javascripts/clusters/agents/constants.js
@@ -22,7 +22,7 @@ export const EVENT_DETAILS = {
     body: s__('ClusterAgents|Agent %{strongStart}connected%{strongEnd}'),
     titleIcon: {
       name: 'status-success',
-      class: 'text-success-500',
+      class: 'gl-text-green-500',
     },
   },
   agent_disconnected: {
@@ -31,7 +31,7 @@ export const EVENT_DETAILS = {
     body: s__('ClusterAgents|Agent %{strongStart}disconnected%{strongEnd}'),
     titleIcon: {
       name: 'severity-critical',
-      class: 'text-danger-800',
+      class: 'gl-text-red-800',
     },
   },
 };
@@ -50,12 +50,12 @@ export const REVOKE_TOKEN_MODAL_ID = 'revoke-token-%{tokenName}';
 
 export const INTEGRATION_STATUS_VALID_TOKEN = {
   icon: 'status-success',
-  iconClass: 'text-success-500',
+  iconClass: 'gl-text-green-500',
   text: s__('ClusterAgents|Valid access token'),
 };
 export const INTEGRATION_STATUS_NO_TOKEN = {
   icon: 'status-alert',
-  iconClass: 'text-danger-500',
+  iconClass: 'gl-text-red-500',
   text: s__('ClusterAgents|No agent access token'),
 };
 
diff --git a/app/assets/javascripts/clusters_list/constants.js b/app/assets/javascripts/clusters_list/constants.js
index 615754459d6..fe3fa22fea3 100644
--- a/app/assets/javascripts/clusters_list/constants.js
+++ b/app/assets/javascripts/clusters_list/constants.js
@@ -144,7 +144,7 @@ export const AGENT_STATUSES = {
   active: {
     name: s__('ClusterAgents|Connected'),
     icon: 'status-success',
-    class: 'text-success-500',
+    class: 'gl-text-green-500',
     tooltip: {
       title: sprintf(s__('ClusterAgents|Last connected %{timeAgo}.')),
     },
@@ -152,7 +152,7 @@ export const AGENT_STATUSES = {
   inactive: {
     name: s__('ClusterAgents|Not connected'),
     icon: 'status-alert',
-    class: 'text-danger-500',
+    class: 'gl-text-red-500',
     tooltip: {
       title: s__('ClusterAgents|Agent might not be connected to GitLab'),
       body: sprintf(
@@ -165,7 +165,7 @@ export const AGENT_STATUSES = {
   unused: {
     name: s__('ClusterAgents|Never connected'),
     icon: 'status-neutral',
-    class: 'text-secondary-500',
+    class: 'gl-text-gray-500',
     tooltip: {
       title: s__('ClusterAgents|Agent never connected to GitLab'),
       body: s__('ClusterAgents|Make sure you are using a valid token.'),
diff --git a/app/assets/javascripts/design_management/components/list/item.vue b/app/assets/javascripts/design_management/components/list/item.vue
index d6405549452..f52486f0629 100644
--- a/app/assets/javascripts/design_management/components/list/item.vue
+++ b/app/assets/javascripts/design_management/components/list/item.vue
@@ -64,17 +64,17 @@ export default {
       const icons = {
         creation: {
           name: 'file-addition-solid',
-          classes: 'text-success-500',
+          classes: 'gl-text-green-500',
           tooltip: __('Added in this version'),
         },
         modification: {
           name: 'file-modified-solid',
-          classes: 'text-primary-500',
+          classes: 'gl-text-blue-500',
           tooltip: __('Modified in this version'),
         },
         deletion: {
           name: 'file-deletion-solid',
-          classes: 'text-danger-500',
+          classes: 'gl-text-red-500',
           tooltip: __('Archived in this version'),
         },
       };
diff --git a/app/assets/javascripts/issuable/components/issue_milestone.vue b/app/assets/javascripts/issuable/components/issue_milestone.vue
index 4f1001e8c3b..c7da3e59098 100644
--- a/app/assets/javascripts/issuable/components/issue_milestone.vue
+++ b/app/assets/javascripts/issuable/components/issue_milestone.vue
@@ -82,7 +82,7 @@ export default {
       <span
         v-if="milestoneStart || milestoneDue"
         :class="{
-          'text-danger-muted': isMilestonePastDue,
+          'gl-text-red-300': isMilestonePastDue,
           'text-tertiary': !isMilestonePastDue,
         }"
         ><span>{{ milestoneDatesHuman }}</span
diff --git a/app/assets/javascripts/vue_shared/security_reports/components/constants.js b/app/assets/javascripts/vue_shared/security_reports/components/constants.js
index 9b1cbfe218b..6fe98764fcd 100644
--- a/app/assets/javascripts/vue_shared/security_reports/components/constants.js
+++ b/app/assets/javascripts/vue_shared/security_reports/components/constants.js
@@ -1,8 +1,8 @@
 export const SEVERITY_CLASS_NAME_MAP = {
-  critical: 'text-danger-800',
-  high: 'text-danger-600',
-  medium: 'text-warning-400',
-  low: 'text-warning-200',
-  info: 'text-primary-400',
-  unknown: 'text-secondary-400',
+  critical: 'gl-text-red-800',
+  high: 'gl-text-red-600',
+  medium: 'gl-text-orange-400',
+  low: 'gl-text-orange-200',
+  info: 'gl-text-blue-400',
+  unknown: 'gl-text-gray-400',
 };
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index dbcafadd13a..34f8a1622f4 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -4,15 +4,6 @@
   to see the available utility classes. If you cannot find the class you need,
   consider adding it to Gitlab UI before adding it here.
 **/
-
-@each $variant, $range in $color-ranges {
-  @each $suffix, $color in $range {
-    #{'.text-#{$variant}-#{$suffix}'} {
-      color: $color;
-    }
-  }
-}
-
 @each $index, $size in $type-scale {
   #{'.text-#{$index}'} {
     font-size: $size;