Commit 3c3e4ee5 authored by Illya Klymov's avatar Illya Klymov

Merge branch 'psi-text-body' into 'master'

Replace gl-text-black-normal with gl-text-body

See merge request gitlab-org/gitlab!35857
parents 3ffa062e 3d4d0e1d
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
<gl-link <gl-link
:href="lastReply.author.webUrl" :href="lastReply.author.webUrl"
target="_blank" target="_blank"
class="link-inherit-color gl-text-black-normal gl-text-decoration-none gl-font-weight-bold gl-ml-2 gl-mr-2" class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-ml-2 gl-mr-2"
> >
{{ lastReply.author.name }} {{ lastReply.author.name }}
</gl-link> </gl-link>
......
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
data-testid="resolved-comments" data-testid="resolved-comments"
:icon="resolvedCommentsToggleIcon" :icon="resolvedCommentsToggleIcon"
variant="link" variant="link"
class="link-inherit-color gl-text-black-normal gl-text-decoration-none gl-font-weight-bold gl-mb-4" class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-mb-4"
@click="$emit('toggleResolvedComments')" @click="$emit('toggleResolvedComments')"
>{{ $options.resolveCommentsToggleText }} ({{ resolvedDiscussions.length }}) >{{ $options.resolveCommentsToggleText }} ({{ resolvedDiscussions.length }})
</gl-button> </gl-button>
......
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
<gl-link <gl-link
:href="lastReply.author.webUrl" :href="lastReply.author.webUrl"
target="_blank" target="_blank"
class="link-inherit-color gl-text-black-normal gl-text-decoration-none gl-font-weight-bold gl-ml-2 gl-mr-2" class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-ml-2 gl-mr-2"
> >
{{ lastReply.author.name }} {{ lastReply.author.name }}
</gl-link> </gl-link>
......
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
data-testid="resolved-comments" data-testid="resolved-comments"
:icon="resolvedCommentsToggleIcon" :icon="resolvedCommentsToggleIcon"
variant="link" variant="link"
class="link-inherit-color gl-text-black-normal gl-text-decoration-none gl-font-weight-bold gl-mb-4" class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-mb-4"
@click="$emit('toggleResolvedComments')" @click="$emit('toggleResolvedComments')"
>{{ $options.resolveCommentsToggleText }} ({{ resolvedDiscussions.length }}) >{{ $options.resolveCommentsToggleText }} ({{ resolvedDiscussions.length }})
</gl-button> </gl-button>
......
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
<template> <template>
<div class="gl-responsive-table-row"> <div class="gl-responsive-table-row">
<div class="table-section section-50"> <div class="table-section section-50">
<strong class="gl-text-black-normal">{{ dependency.name }}</strong> <strong class="gl-text-body">{{ dependency.name }}</strong>
<span v-if="dependency.target_framework" data-testid="target-framework" <span v-if="dependency.target_framework" data-testid="target-framework"
>({{ dependency.target_framework }})</span >({{ dependency.target_framework }})</span
> >
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
class="table-section section-50 gl-display-flex justify-content-md-end" class="table-section section-50 gl-display-flex justify-content-md-end"
data-testid="version-pattern" data-testid="version-pattern"
> >
<span class="gl-text-black-normal">{{ dependency.version_pattern }}</span> <span class="gl-text-body">{{ dependency.version_pattern }}</span>
</div> </div>
</div> </div>
</template> </template>
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
<div data-testid="nodeUrl" class="d-flex flex-column"> <div data-testid="nodeUrl" class="d-flex flex-column">
<span class="gl-text-gray-700">{{ s__('GeoNodes|Node URL') }}</span> <span class="gl-text-gray-700">{{ s__('GeoNodes|Node URL') }}</span>
<gl-link <gl-link
class="gl-display-flex gl-align-items-center gl-text-black-normal gl-font-weight-bold gl-text-decoration-underline gl-mt-1" class="gl-display-flex gl-align-items-center gl-text-body gl-font-weight-bold gl-text-decoration-underline gl-mt-1"
:href="node.url" :href="node.url"
target="_blank" target="_blank"
>{{ node.url }} <gl-icon name="external-link" class="gl-ml-1" >{{ node.url }} <gl-icon name="external-link" class="gl-ml-1"
......
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
v-gl-tooltip="s__('Vulnerability|Comments')" v-gl-tooltip="s__('Vulnerability|Comments')"
:href="vulnerability.vulnerabilityPath" :href="vulnerability.vulnerabilityPath"
:data-testid="`vulnerability-comments-${vulnerability.id}`" :data-testid="`vulnerability-comments-${vulnerability.id}`"
class="gl-display-inline-flex gl-align-items-center gl-ml-3 gl-flex-shrink-0 gl-text-black-normal" class="gl-display-inline-flex gl-align-items-center gl-ml-3 gl-flex-shrink-0 gl-text-body"
> >
<gl-icon name="comment" /> <gl-icon name="comment" />
</gl-link> </gl-link>
......
...@@ -12,7 +12,7 @@ exports[`NodeDetailsSectionMain template node url section renders section correc ...@@ -12,7 +12,7 @@ exports[`NodeDetailsSectionMain template node url section renders section correc
</span> </span>
<a <a
class="gl-link gl-display-flex gl-align-items-center gl-text-black-normal gl-font-weight-bold gl-text-decoration-underline gl-mt-1" class="gl-link gl-display-flex gl-align-items-center gl-text-body gl-font-weight-bold gl-text-decoration-underline gl-mt-1"
href="http://127.0.0.1:3001/" href="http://127.0.0.1:3001/"
rel="noopener noreferrer" rel="noopener noreferrer"
target="_blank" target="_blank"
......
...@@ -66,7 +66,7 @@ exports[`Design management design index page renders design index 1`] = ` ...@@ -66,7 +66,7 @@ exports[`Design management design index page renders design index 1`] = `
<gl-button-stub <gl-button-stub
category="tertiary" category="tertiary"
class="link-inherit-color gl-text-black-normal gl-text-decoration-none gl-font-weight-bold gl-mb-4" class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-mb-4"
data-testid="resolved-comments" data-testid="resolved-comments"
icon="chevron-right" icon="chevron-right"
id="resolved-comments" id="resolved-comments"
......
...@@ -66,7 +66,7 @@ exports[`Design management design index page renders design index 1`] = ` ...@@ -66,7 +66,7 @@ exports[`Design management design index page renders design index 1`] = `
<gl-button-stub <gl-button-stub
category="tertiary" category="tertiary"
class="link-inherit-color gl-text-black-normal gl-text-decoration-none gl-font-weight-bold gl-mb-4" class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-mb-4"
data-testid="resolved-comments" data-testid="resolved-comments"
icon="chevron-right" icon="chevron-right"
id="resolved-comments" id="resolved-comments"
......
...@@ -8,7 +8,7 @@ exports[`DependencyRow renders full dependency 1`] = ` ...@@ -8,7 +8,7 @@ exports[`DependencyRow renders full dependency 1`] = `
class="table-section section-50" class="table-section section-50"
> >
<strong <strong
class="gl-text-black-normal" class="gl-text-body"
> >
Test.Dependency Test.Dependency
</strong> </strong>
...@@ -25,7 +25,7 @@ exports[`DependencyRow renders full dependency 1`] = ` ...@@ -25,7 +25,7 @@ exports[`DependencyRow renders full dependency 1`] = `
data-testid="version-pattern" data-testid="version-pattern"
> >
<span <span
class="gl-text-black-normal" class="gl-text-body"
> >
2.3.7 2.3.7
</span> </span>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment