diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-24 09:47:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-24 09:47:32 +0000 |
| commit | 43b3d3049925d944ead24eefc64383791085ef02 (patch) | |
| tree | 0d688fa3874f00216d21db52c1f399064a18e8af | |
| parent | 1fec9ebed4d2e35301c893871334d3ae1dfe1492 (diff) | |
| parent | f8f74afc1c86b46b96e4d34cfa3a13793a5267be (diff) | |
| download | gitlab-ce-43b3d3049925d944ead24eefc64383791085ef02.tar.gz | |
Merge branch '61827-prevent-user-popover-icon-shrink' into 'master'
Prevent icons from shrinking in User popover when contents exceed container
Closes #61827
See merge request gitlab-org/gitlab-ce!28696
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/61827-prevent-user-popover-icon-shrink.yml | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index 4dbfd1ba6f4..a60d5eb491e 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -71,11 +71,15 @@ export default { </div> <div class="text-secondary"> <div v-if="user.bio" class="js-bio d-flex mb-1"> - <icon name="profile" css-classes="category-icon" /> + <icon name="profile" css-classes="category-icon flex-shrink-0" /> <span class="ml-1">{{ user.bio }}</span> </div> <div v-if="user.organization" class="js-organization d-flex mb-1"> - <icon v-show="!jobInfoIsLoading" name="work" css-classes="category-icon" /> + <icon + v-show="!jobInfoIsLoading" + name="work" + css-classes="category-icon flex-shrink-0" + /> <span class="ml-1">{{ user.organization }}</span> </div> <gl-skeleton-loading @@ -88,7 +92,7 @@ export default { <icon v-show="!locationIsLoading && user.location" name="location" - css-classes="category-icon" + css-classes="category-icon flex-shrink-0" /> <span class="ml-1">{{ user.location }}</span> <gl-skeleton-loading diff --git a/changelogs/unreleased/61827-prevent-user-popover-icon-shrink.yml b/changelogs/unreleased/61827-prevent-user-popover-icon-shrink.yml new file mode 100644 index 00000000000..4d6464eed52 --- /dev/null +++ b/changelogs/unreleased/61827-prevent-user-popover-icon-shrink.yml @@ -0,0 +1,5 @@ +--- +title: Prevent icons from shrinking in User popover when contents exceed container +merge_request: 28696 +author: +type: fixed |