summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-26 19:56:21 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-06-26 19:56:21 +0000
commitdef0c43a6364f16532df76ad2c098b372cbb4801 (patch)
tree1a13ad7ac5f7bffebf66f197bee11b0da411806a
parenta1bd2434872c85ef157035118dde83c7d34e6035 (diff)
parent4a4226c48853b80116ff006f47c10301dd12ca73 (diff)
downloadgitlab-ce-def0c43a6364f16532df76ad2c098b372cbb4801.tar.gz
Merge branch 'update-external-link-icon-in-header-user-dropdown' into 'master'
Update external link icon in header user dropdown See merge request gitlab-org/gitlab-ce!20150
-rw-r--r--app/assets/stylesheets/framework/header.scss4
-rw-r--r--app/views/layouts/header/_current_user_dropdown.html.haml2
-rw-r--r--changelogs/unreleased/update-external-link-icon-in-header-user-dropdown.yml5
3 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 91a9b956d9d..5789c3fa1b1 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -539,6 +539,10 @@
display: block;
}
}
+
+ svg {
+ vertical-align: text-top;
+ }
}
}
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml
index cdfd45fceb1..a74ea246eaf 100644
--- a/app/views/layouts/header/_current_user_dropdown.html.haml
+++ b/app/views/layouts/header/_current_user_dropdown.html.haml
@@ -20,7 +20,7 @@
%li
= link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do
= _("Contribute to GitLab")
- = icon('external-link')
+ = sprite_icon('external-link', size: 16)
%li.divider
- if current_user_menu?(:sign_out)
%li
diff --git a/changelogs/unreleased/update-external-link-icon-in-header-user-dropdown.yml b/changelogs/unreleased/update-external-link-icon-in-header-user-dropdown.yml
new file mode 100644
index 00000000000..ee769f06379
--- /dev/null
+++ b/changelogs/unreleased/update-external-link-icon-in-header-user-dropdown.yml
@@ -0,0 +1,5 @@
+---
+title: Update external link icon in header user dropdown
+merge_request: 20150
+author: George Tsiolis
+type: changed