diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-07-24 13:28:00 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-07-24 13:28:00 +0000 |
| commit | c76804071e121b96a8e97209273bed7a6da750ec (patch) | |
| tree | 0c86e588b66a4193e2c7fa092adf87d4826b124d | |
| parent | e5b9bcff21bce0a70cb7d20edaedb21a3975b3b1 (diff) | |
| parent | 32c47aa348049a2714ab34f0040e516b7921b746 (diff) | |
| download | gitlab-ce-c76804071e121b96a8e97209273bed7a6da750ec.tar.gz | |
Merge branch 'new-nav-duplicated-new-milestone-buttons' into 'master'
Fixed duplicate new milestone buttons in new navigation
Closes #35454
See merge request !13033
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/milestones/index.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/new-nav-duplicated-new-milestone-buttons.yml | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 99eea97377c..35b4d77a5ab 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -182,6 +182,12 @@ } } + &.nav-controls-new-nav { + > .dropdown { + margin-right: 0; + } + } + > .btn-grouped { float: none; } diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml index a89387bc8f1..e0b29b0c2e1 100644 --- a/app/views/projects/milestones/index.html.haml +++ b/app/views/projects/milestones/index.html.haml @@ -1,7 +1,7 @@ - @no_container = true - page_title 'Milestones' -- if show_new_nav? +- if show_new_nav? && can?(current_user, :admin_milestone, @project) - content_for :breadcrumbs_extra do = link_to "New milestone", new_namespace_project_milestone_path(@project.namespace, @project), class: 'btn btn-new', title: 'New milestone' @@ -11,10 +11,10 @@ .top-area = render 'shared/milestones_filter', counts: milestone_counts(@project.milestones) - .nav-controls + .nav-controls{ class: ("nav-controls-new-nav" if show_new_nav?) } = render 'shared/milestones_sort_dropdown' - if can?(current_user, :admin_milestone, @project) - = link_to new_project_milestone_path(@project), class: 'btn btn-new', title: 'New milestone' do + = link_to new_project_milestone_path(@project), class: "btn btn-new #{("visible-xs" if show_new_nav?)}", title: 'New milestone' do New milestone .milestones diff --git a/changelogs/unreleased/new-nav-duplicated-new-milestone-buttons.yml b/changelogs/unreleased/new-nav-duplicated-new-milestone-buttons.yml new file mode 100644 index 00000000000..fcf7d8e63d6 --- /dev/null +++ b/changelogs/unreleased/new-nav-duplicated-new-milestone-buttons.yml @@ -0,0 +1,4 @@ +--- +title: Fixed duplicate new milestone buttons when new navigation is turned on +merge_request: +author: |