From a96d1ac095da98cc0c0e3ca5842c480e9d065578 Mon Sep 17 00:00:00 2001
From: Chad Lavimoniere <clavimoniere@gitlab.com>
Date: Mon, 22 Jul 2024 19:19:09 -0400
Subject: [PATCH] Replace cred with gl-text-red-500
Changelog: other
---
app/assets/javascripts/diffs/components/file_row_stats.vue | 2 +-
.../merge_conflicts/merge_conflict_resolver_app.vue | 2 +-
.../javascripts/vue_shared/components/file_finder/item.vue | 2 +-
app/assets/stylesheets/framework/common.scss | 1 -
app/views/admin/health_check/show.html.haml | 2 +-
app/views/admin/projects/show.html.haml | 4 ++--
app/views/admin/users/show.html.haml | 4 ++--
app/views/projects/_issue.html.haml | 2 +-
app/views/projects/commit/x509/_certificate_details.html.haml | 2 +-
app/views/shared/notes/_note.html.haml | 2 +-
.../code_review_analytics/components/merge_request_table.vue | 2 +-
ee/app/views/ldap_group_links/_ldap_group_link.html.haml | 2 +-
.../components/__snapshots__/merge_request_table_spec.js.snap | 2 +-
spec/frontend/diffs/components/file_row_stats_spec.js | 2 +-
14 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/app/assets/javascripts/diffs/components/file_row_stats.vue b/app/assets/javascripts/diffs/components/file_row_stats.vue
index f99f363a6be9..329771d744ab 100644
--- a/app/assets/javascripts/diffs/components/file_row_stats.vue
+++ b/app/assets/javascripts/diffs/components/file_row_stats.vue
@@ -12,7 +12,7 @@ export default {
<template>
<span class="file-row-stats">
<span class="cgreen"> +{{ file.addedLines }} </span>
- <span class="cred"> -{{ file.removedLines }} </span>
+ <span data-testid="file-removed-lines" class="gl-text-red-500"> -{{ file.removedLines }} </span>
</span>
</template>
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
index c98db96f6004..1886e7641df2 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
@@ -100,7 +100,7 @@ export default {
<div data-testid="conflicts-count">
<gl-sprintf :message="$options.i18n.commitStatSummary">
<template #conflict>
- <strong class="cred">{{ getConflictsCountText }}</strong>
+ <strong class="gl-text-danger">{{ getConflictsCountText }}</strong>
</template>
<template #sourceBranch>
<strong class="ref-name">{{ conflictsData.sourceBranch }}</strong>
diff --git a/app/assets/javascripts/vue_shared/components/file_finder/item.vue b/app/assets/javascripts/vue_shared/components/file_finder/item.vue
index 59a8a24baad6..4276b8251cf2 100644
--- a/app/assets/javascripts/vue_shared/components/file_finder/item.vue
+++ b/app/assets/javascripts/vue_shared/components/file_finder/item.vue
@@ -106,7 +106,7 @@ export default {
<span class="cgreen bold">
<gl-icon name="file-addition" class="align-text-top" /> {{ file.addedLines }}
</span>
- <span class="cred bold ml-1">
+ <span class="gl-text-red-500 bold ml-1">
<gl-icon name="file-deletion" class="align-text-top" /> {{ file.removedLines }}
</span>
</span>
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 75d15e207eaa..2002f6a3f653 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -72,7 +72,6 @@
/** COLORS **/
.cgray { color: $gl-text-color; }
.clgray { color: $gray-200; }
-.cred { color: $red-500; }
.cgreen { color: $green-600; }
.cdark { color: $gray-800; }
diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml
index 7d6ac831a826..8c97eaf12e6d 100644
--- a/app/views/admin/health_check/show.html.haml
+++ b/app/views/admin/health_check/show.html.haml
@@ -32,7 +32,7 @@
= sprite_icon('check', css_class: 'cgreen')
#{ s_('HealthCheck|Healthy') }
- else
- = sprite_icon('warning-solid', css_class: 'cred')
+ = sprite_icon('warning-solid', css_class: 'gl-text-danger')
#{ s_('HealthCheck|Unhealthy') }
- c.with_body do
- if no_errors
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 82644a3e3026..bdf52c635cc5 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -111,7 +111,7 @@
%li{ class: 'gl-px-5!' }
%span.light
= _('repository:')
- %strong.cred
+ %strong.gl-text-danger
= _('does not exist')
- if @project.archived?
@@ -155,7 +155,7 @@
= _("This repository has never been checked.")
- elsif @project.last_repository_check_failed?
- failed_message = _("This repository was last checked %{last_check_timestamp}. The check %{strong_start}failed.%{strong_end} See the 'repocheck.log' file for error messages.")
- - failed_message = failed_message % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium), strong_start: "<strong class='cred'>", strong_end: "</strong>" }
+ - failed_message = failed_message % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium), strong_start: "<strong class='gl-text-danger'>", strong_end: "</strong>" }
= failed_message.html_safe
- else
= _("This repository was last checked %{last_check_timestamp}. The check passed.") % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium) }
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 00b2ab39a794..c27f4bb7f59d 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -61,7 +61,7 @@
%li.two-factor-status{ class: list_item_classes }
%span.gl-text-secondary= _('Two-factor Authentication:')
.gl-col-span-2
- %strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'cred' }
+ %strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'gl-text-danger' }
- if @user.two_factor_enabled?
= _('Enabled')
= link_button_to _('Disable'), disable_two_factor_admin_user_path(@user), aria: { label: _('Disable') }, data: { confirm: _('Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :patch, class: 'gl-float-right', title: _('Disable Two-factor Authentication'), variant: :danger, size: :small
@@ -103,7 +103,7 @@
%li{ class: list_item_classes }
%span.gl-text-secondary= _('Confirmed:')
.gl-col-span-2
- %strong.cred= _('No')
+ %strong.gl-text-danger= _('No')
%li{ class: list_item_classes }
%span.gl-text-secondary= _('Current sign-in IP:')
diff --git a/app/views/projects/_issue.html.haml b/app/views/projects/_issue.html.haml
index b757a6cabb6c..2679199e9fd1 100644
--- a/app/views/projects/_issue.html.haml
+++ b/app/views/projects/_issue.html.haml
@@ -30,7 +30,7 @@
= sprite_icon('milestone', css_class: 'gl-vertical-align-text-bottom')
= issue.milestone.title
- if issue.due_date
- %span.issuable-due-date.gl-hidden.sm:gl-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue? && !issue.closed?}", title: _('Due date') }
+ %span.issuable-due-date.gl-hidden.sm:gl-inline-block.has-tooltip{ class: "#{'gl-text-danger' if issue.overdue? && !issue.closed?}", title: _('Due date') }
= sprite_icon('calendar')
= issue.due_date.to_fs(:medium)
diff --git a/app/views/projects/commit/x509/_certificate_details.html.haml b/app/views/projects/commit/x509/_certificate_details.html.haml
index 22d297248f81..6e3c226ca6b0 100644
--- a/app/views/projects/commit/x509/_certificate_details.html.haml
+++ b/app/views/projects/commit/x509/_certificate_details.html.haml
@@ -2,7 +2,7 @@
.gpg-popover-certificate-details
%strong= _('Certificate Subject')
- if signature.x509_certificate.revoked?
- %strong.cred= _('(revoked)')
+ %strong.gl-text-danger= _('(revoked)')
%ul
- x509_subject(signature.x509_certificate.subject, ["CN", "O"]).map do |key, value|
%li= key + "=" + value
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml
index 6e634ee3d46e..b2d25f8b3c4f 100644
--- a/app/views/shared/notes/_note.html.haml
+++ b/app/views/shared/notes/_note.html.haml
@@ -80,4 +80,4 @@
= note.attachment_identifier
= link_to delete_attachment_project_note_path(note.project, note),
title: _('Delete this attachment'), method: :delete, remote: true, data: { confirm: _('Are you sure you want to remove the attachment?') }, class: 'danger js-note-attachment-delete' do
- = sprite_icon('remove', css_class: 'cred')
+ = sprite_icon('remove', css_class: 'gl-text-danger')
diff --git a/ee/app/assets/javascripts/analytics/code_review_analytics/components/merge_request_table.vue b/ee/app/assets/javascripts/analytics/code_review_analytics/components/merge_request_table.vue
index 5b7bd31f940a..57ee11bee8a7 100644
--- a/ee/app/assets/javascripts/analytics/code_review_analytics/components/merge_request_table.vue
+++ b/ee/app/assets/javascripts/analytics/code_review_analytics/components/merge_request_table.vue
@@ -152,7 +152,7 @@ export default {
<template #cell(line_changes)="items">
<span class="font-weight-bold cgreen"> +{{ items.item.diff_stats.additions }} </span>
- <span class="font-weight-bold cred"> -{{ items.item.diff_stats.deletions }} </span>
+ <span class="font-weight-bold gl-text-red-500"> -{{ items.item.diff_stats.deletions }} </span>
</template>
</gl-table-lite>
</template>
diff --git a/ee/app/views/ldap_group_links/_ldap_group_link.html.haml b/ee/app/views/ldap_group_links/_ldap_group_link.html.haml
index 34aa5571904a..d17b5e4adf57 100644
--- a/ee/app/views/ldap_group_links/_ldap_group_link.html.haml
+++ b/ee/app/views/ldap_group_links/_ldap_group_link.html.haml
@@ -7,7 +7,7 @@
.light
= s_("LDAP|As %{human_access} on %{provider_label} server") % { human_access: group_link_role_name(ldap_group_link), provider_label: ldap_group_link.provider_label }
- else
- .cred
+ .gl-text-danger
= sprite_icon('warning-solid')
= safe_format(s_("LDAP|Config for LDAP server %{provider} is not present in GitLab"), provider: content_tag(:code, ldap_group_link.provider))
diff --git a/ee/spec/frontend/analytics/code_review_analytics/components/__snapshots__/merge_request_table_spec.js.snap b/ee/spec/frontend/analytics/code_review_analytics/components/__snapshots__/merge_request_table_spec.js.snap
index c0cf706b0318..8f20d0f0f037 100644
--- a/ee/spec/frontend/analytics/code_review_analytics/components/__snapshots__/merge_request_table_spec.js.snap
+++ b/ee/spec/frontend/analytics/code_review_analytics/components/__snapshots__/merge_request_table_spec.js.snap
@@ -233,7 +233,7 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
+504
</span>
<span
- class="cred font-weight-bold"
+ class="font-weight-bold gl-text-red-500"
>
-10
</span>
diff --git a/spec/frontend/diffs/components/file_row_stats_spec.js b/spec/frontend/diffs/components/file_row_stats_spec.js
index 7d3b60d2ba4e..b24a556925cc 100644
--- a/spec/frontend/diffs/components/file_row_stats_spec.js
+++ b/spec/frontend/diffs/components/file_row_stats_spec.js
@@ -24,6 +24,6 @@ describe('Diff file row stats', () => {
});
it('renders removed lines count', () => {
- expect(wrapper.find('.cred').text()).toContain('-10');
+ expect(wrapper.find('[data-testid="file-removed-lines"]').text()).toContain('-10');
});
});
--
GitLab