Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
1d7b809a
Commit
1d7b809a
authored
8 years ago
by
Annabel Dunstone
Committed by
Jacob Schatz
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move new page link out of sub nav
parent
6f642fd4
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+2
-2
app/views/projects/wikis/_main_links.html.haml
app/views/projects/wikis/_main_links.html.haml
+3
-0
app/views/projects/wikis/_nav.html.haml
app/views/projects/wikis/_nav.html.haml
+0
-5
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
1d7b809a
...
@@ -100,8 +100,8 @@
...
@@ -100,8 +100,8 @@
.sub-header-block
{
.sub-header-block
{
background-color
:
$white-light
;
background-color
:
$white-light
;
border-bottom
:
1px
solid
$white-dark
;
border-bottom
:
1px
solid
$white-dark
;
margin
:
11px
0
;
padding
:
11px
0
;
padding
-bottom
:
11px
;
margin
-bottom
:
11px
;
.oneline
{
.oneline
{
line-height
:
35px
;
line-height
:
35px
;
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/wikis/_main_links.html.haml
View file @
1d7b809a
-
if
(
@page
&&
@page
.
persisted?
)
-
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
=
link_to
namespace_project_wiki_history_path
(
@project
.
namespace
,
@project
,
@page
),
class:
"btn"
do
Page History
Page History
-
if
can?
(
current_user
,
:create_wiki
,
@project
)
-
if
can?
(
current_user
,
:create_wiki
,
@project
)
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/wikis/_nav.html.haml
View file @
1d7b809a
...
@@ -10,9 +10,4 @@
...
@@ -10,9 +10,4 @@
=
link_to
namespace_project_wikis_git_access_path
(
@project
.
namespace
,
@project
)
do
=
link_to
namespace_project_wikis_git_access_path
(
@project
.
namespace
,
@project
)
do
Git Access
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'
=
render
'projects/wikis/new'
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment