Skip to content
Snippets Groups Projects
Commit 0c0586e1 authored by Scott de Jonge's avatar Scott de Jonge
Browse files

Replace text-secondary with gl-text-subtle

Replace `text-secondary` class with `gl-text-subtle` class
Update `GlIcon` to use `variant="subtle"
Update IDE styles to remove `text-secondary` style overrides
Add contextual utility class to apply `gl-font-normal`
parent f5a74e96
No related branches found
No related tags found
1 merge request!174332Replace text-secondary with gl-text-subtle
Showing
with 24 additions and 32 deletions
......@@ -27,7 +27,7 @@ export default {
<label class="label-bold gl-text-lg" for="board-new-name">
{{ __('List options') }}
</label>
<p class="text-secondary gl-mb-3">
<p class="gl-mb-3 gl-text-subtle">
{{ __('Configure which lists are shown for anyone who visits this board') }}
</p>
<gl-form-checkbox
......
......@@ -649,7 +649,7 @@ export default {
/>
<p
v-if="variable.raw"
class="text-secondary gl-mb-0 gl-mt-2"
class="gl-mb-0 gl-mt-2 gl-text-subtle"
data-testid="raw-variable-tip"
>
{{ $options.i18n.valueFeedback.rawHelpText }}
......
......@@ -213,7 +213,7 @@ export default {
sort-by="key"
sort-direction="asc"
stacked="md"
table-class="text-secondary"
table-class="gl-text-subtle"
show-empty
:empty-text="$options.i18n.noFilesMessage"
>
......
......@@ -167,12 +167,7 @@ export default {
@appear="onAppear"
>
<gl-loading-icon v-if="showLoadingSpinner" size="md" />
<gl-icon
v-else-if="showImageErrorIcon"
name="media-broken"
class="text-secondary"
:size="32"
/>
<gl-icon v-else-if="showImageErrorIcon" name="media-broken" :size="32" variant="subtle" />
<img
v-show="showImage"
:src="imageLink"
......
......@@ -144,12 +144,12 @@ export default {
<span ref="percentage" class="gl-text-center gl-text-lg gl-text-default"
>{{ deployBoardData.completion }}%</span
>
<span class="text text-center text-secondary">{{ __('Complete') }}</span>
<span class="text text-center gl-text-subtle">{{ __('Complete') }}</span>
</span>
</section>
<section class="deploy-board-instances">
<div class="text-secondary gl-text-base">
<div class="gl-text-base gl-text-subtle">
<span class="deploy-board-instances-text"
>{{ instanceTitle }} ({{ instanceCount }})</span
>
......
......@@ -166,7 +166,7 @@ export default {
}}</gl-button>
</li>
</ul>
<div v-else-if="!results.length" class="text-secondary gl-p-3">
<div v-else-if="!results.length" class="gl-p-3 gl-text-subtle">
{{ __('No matching results') }}
</div>
<div v-if="shouldRenderCreateButton" class="dropdown-footer">
......
......@@ -182,7 +182,7 @@ export default {
class="gl-mr-3"
@add="addEnvironment"
/>
<span v-if="appliesToAllEnvironments" class="text-secondary mt-md-0 ml-md-3 gl-mt-3">
<span v-if="appliesToAllEnvironments" class="mt-md-0 ml-md-3 gl-mt-3 gl-text-subtle">
{{ $options.i18n.allEnvironments }}
</span>
<div v-else class="gl-flex gl-flex-wrap gl-items-center">
......
......@@ -25,7 +25,7 @@ export default {
/>
<span class="ide-sidebar-project-title">
<span class="sidebar-context-title"> {{ project.name }} </span>
<span class="sidebar-context-title text-secondary">
<span class="sidebar-context-title gl-font-normal gl-text-subtle">
{{ project.path_with_namespace }}
</span>
</span>
......
......@@ -67,7 +67,7 @@ export default {
<gl-form-group :label="$options.i18n.uploadCsvFileText" class="gl-truncate" label-for="file">
<input id="file" type="file" name="file" accept=".csv,text/csv" />
</gl-form-group>
<p class="text-secondary">
<p class="gl-text-subtle">
{{ $options.i18n.helpText }}
{{ maxFileSizeText }}
</p>
......
......@@ -74,7 +74,8 @@ export default {
:title="$options.helpText"
:aria-label="$options.helpText"
name="question-o"
class="text-secondary gl-cursor-help"
class="gl-cursor-help"
variant="subtle"
/>
</div>
<ul class="gl-m-0 gl-list-none gl-p-0">
......
......@@ -82,7 +82,7 @@ export default {
{{ suggestion.title }}
</gl-link>
</div>
<div class="text-secondary suggestion-footer">
<div class="suggestion-footer gl-text-subtle">
<span ref="state">
<gl-icon :name="stateIconName" :class="stateIconClass" class="gl-cursor-help" />
</span>
......
......@@ -324,7 +324,7 @@ export default {
{{ user.username }} ({{ user.name }})
</gl-dropdown-item>
<gl-dropdown-text v-show="shouldShowNoMatchesFoundText" class="text-secondary">
<gl-dropdown-text v-show="shouldShowNoMatchesFoundText" class="gl-text-subtle">
{{ __('No matches found') }}
</gl-dropdown-text>
</gl-dropdown>
......
......@@ -304,7 +304,7 @@ export default {
<gl-icon v-if="upload.canceled()" name="status_canceled" variant="warning" />
</div>
</div>
<p v-if="errors[index]" :data-testid="`fb-${index}`" class="row m-0 p-0 text-secondary">
<p v-if="errors[index]" :data-testid="`fb-${index}`" class="row m-0 p-0 gl-text-subtle">
{{ errors[index] }}
</p>
</div>
......
......@@ -171,7 +171,7 @@ export default {
<div class="row gl-mt-8">
<main class="col-md-6 gl-pr-8">
<header class="gl-mb-5">
<h3 class="text-secondary gl-mt-0" data-testid="step-count">
<h3 class="gl-mt-0 gl-text-subtle" data-testid="step-count">
{{ sprintf($options.i18n.stepNofN, { currentStep, stepCount }) }}
</h3>
<gl-progress-bar :value="progress" />
......@@ -206,7 +206,7 @@ export default {
</main>
<aside class="col-md-6 gl-pt-3">
<div class="gl-rounded-base gl-border-1 gl-border-solid gl-border-default gl-bg-gray-10">
<h6 class="text-secondary gl-p-2 gl-px-4" data-testid="editor-header">
<h6 class="gl-p-2 gl-px-4 gl-text-subtle" data-testid="editor-header">
{{ sprintf($options.i18n.draft, { filename }) }}
</h6>
<div class="gl-relative gl-overflow-hidden">
......
......@@ -151,7 +151,7 @@ export default {
</gl-badge>
<div
v-else-if="isApplying"
class="text-secondary gl-flex gl-items-center"
class="gl-flex gl-items-center gl-text-subtle"
data-testid="applying-badge"
>
<gl-loading-icon size="sm" class="gl-mr-3 gl-items-center gl-justify-center" />
......
......@@ -61,10 +61,10 @@ export default {
v-if="truncatedNamespace"
data-testid="project-namespace"
:title="projectNameWithNamespace"
class="text-secondary text-truncate"
class="text-truncate gl-text-subtle"
>
{{ truncatedNamespace }}
<span v-if="truncatedNamespace" class="text-secondary">/&nbsp;</span>
<span v-if="truncatedNamespace" class="gl-text-subtle">/&nbsp;</span>
</div>
<div
v-safe-html="highlightedProjectName"
......
......@@ -160,12 +160,7 @@ export default {
@appear="onAppear"
>
<gl-loading-icon v-if="showLoadingSpinner" size="lg" />
<gl-icon
v-else-if="showImageErrorIcon"
name="media-broken"
class="text-secondary"
:size="32"
/>
<gl-icon v-else-if="showImageErrorIcon" name="media-broken" :size="32" variant="subtle" />
<img
v-show="showImage"
:src="imageLink"
......
......@@ -37,7 +37,7 @@ export default {
</script>
<template>
<div class="disabled-comment !gl-border-none gl-text-center gl-text-secondary">
<div class="disabled-comment !gl-border-none gl-text-center gl-text-subtle">
<gl-sprintf :message="signedOutText">
<template #registerLink="{ content }">
<gl-link :href="registerPath">{{ content }}</gl-link>
......
......@@ -154,7 +154,7 @@ export default {
/>
<span>
<span class="gl-mr-2 gl-block"> {{ item.text }} </span>
<span class="gl-block gl-text-secondary"> {{ item.namespace }} </span>
<span class="gl-block gl-text-subtle"> {{ item.namespace }} </span>
</span>
</div>
</template>
......
......@@ -77,6 +77,7 @@
}
}
.gl-text-subtle,
.text-secondary {
color: var(--ide-text-color-secondary, var(--gl-text-color-subtle)) !important;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment