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
60db4d3a
Commit
60db4d3a
authored
Feb 17, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor project stats & last_commit CSS; left align main nav items
parent
668dfa02
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
70 additions
and
76 deletions
+70
-76
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+0
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+12
-18
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+57
-56
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
60db4d3a
...
@@ -287,7 +287,6 @@
...
@@ -287,7 +287,6 @@
background
:
$gray-light
;
background
:
$gray-light
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
transition
:
padding
$sidebar-transition-duration
;
transition
:
padding
$sidebar-transition-duration
;
text-align
:
center
;
.container-fluid
{
.container-fluid
{
position
:
relative
;
position
:
relative
;
...
...
app/assets/stylesheets/pages/projects.scss
View file @
60db4d3a
...
@@ -645,30 +645,24 @@ pre.light-well {
...
@@ -645,30 +645,24 @@ pre.light-well {
}
}
}
}
.
project-last-commit
{
.
container-fluid.project-stats-container
{
@media
(
m
in-width
:
$screen-sm-min
)
{
@media
(
m
ax-width
:
$screen-xs-max
)
{
margin-top
:
$gl-padding
;
padding
:
12px
0
;
}
}
}
&
.container-fluid
{
.project-last-commit
{
padding-top
:
12px
;
padding-bottom
:
12px
;
background-color
:
$gray-light
;
background-color
:
$gray-light
;
padding
:
12px
$gl-padding
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-right-width
:
0
;
border-left-width
:
0
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
border-right-width
:
1px
;
margin-top
:
$gl-padding
;
border-left-width
:
1px
;
}
}
}
&
.container-limited
{
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
1281px
)
{
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
}
}
}
.ci-status
{
.ci-status
{
margin-right
:
$gl-padding
;
margin-right
:
$gl-padding
;
...
...
app/views/layouts/_page.html.haml
View file @
60db4d3a
.page-with-sidebar
{
class:
page_gutter_class
}
.page-with-sidebar
{
class:
page_gutter_class
}
-
if
defined?
(
nav
)
&&
nav
-
if
defined?
(
nav
)
&&
nav
.layout-nav
.layout-nav
.container-fluid
%div
{
class:
container_class
}
=
render
"layouts/nav/
#{
nav
}
"
=
render
"layouts/nav/
#{
nav
}
"
.content-wrapper
{
class:
"#{layout_nav_class}"
}
.content-wrapper
{
class:
"#{layout_nav_class}"
}
=
yield
:sub_nav
=
yield
:sub_nav
...
...
app/views/projects/show.html.haml
View file @
60db4d3a
...
@@ -13,7 +13,8 @@
...
@@ -13,7 +13,8 @@
=
render
"home_panel"
=
render
"home_panel"
-
if
current_user
&&
can?
(
current_user
,
:download_code
,
@project
)
-
if
current_user
&&
can?
(
current_user
,
:download_code
,
@project
)
%nav
.project-stats
{
class:
container_class
}
.project-stats-container
{
class:
container_class
}
%nav
.project-stats
%ul
.nav
%ul
.nav
%li
%li
=
link_to
project_files_path
(
@project
)
do
=
link_to
project_files_path
(
@project
)
do
...
@@ -74,7 +75,7 @@
...
@@ -74,7 +75,7 @@
Set up auto deploy
Set up auto deploy
-
if
@repository
.
commit
-
if
@repository
.
commit
.project-last-commit
{
class:
container_class
}
.project-last-commit
=
render
'projects/last_commit'
,
commit:
@repository
.
commit
,
ref:
current_ref
,
project:
@project
=
render
'projects/last_commit'
,
commit:
@repository
.
commit
,
ref:
current_ref
,
project:
@project
%div
{
class:
container_class
}
%div
{
class:
container_class
}
...
...
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