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
Jérome Perrin
gitlab-ce
Commits
5db95f5e
Commit
5db95f5e
authored
Jun 03, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finish styling sub nav
parent
664afebb
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
234 additions
and
211 deletions
+234
-211
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+5
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+5
-3
app/views/projects/branches/index.html.haml
app/views/projects/branches/index.html.haml
+32
-29
app/views/projects/builds/index.html.haml
app/views/projects/builds/index.html.haml
+61
-59
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+1
-1
app/views/projects/compare/index.html.haml
app/views/projects/compare/index.html.haml
+14
-12
app/views/projects/network/_head.html.haml
app/views/projects/network/_head.html.haml
+8
-5
app/views/projects/network/show.html.haml
app/views/projects/network/show.html.haml
+14
-13
app/views/projects/pipelines/_head.html.haml
app/views/projects/pipelines/_head.html.haml
+14
-13
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+57
-55
app/views/projects/tags/index.html.haml
app/views/projects/tags/index.html.haml
+23
-21
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
5db95f5e
...
@@ -61,6 +61,11 @@
...
@@ -61,6 +61,11 @@
margin-bottom
:
-
$gl-padding
;
margin-bottom
:
-
$gl-padding
;
}
}
&
.content-component-block
{
padding
:
11px
0
;
background-color
:
$white-light
;
}
.title
{
.title
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
5db95f5e
...
@@ -489,9 +489,11 @@ pre.light-well {
...
@@ -489,9 +489,11 @@ pre.light-well {
margin
:
0
;
margin
:
0
;
}
}
.project-show-activity
{
.activity-filter-block
{
.activity-filter-block
{
margin-top
:
-1px
;
.controls
{
padding-bottom
:
10px
;
border-bottom
:
1px
solid
$border-color
;
}
}
}
}
...
...
app/views/projects/branches/index.html.haml
View file @
5db95f5e
-
@no_container
=
true
-
page_title
"Branches"
-
page_title
"Branches"
=
render
"projects/commits/head"
=
render
"projects/commits/head"
.row-content-block
%div
{
class:
(
container_class
)
}
.row-content-block.second-block.content-component-block
.pull-right
.pull-right
-
if
can?
current_user
,
:push_code
,
@project
-
if
can?
current_user
,
:push_code
,
@project
=
link_to
new_namespace_project_branch_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
=
link_to
new_namespace_project_branch_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
...
@@ -25,7 +28,7 @@
...
@@ -25,7 +28,7 @@
=
sort_title_oldest_updated
=
sort_title_oldest_updated
.oneline
.oneline
Protected branches can be managed in project settings
Protected branches can be managed in project settings
-
unless
@branches
.
empty?
-
unless
@branches
.
empty?
%ul
.content-list.all-branches
%ul
.content-list.all-branches
-
@branches
.
each
do
|
branch
|
-
@branches
.
each
do
|
branch
|
=
render
"projects/branches/branch"
,
branch:
branch
=
render
"projects/branches/branch"
,
branch:
branch
...
...
app/views/projects/builds/index.html.haml
View file @
5db95f5e
-
@no_container
=
true
-
page_title
"Builds"
-
page_title
"Builds"
=
render
"projects/pipelines/head"
=
render
"projects/pipelines/head"
.top-area
%div
{
class:
(
container_class
)
}
.top-area
%ul
.nav-links
%ul
.nav-links
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
project_builds_path
(
@project
)
do
=
link_to
project_builds_path
(
@project
)
do
...
@@ -35,7 +37,7 @@
...
@@ -35,7 +37,7 @@
=
icon
(
'wrench'
)
=
icon
(
'wrench'
)
%span
CI Lint
%span
CI Lint
%ul
.content-list
%ul
.content-list
-
if
@builds
.
blank?
-
if
@builds
.
blank?
%li
%li
.nothing-here-block
No builds to show
.nothing-here-block
No builds to show
...
...
app/views/projects/commits/show.html.haml
View file @
5db95f5e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
render
"head"
=
render
"head"
%div
{
class:
(
container_class
)
}
%div
{
class:
(
container_class
)
}
.row-content-block.second-block
.row-content-block.second-block
.content-component-block
.tree-ref-holder
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'commits'
=
render
'shared/ref_switcher'
,
destination:
'commits'
...
...
app/views/projects/compare/index.html.haml
View file @
5db95f5e
-
@no_container
=
true
-
page_title
"Compare"
-
page_title
"Compare"
=
render
"projects/commits/head"
=
render
"projects/commits/head"
.row-content-block
%div
{
class:
(
container_class
)
}
.row-content-block.second-block.content-component-block
Compare branches, tags or commit ranges.
Compare branches, tags or commit ranges.
%br
%br
Fill input field with commit id like
Fill input field with commit id like
...
@@ -12,5 +14,5 @@
...
@@ -12,5 +14,5 @@
%br
%br
Changes are shown
<b>
from
</b>
the version in the first field
<b>
to
</b>
the version in the second field.
Changes are shown
<b>
from
</b>
the version in the first field
<b>
to
</b>
the version in the second field.
.prepend-top-20
.prepend-top-20
=
render
"form"
=
render
"form"
app/views/projects/network/_head.html.haml
View file @
5db95f5e
.row-content-block.append-bottom-default
-
@no_container
=
true
%div
{
class:
(
container_class
)
}
.row-content-block.second-block.content-component-block
.tree-ref-holder
.tree-ref-holder
=
render
partial:
'shared/ref_switcher'
,
locals:
{
destination:
'graph'
}
=
render
partial:
'shared/ref_switcher'
,
locals:
{
destination:
'graph'
}
...
...
app/views/projects/network/show.html.haml
View file @
5db95f5e
-
page_title
"Network"
,
@ref
-
page_title
"Network"
,
@ref
=
render
"projects/commits/head"
=
render
"projects/commits/head"
=
render
"head"
=
render
"head"
.project-network
%div
{
class:
(
container_class
)
}
.project-network
.controls
.controls
=
form_tag
namespace_project_network_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'form-inline network-form'
do
|
f
|
=
form_tag
namespace_project_network_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'form-inline network-form'
do
|
f
|
=
text_field_tag
:extended_sha1
,
@options
[
:extended_sha1
],
placeholder:
"Input an extended SHA1 syntax"
,
class:
'search-input form-control input-mx-250 search-sha'
=
text_field_tag
:extended_sha1
,
@options
[
:extended_sha1
],
placeholder:
"Input an extended SHA1 syntax"
,
class:
'search-input form-control input-mx-250 search-sha'
...
...
app/views/projects/pipelines/_head.html.haml
View file @
5db95f5e
%ul
.nav-links
%ul
.nav-links.sub-nav
%div
{
class:
(
container_class
)
}
-
if
project_nav_tab?
:pipelines
-
if
project_nav_tab?
:pipelines
=
nav_link
(
controller: :pipelines
)
do
=
nav_link
(
controller: :pipelines
)
do
=
link_to
project_pipelines_path
(
@project
),
title:
'Pipelines'
,
class:
'shortcuts-pipelines'
do
=
link_to
project_pipelines_path
(
@project
),
title:
'Pipelines'
,
class:
'shortcuts-pipelines'
do
...
...
app/views/projects/pipelines/index.html.haml
View file @
5db95f5e
-
@no_container
=
true
-
page_title
"Pipelines"
-
page_title
"Pipelines"
=
render
"projects/pipelines/head"
=
render
"projects/pipelines/head"
.top-area
%div
{
class:
(
container_class
)
}
.top-area
%ul
.nav-links
%ul
.nav-links
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
project_pipelines_path
(
@project
)
do
=
link_to
project_pipelines_path
(
@project
)
do
...
@@ -36,7 +38,7 @@
...
@@ -36,7 +38,7 @@
=
icon
(
'wrench'
)
=
icon
(
'wrench'
)
%span
CI Lint
%span
CI Lint
%ul
.content-list.pipelines
%ul
.content-list.pipelines
-
stages
=
@pipelines
.
stages
-
stages
=
@pipelines
.
stages
-
if
@pipelines
.
blank?
-
if
@pipelines
.
blank?
%li
%li
...
...
app/views/projects/tags/index.html.haml
View file @
5db95f5e
-
@no_container
=
true
-
page_title
"Tags"
-
page_title
"Tags"
=
render
"projects/commits/head"
=
render
"projects/commits/head"
.row-content-block
%div
{
class:
(
container_class
)
}
.row-content-block.second-block.content-component-block
-
if
can?
current_user
,
:push_code
,
@project
-
if
can?
current_user
,
:push_code
,
@project
.pull-right
.pull-right
=
link_to
new_namespace_project_tag_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create new-tag-btn'
do
=
link_to
new_namespace_project_tag_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create new-tag-btn'
do
...
@@ -10,7 +12,7 @@
...
@@ -10,7 +12,7 @@
.oneline
.oneline
Tags give the ability to mark specific points in history as being important
Tags give the ability to mark specific points in history as being important
.tags
.tags
-
unless
@tags
.
empty?
-
unless
@tags
.
empty?
%ul
.content-list
%ul
.content-list
-
@tags
.
each
do
|
tag
|
-
@tags
.
each
do
|
tag
|
...
...
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