Skip to content
Snippets Groups Projects
Verified Commit d2f8e59c authored by Sascha Eggenberger's avatar Sascha Eggenberger :speech_balloon: Committed by GitLab
Browse files

Merge branch 'issuable-popover-design-token-migration' into 'master'

Issuable popovers: Migrate to subtle design token

See merge request !173846



Merged-by: default avatarSascha Eggenberger <seggenberger@gitlab.com>
Reviewed-by: default avatarScott de Jonge <sdejonge@gitlab.com>
parents e04dbfbf 45fcb9c6
No related merge requests found
Pipeline #1562153222 passed
Pipeline: rspec:predictive

#1562165449

    Pipeline: GitLab

    #1562165447

      Pipeline: Ruby 3.2.5 as-if-foss

      #1562157321

        ......@@ -100,7 +100,7 @@ export default {
        <template>
        <gl-popover :target="target" boundary="viewport" :css-classes="$options.cssClasses" :show="show">
        <gl-skeleton-loader v-if="loading" :lines="2" :height="24" equal-width-lines />
        <div v-if="author" class="gl-flex gl-gap-2 gl-text-secondary">
        <div v-if="author" class="gl-flex gl-gap-2 gl-text-subtle">
        <gl-avatar :src="author.avatarUrl" :size="16" />
        <div>
        <gl-sprintf :message="__('%{author} commented %{time}')">
        ......
        ......@@ -93,7 +93,7 @@ export default {
        class="gl-text-orange-500"
        :aria-label="__('Confidential')"
        />
        <span class="gl-text-secondary">
        <span class="gl-text-subtle">
        {{ __('Opened') }} <time :datetime="issue.createdAt">{{ formattedTime }}</time>
        </span>
        </div>
        ......@@ -101,11 +101,11 @@ export default {
        <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
        <div>
        <work-item-type-icon v-if="!$apollo.queries.issue.loading" :work-item-type="issue.type" />
        <span class="gl-text-secondary">{{ `${namespacePath}#${iid}` }}</span>
        <span class="gl-text-subtle">{{ `${namespacePath}#${iid}` }}</span>
        </div>
        <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
        <div v-if="!$apollo.queries.issue.loading" class="gl-mt-2 gl-flex gl-text-secondary">
        <div v-if="!$apollo.queries.issue.loading" class="gl-mt-2 gl-flex gl-text-subtle">
        <issue-due-date
        v-if="issue.dueDate"
        :date="issue.dueDate.toString()"
        ......
        ......@@ -166,10 +166,10 @@ export default {
        <gl-badge v-if="!loading && showDetails" :variant="status.variant">{{
        status.text
        }}</gl-badge>
        <span class="gl-flex gl-text-secondary" data-testid="milestone-label">
        <gl-icon name="milestone" class="gl-mr-1" /> {{ __('Milestone') }}
        <span class="gl-flex gl-text-subtle" data-testid="milestone-label">
        <gl-icon name="milestone" class="gl-mr-1" variant="subtle" /> {{ __('Milestone') }}
        </span>
        <span v-if="showTimeframe" class="gl-text-secondary" data-testid="milestone-timeframe"
        <span v-if="showTimeframe" class="gl-text-subtle" data-testid="milestone-timeframe"
        >&middot; {{ milestoneTimeframe }}</span
        >
        </div>
        ......@@ -191,7 +191,7 @@ export default {
        data-testid="milestone-path"
        >
        <gl-icon :name="milestoneParentIcon" class="gl-mr-1" />
        <span class="gl-text-secondary">{{ milestoneParentFullPath }}</span>
        <span class="gl-text-subtle">{{ milestoneParentFullPath }}</span>
        </div>
        </gl-popover>
        </template>
        ......@@ -99,7 +99,7 @@ export default {
        <gl-badge class="gl-mr-2" :variant="badgeVariant">
        {{ stateHumanName }}
        </gl-badge>
        <span class="gl-text-secondary">
        <span class="gl-text-subtle">
        {{ __('Opened') }} <time v-text="formattedTime"></time
        ></span>
        </div>
        ......@@ -107,7 +107,7 @@ export default {
        </div>
        <h5 v-if="!$apollo.queries.mergeRequest.loading" class="my-2">{{ title }}</h5>
        <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
        <div class="gl-text-secondary">
        <div class="gl-text-subtle">
        {{ `${namespacePath}!${iid}` }}
        </div>
        <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
        ......
        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