diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-03-24 02:35:50 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-03-24 02:35:50 +0300 |
commit | d568861d90fa44e49b2d87876749bfed1ab99eee (patch) | |
tree | 080669e472b08f2164f0efedaa57706467c6b65f | |
parent | 59f2724c1ffe1268e5bc778e285e143b0b82d07a (diff) | |
parent | c2fc50c291f05253444d04ef2a9f3df376370c60 (diff) |
Merge branch '29930-fix-profile-cover-button-a11y' into 'master'
Add tooltip and accessibility label for profile cover buttons
Closes #29930
See merge request !10182
-rw-r--r-- | app/views/users/show.html.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/29930-fix-profile-cover-button-a11y.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 57125f36ed6..601187455b3 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -13,7 +13,7 @@ .cover-block.user-cover-block .cover-controls - if @user == current_user - = link_to profile_path, class: 'btn btn-gray' do + = link_to profile_path, class: 'btn btn-gray has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do = icon('pencil') - elsif current_user - if @user.abuse_report @@ -24,7 +24,7 @@ = link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: 'btn btn-gray', title: 'Report abuse', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do = icon('exclamation-circle') - = link_to user_path(@user, rss_url_options), class: 'btn btn-gray' do + = link_to user_path(@user, rss_url_options), class: 'btn btn-gray has-tooltip', title: 'Subscribe', 'aria-label': 'Subscribe' do = icon('rss') - if current_user && current_user.admin? = link_to [:admin, @user], class: 'btn btn-gray', title: 'View user in admin area', diff --git a/changelogs/unreleased/29930-fix-profile-cover-button-a11y.yml b/changelogs/unreleased/29930-fix-profile-cover-button-a11y.yml new file mode 100644 index 00000000000..754d471c7d7 --- /dev/null +++ b/changelogs/unreleased/29930-fix-profile-cover-button-a11y.yml @@ -0,0 +1,4 @@ +--- +title: Add tooltip and accessibility for profile cover buttons +merge_request: 10182 +author: |