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
Léo-Paul Géneau
gitlab-ce
Commits
664afebb
Commit
664afebb
authored
Jun 03, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start styling sub nav
parent
3fd0b364
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
80 additions
and
52 deletions
+80
-52
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+21
-0
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+20
-19
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+28
-25
app/views/projects/tree/show.html.haml
app/views/projects/tree/show.html.haml
+11
-8
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
664afebb
...
@@ -67,6 +67,27 @@
...
@@ -67,6 +67,27 @@
color
:
#78a
;
color
:
#78a
;
}
}
}
}
&
.sub-nav
{
background-color
:
$background-color
;
.container-fluid
{
background-color
:
$background-color
;
}
li
{
a
{
margin
:
0
;
padding
:
11px
10px
9px
;
}
&
.active
a
{
border-bottom
:
none
;
color
:
$link-underline-blue
;
}
}
}
}
}
.top-area
{
.top-area
{
...
...
app/views/projects/commits/_head.html.haml
View file @
664afebb
%ul
.nav-links
%ul
.nav-links.sub-nav
%div
{
class:
(
container_class
)
}
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
link_to
project_files_path
(
@project
)
do
=
link_to
project_files_path
(
@project
)
do
Files
Files
...
...
app/views/projects/commits/show.html.haml
View file @
664afebb
-
@no_container
=
true
-
page_title
"Commits"
,
@ref
-
page_title
"Commits"
,
@ref
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
-
if
current_user
-
if
current_user
...
@@ -5,7 +7,8 @@
...
@@ -5,7 +7,8 @@
=
render
"head"
=
render
"head"
.row-content-block.second-block
%div
{
class:
(
container_class
)
}
.row-content-block.second-block
.tree-ref-holder
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'commits'
=
render
'shared/ref_switcher'
,
destination:
'commits'
...
@@ -32,10 +35,10 @@
...
@@ -32,10 +35,10 @@
%ul
.breadcrumb.repo-breadcrumb
%ul
.breadcrumb.repo-breadcrumb
=
commits_breadcrumbs
=
commits_breadcrumbs
%div
{
id:
dom_id
(
@project
)}
%div
{
id:
dom_id
(
@project
)}
#commits-list
.content_list
=
render
"commits"
,
project:
@project
#commits-list
.content_list
=
render
"commits"
,
project:
@project
.clear
.clear
=
spinner
=
spinner
:javascript
:javascript
CommitsList
.
init
(
#{
@limit
}
);
CommitsList
.
init
(
#{
@limit
}
);
app/views/projects/tree/show.html.haml
View file @
664afebb
-
@no_container
=
true
-
page_title
@path
.
presence
||
"Files"
,
@ref
-
page_title
@path
.
presence
||
"Files"
,
@ref
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
-
if
current_user
-
if
current_user
...
@@ -5,12 +7,13 @@
...
@@ -5,12 +7,13 @@
=
render
'projects/last_push'
=
render
'projects/last_push'
=
render
"projects/commits/head"
=
render
"projects/commits/head"
.tree-controls
%div
{
class:
(
container_class
)
}
.tree-controls
=
render
'projects/find_file_link'
=
render
'projects/find_file_link'
-
if
can?
current_user
,
:download_code
,
@project
-
if
can?
current_user
,
:download_code
,
@project
=
render
'projects/repositories/download_archive'
,
ref:
@ref
,
btn_class:
'hidden-xs hidden-sm btn-grouped'
,
split_button:
true
=
render
'projects/repositories/download_archive'
,
ref:
@ref
,
btn_class:
'hidden-xs hidden-sm btn-grouped'
,
split_button:
true
#tree-holder
.tree-holder.clearfix
#tree-holder
.tree-holder.clearfix
.nav-block
.nav-block
=
render
'projects/tree/tree_header'
,
tree:
@tree
=
render
'projects/tree/tree_header'
,
tree:
@tree
...
...
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