diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-01 22:57:57 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-01 22:57:57 +0000 |
| commit | c825ca74b2e1a02783c3faba3bc3eb13cceb34e9 (patch) | |
| tree | c4aab70ed22b493bcd7851111d17d7ccc70cf677 | |
| parent | 629624f30f6ad2f31681772adf88ace6f28727c9 (diff) | |
| parent | 33faed1135d94f2ebc3c868ccc78366439204c2d (diff) | |
| download | gitlab-ce-c825ca74b2e1a02783c3faba3bc3eb13cceb34e9.tar.gz | |
Merge branch '24726-remove-across-gitlab' into 'master'
24726 Remove Across GitLab from side navigation
## What does this MR do?
Removes Across GitLab header from side navigation
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24726
See merge request !7883
4 files changed, 4 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index 91ab1503439..c5e5dad574d 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -21,7 +21,6 @@ background: $color-darker; } - .sidebar-header, .sidebar-action-buttons { color: $color-light; background-color: lighten($color-darker, 5%); diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 45602e2d517..4269d365578 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -59,11 +59,6 @@ padding: 0 !important; } - .sidebar-header { - padding: 11px 22px 12px; - font-size: 20px; - } - li { &.separate-item { padding-top: 10px; diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 2a6d9cda379..817e4bebb05 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -1,5 +1,4 @@ .nav-sidebar - .sidebar-header Across GitLab %ul.nav = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do diff --git a/changelogs/unreleased/24726-remove-across-gitlab.yml b/changelogs/unreleased/24726-remove-across-gitlab.yml new file mode 100644 index 00000000000..6436e4b688f --- /dev/null +++ b/changelogs/unreleased/24726-remove-across-gitlab.yml @@ -0,0 +1,4 @@ +--- +title: 24726 Remove Across GitLab from side navigation +merge_request: +author: |