Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-16 15:10:15 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-16 15:10:15 +0300
commit591b0e86e3dbaa31b68340a14dc32859306a27b1 (patch)
tree48f44f6a1de3fe9f38d314bf95988bc6efc527c4 /app/assets/javascripts/design_management
parent984357420ab0a91e8c73f04393a83b5ade63b460 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/design_management')
-rw-r--r--app/assets/javascripts/design_management/components/list/item.vue25
1 files changed, 15 insertions, 10 deletions
diff --git a/app/assets/javascripts/design_management/components/list/item.vue b/app/assets/javascripts/design_management/components/list/item.vue
index 7febda431c9..36ea812d92e 100644
--- a/app/assets/javascripts/design_management/components/list/item.vue
+++ b/app/assets/javascripts/design_management/components/list/item.vue
@@ -125,10 +125,12 @@ export default {
params: { id: filename },
query: $route.query,
}"
- class="card cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new"
+ class="card gl-cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new"
>
- <div class="card-body p-0 d-flex-center overflow-hidden position-relative">
- <div v-if="icon.name" data-testid="designEvent" class="design-event position-absolute">
+ <div
+ class="card-body gl-p-0 gl-display-flex gl-align-items-center gl-justify-content-center gl-overflow-hidden gl-relative"
+ >
+ <div v-if="icon.name" data-testid="designEvent" class="design-event gl-absolute">
<span :title="icon.tooltip" :aria-label="icon.tooltip">
<gl-icon :name="icon.name" :size="18" :class="icon.classes" />
</span>
@@ -145,25 +147,28 @@ export default {
v-show="showImage"
:src="imageLink"
:alt="filename"
- class="block mx-auto mw-100 mh-100 design-img"
+ class="gl-display-block gl-mx-auto gl-max-w-full mh-100 design-img"
data-qa-selector="design_image"
@load="onImageLoad"
@error="onImageError"
/>
</gl-intersection-observer>
</div>
- <div class="card-footer d-flex w-100">
- <div class="d-flex flex-column str-truncated-100">
- <span class="bold str-truncated-100" data-qa-selector="design_file_name">{{
+ <div class="card-footer gl-display-flex gl-w-full">
+ <div class="gl-display-flex gl-flex-direction-column str-truncated-100">
+ <span class="gl-font-weight-bold str-truncated-100" data-qa-selector="design_file_name">{{
filename
}}</span>
<span v-if="updatedAt" class="str-truncated-100">
{{ __('Updated') }} <timeago :time="updatedAt" tooltip-placement="bottom" />
</span>
</div>
- <div v-if="notesCount" class="ml-auto d-flex align-items-center text-secondary">
- <gl-icon name="comments" class="ml-1" />
- <span :aria-label="notesLabel" class="ml-1">
+ <div
+ v-if="notesCount"
+ class="gl-ml-auto gl-display-flex gl-align-items-center gl-text-gray-500"
+ >
+ <gl-icon name="comments" class="gl-ml-2" />
+ <span :aria-label="notesLabel" class="gl-ml-2">
{{ notesCount }}
</span>
</div>