diff options
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/wikis/_main_links.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/wikis/_nav.html.haml | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 7626ac41e50..4e0a788123d 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -100,8 +100,8 @@ .sub-header-block { background-color: $white-light; border-bottom: 1px solid $white-dark; - margin: 11px 0; - padding-bottom: 11px; + padding: 11px 0; + margin-bottom: 11px; .oneline { line-height: 35px; diff --git a/app/views/projects/wikis/_main_links.html.haml b/app/views/projects/wikis/_main_links.html.haml index 4faa547769b..4ea75dbbf0c 100644 --- a/app/views/projects/wikis/_main_links.html.haml +++ b/app/views/projects/wikis/_main_links.html.haml @@ -1,4 +1,7 @@ - if (@page && @page.persisted?) + - 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 = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn" do Page History - if can?(current_user, :create_wiki, @project) diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml index f82c0fc0aff..f8ea479e0b1 100644 --- a/app/views/projects/wikis/_nav.html.haml +++ b/app/views/projects/wikis/_nav.html.haml @@ -10,9 +10,4 @@ = link_to namespace_project_wikis_git_access_path(@project.namespace, @project) do Git Access - - if can?(current_user, :create_wiki, @project) - = nav_link do - = link_to '#modal-new-wiki', "data-toggle" => "modal" do - New Page - = render 'projects/wikis/new' |