diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-09-07 14:58:01 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-09-07 14:58:01 +0530 |
| commit | f5b9837c19f48255237eca1e618fc632a45b58b5 (patch) | |
| tree | 2653e9aa1e3bf0a1db6630bb52863c30e6313d87 /app/views/projects/wikis/_nav.html.haml | |
| parent | 72b9b87ca93615640dcc022f324b2af16ceaa4eb (diff) | |
| parent | 1d5488699678d22644d24add4b89cede0419ad25 (diff) | |
| download | gitlab-ce-f5b9837c19f48255237eca1e618fc632a45b58b5.tar.gz | |
Merge remote-tracking branch 'origin/master' into 21170-cycle-analytics
Diffstat (limited to 'app/views/projects/wikis/_nav.html.haml')
| -rw-r--r-- | app/views/projects/wikis/_nav.html.haml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml index f8ea479e0b1..551a20c1044 100644 --- a/app/views/projects/wikis/_nav.html.haml +++ b/app/views/projects/wikis/_nav.html.haml @@ -1,13 +1,15 @@ -.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) +.scrolling-tabs-container.sub-nav-scroll + = render 'shared/nav_scroll' + .nav-links.sub-nav.scrolling-tabs + %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) - = nav_link(path: 'wikis#pages') do - = link_to 'Pages', namespace_project_wiki_pages_path(@project.namespace, @project) + = nav_link(path: 'wikis#pages') do + = link_to 'Pages', namespace_project_wiki_pages_path(@project.namespace, @project) - = nav_link(path: 'wikis#git_access') do - = link_to namespace_project_wikis_git_access_path(@project.namespace, @project) do - Git Access + = nav_link(path: 'wikis#git_access') do + = link_to namespace_project_wikis_git_access_path(@project.namespace, @project) do + Git Access - = render 'projects/wikis/new' + = render 'projects/wikis/new' |