diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-10 21:59:26 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-10 21:59:26 +0400 |
| commit | 1c23333f344205f97fc909af724ed88c2ee45c2b (patch) | |
| tree | 18567792d1ebd55047b54a5b8aef98807b634f90 /app | |
| parent | 9d09d616af77936f0e278b991253ac7a2b0fccf3 (diff) | |
Align issue box content and mr widgets vertically
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/generic/issue_box.scss | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_commits.html.haml | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss index 3cb64d69a9f..c468980f64d 100644 --- a/app/assets/stylesheets/generic/issue_box.scss +++ b/app/assets/stylesheets/generic/issue_box.scss @@ -56,23 +56,22 @@ .state { border-bottom: 1px solid #DDD; - padding: 10px 25px; + padding: 10px 15px; } .title { - font-size: 26px; + font-size: 28px; font-weight: normal; line-height: 1.5; margin: 0; color: #333; - padding-bottom: 0; - padding: 15px 25px; + padding: 10px 15px; } .context { border: none; border-top: 1px solid #eee; - padding: 15px 25px; + padding: 10px 15px; // Reset text align for children .text-right > * { text-align: left; } @@ -88,7 +87,7 @@ } .description { - padding: 0 25px 15px 25px; + padding: 0 15px 10px 15px; } .title, .context, .description { diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 5bff00f376e..debbec4cb98 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -118,3 +118,7 @@ .merge-request-show-labels .label { padding: 6px 10px; } + +.mr-commits .commit { + padding: 10px 15px; +} diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml index e62ab9d9d30..92a7bb927e4 100644 --- a/app/views/projects/merge_requests/show/_commits.html.haml +++ b/app/views/projects/merge_requests/show/_commits.html.haml @@ -3,7 +3,7 @@ .panel-heading %i.icon-list Commits (#{@commits.count}) - .commits + .commits.mr-commits - if @commits.count > 8 %ul.first-commits.well-list - @commits.first(8).each do |commit| |