diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-29 07:05:07 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-29 07:05:07 -0500 |
| commit | 5994fc38a84e2988667274fe55b60c5d44255b5b (patch) | |
| tree | 2cfbf5ce98150b347f4e698c498e6b4566372a0d | |
| parent | 646feca6d72b75d92e1a4db6c7ebc6b0d5bc9be4 (diff) | |
| download | gitlab-ce-5994fc38a84e2988667274fe55b60c5d44255b5b.tar.gz | |
Minor editssidebar-header-no-conflicts
| -rw-r--r-- | app/assets/stylesheets/new_sidebar.scss | 3 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_admin_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_group_sidebar.html.haml | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss index efcf456a8d1..be4cc02b3ea 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -36,8 +36,7 @@ $new-sidebar-width: 220px; .settings-avatar { background-color: $white-light; - .fa-wrench, - .fa-user { + i { font-size: 20px; width: 100%; color: $gl-text-color-secondary; diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml index c9415469912..40c1ca7b53e 100644 --- a/app/views/layouts/nav/_new_admin_sidebar.html.haml +++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml @@ -1,5 +1,5 @@ .nav-sidebar - = link_to admin_root_path, title: 'Overview', class: 'context-header' do + = link_to admin_root_path, title: 'Admin Overview', class: 'context-header' do .avatar-container.s40.settings-avatar = icon('wrench') .project-title Admin Area diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index 7720918be54..b7ac04cc3e5 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -1,5 +1,5 @@ .nav-sidebar - = link_to group_path(@group), title: 'Home', class: 'context-header' do + = link_to group_path(@group), title: 'Group', class: 'context-header' do .avatar-container.s40.group-avatar = image_tag group_icon(@group), class: "avatar s40 avatar-tile" .group-title |