diff --git a/app/assets/javascripts/diffs/components/file_row_stats.vue b/app/assets/javascripts/diffs/components/file_row_stats.vue index f99f363a6be9343c1e83c6399c804d336d9ec4d2..329771d744abe1362fedad7fb536a44909e5e791 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 c98db96f60045b028a535068520e9188461a348f..1886e7641df2a423711253db98e9475e072e5899 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 59a8a24baad632f9cfecd1b4c4160ff0416875b0..4276b8251cf21d251736106e611d6607f605fc45 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 75d15e207eaa2c91ca9d8d195ea834de72f1486c..2002f6a3f6535e8351fdba11a7f08a9acd9ccde9 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 7d6ac831a826202745cf83f3f31c8d29aa7bc207..8c97eaf12e6df401ed315715becdc7a4a0233c81 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 82644a3e30265a6b555ef7c6a6239bcedafd0a82..bdf52c635cc5319a235bde1d6c745ed63eea97da 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 00b2ab39a794e320cbcb34aabc5d059befce5382..c27f4bb7f59d188cde355483616844ec88da1c0c 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 b757a6cabb6ca3a45188a71da05a6ef5684574b8..2679199e9fd111d6680b874e8d5dac085d0836cb 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 22d297248f813292d3923cffc5219e16b234ba8b..6e3c226ca6b0dd58fc854986e1e8eaceb6702984 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 6e634ee3d46e54a7001a6739d4056484bf19ec36..b2d25f8b3c4f33f6a3795533a846bbce96533252 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 5b7bd31f940a8b29ee84824279ae8701d89403f4..57ee11bee8a7aee1dc893a059a85f0fd98b040da 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 34aa5571904ad9fd77cd62e278d21af746098704..d17b5e4adf578dd75af2308652bccfcdd792543d 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 c0cf706b031834d9aa994655e56520902ebb2cec..8f20d0f0f037dd8814a1e93b3c2c08490a941b76 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 7d3b60d2ba4e2c97d36dc127efe3638da2e33abb..b24a556925cc2b7e8a9e4f819590d593f04be05e 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'); }); });