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
24f1ee5e
Commit
24f1ee5e
authored
Mar 07, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-project-last-commit-padding' into 'master'
Fix project-last-commit alignment See merge request !9745
parents
81aec00d
9bc5c768
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
23 deletions
+9
-23
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+6
-21
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+3
-2
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
24f1ee5e
...
@@ -494,11 +494,11 @@ a.deploy-project-label {
...
@@ -494,11 +494,11 @@ a.deploy-project-label {
.project-stats
{
.project-stats
{
font-size
:
0
;
font-size
:
0
;
text-align
:
center
;
text-align
:
center
;
border-bottom
:
1px
solid
$border-color
;
.nav
{
.nav
{
padding-top
:
12px
;
padding-top
:
12px
;
padding-bottom
:
12px
;
padding-bottom
:
12px
;
border-bottom
:
1px
solid
$border-color
;
}
}
.nav
>
li
{
.nav
>
li
{
...
@@ -645,30 +645,15 @@ pre.light-well {
...
@@ -645,30 +645,15 @@ pre.light-well {
}
}
.project-last-commit
{
.project-last-commit
{
background-color
:
$gray-light
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-base
;
padding
:
12px
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
margin-top
:
$gl-padding
;
margin-top
:
$gl-padding
;
}
}
&
.container-fluid
{
padding-top
:
12px
;
padding-bottom
:
12px
;
background-color
:
$gray-light
;
border
:
1px
solid
$border-color
;
border-right-width
:
0
;
border-left-width
:
0
;
@media
(
min-width
:
$screen-sm-min
)
{
border-right-width
:
1px
;
border-left-width
:
1px
;
}
}
&
.container-limited
{
@media
(
min-width
:
1281px
)
{
border-radius
:
$border-radius-base
;
}
}
.ci-status
{
.ci-status
{
margin-right
:
$gl-padding
;
margin-right
:
$gl-padding
;
}
}
...
...
app/views/projects/show.html.haml
View file @
24f1ee5e
...
@@ -74,8 +74,9 @@
...
@@ -74,8 +74,9 @@
Set up auto deploy
Set up auto deploy
-
if
@repository
.
commit
-
if
@repository
.
commit
.project-last-commit
{
class:
container_class
}
%div
{
class:
container_class
}
=
render
'projects/last_commit'
,
commit:
@repository
.
commit
,
ref:
current_ref
,
project:
@project
.project-last-commit
=
render
'projects/last_commit'
,
commit:
@repository
.
commit
,
ref:
current_ref
,
project:
@project
%div
{
class:
container_class
}
%div
{
class:
container_class
}
-
if
@project
.
archived?
-
if
@project
.
archived?
...
...
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