diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-07 08:00:13 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-07 08:00:13 +0000 |
| commit | 24f1ee5e9b1f4d9bc8cff581419b091756da8deb (patch) | |
| tree | c000db44b9285da94cc95ec95f144027bca5199e | |
| parent | 81aec00d6172fbc67d0e11ea262ebd6019bf4539 (diff) | |
| parent | 9bc5c768e146f92295821b010fe1661ef97f1c01 (diff) | |
| download | gitlab-ce-24f1ee5e9b1f4d9bc8cff581419b091756da8deb.tar.gz | |
Merge branch 'fix-project-last-commit-padding' into 'master'
Fix project-last-commit alignment
See merge request !9745
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 27 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 5 |
2 files changed, 9 insertions, 23 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 07b93430442..09b85db7d45 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -494,11 +494,11 @@ a.deploy-project-label { .project-stats { font-size: 0; text-align: center; - border-bottom: 1px solid $border-color; .nav { padding-top: 12px; padding-bottom: 12px; + border-bottom: 1px solid $border-color; } .nav > li { @@ -645,30 +645,15 @@ pre.light-well { } .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) { 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 { margin-right: $gl-padding; } diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 30d185e6556..de1229d58aa 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -74,8 +74,9 @@ Set up auto deploy - if @repository.commit - .project-last-commit{ class: container_class } - = render 'projects/last_commit', commit: @repository.commit, ref: current_ref, project: @project + %div{ class: container_class } + .project-last-commit + = render 'projects/last_commit', commit: @repository.commit, ref: current_ref, project: @project %div{ class: container_class } - if @project.archived? |