diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 17:36:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 17:36:54 +0300 |
| commit | f61bb2a16a514b71bf33aabbbb999d6732016a24 (patch) | |
| tree | 9548caa89e60b4f40b99bbd1dac030420b812aa8 /app/views/users | |
| parent | 35fc54e5d261f8898e390aea7c2f5ec5fdf0539d (diff) | |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/show.html.haml | 9 | ||||
| -rw-r--r-- | app/views/users/terms/index.html.haml | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 51483df19d7..daa41e0ebfe 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -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? @@ -163,6 +163,7 @@ - if profile_tab?(:activity) #activity.tab-pane + .flash-container - if can?(current_user, :read_cross_project) %h4.prepend-top-20 = s_('UserProfile|Most Recent Activity') diff --git a/app/views/users/terms/index.html.haml b/app/views/users/terms/index.html.haml index da8b73fd4fd..73d0f51f9ac 100644 --- a/app/views/users/terms/index.html.haml +++ b/app/views/users/terms/index.html.haml @@ -6,11 +6,11 @@ .card-footer.footer-block.clearfix - if can?(current_user, :accept_terms, @term) .float-right - = button_to accept_term_path(@term, redirect_params), class: 'gl-button btn btn-success gl-ml-3', data: { qa_selector: 'accept_terms_button' } do + = button_to accept_term_path(@term, redirect_params), class: 'gl-button btn btn-confirm gl-ml-3', data: { qa_selector: 'accept_terms_button' } do = _('Accept terms') - else .float-right - = link_to root_path, class: 'gl-button btn btn-success gl-ml-3' do + = link_to root_path, class: 'gl-button btn btn-confirm gl-ml-3' do = _('Continue') - if can?(current_user, :decline_terms, @term) .float-right |