Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-04-10 21:09:34 +00:00
parent 462ca773dc
commit c84c809bb2
2 changed files with 9 additions and 4 deletions

View file

@ -67,13 +67,13 @@
.cover-desc.cgray.mb-1.mb-sm-2
- unless @user.location.blank?
.profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline.mb-1.mb-sm-0{ itemprop: 'address', itemscope: true, itemtype: 'https://schema.org/PostalAddress' }
= sprite_icon('location', css_class: 'vertical-align-sub fgray')
%span.vertical-align-middle{ itemprop: 'addressLocality' }
= sprite_icon('location', css_class: 'fgray')
%span{ itemprop: 'addressLocality' }
= @user.location
- unless work_information(@user).blank?
.profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline
= sprite_icon('work', css_class: 'vertical-align-middle fgray')
%span.vertical-align-middle
= sprite_icon('work', css_class: 'fgray')
%span
= work_information(@user, with_schema_markup: true)
.cover-desc.cgray.mb-1.mb-sm-2
- unless @user.skype.blank?

View file

@ -0,0 +1,5 @@
---
title: Remove vertical-align-middle from user location and work in profile
merge_request: 58554
author: Yogi (@yo)
type: changed