Commit 24f1ee5e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-project-last-commit-padding' into 'master'

Fix project-last-commit alignment

See merge request !9745
parents 81aec00d 9bc5c768
...@@ -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;
} }
......
...@@ -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?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment