diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-22 00:31:08 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-22 02:47:36 +0300 |
| commit | 04827fcb40ea0920bcc7fc2e772004c12a223301 (patch) | |
| tree | a13f82c4c24b29a16dc3edaf47d347eb7a2139a6 /app/views/projects/wikis/_nav.html.haml | |
| parent | ba48ed86303b841ea42211b4b43d799a94bc2592 (diff) | |
Merge branch '18533-graphs-wiki-subnav' into 'master'
Resolve "Graphs and Wiki subnav"
Styles sub nav in `Wiki` and `Graphs`
Closes #18533
cc @dzaporozhets
See merge request !4678
Diffstat (limited to 'app/views/projects/wikis/_nav.html.haml')
| -rw-r--r-- | app/views/projects/wikis/_nav.html.haml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml index 988fe024e28..f8ea479e0b1 100644 --- a/app/views/projects/wikis/_nav.html.haml +++ b/app/views/projects/wikis/_nav.html.haml @@ -1,5 +1,5 @@ -.top-area - %ul.nav-links +.nav-links.sub-nav + %ul{ class: (container_class) } = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do = link_to 'Home', namespace_project_wiki_path(@project.namespace, @project, :home) @@ -10,9 +10,4 @@ = link_to namespace_project_wikis_git_access_path(@project.namespace, @project) do Git Access - .nav-controls - - if can?(current_user, :create_wiki, @project) - = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do - New Page - -= render 'projects/wikis/new' + = render 'projects/wikis/new' |