Download as
Browse Code »

Commit d9739b8026246b733cf5a36794376cbb946528fe

Authored by Dmitriy Zaporozhets
2 parents 9d09d616 de55d7aa
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'ui-improvements' into 'master' 

UI improvements

![Untitledalign-fix](https://dev.gitlab.org/uploads/gitlab/gitlabhq/5b059bab94/Untitledalign-fix.png)
Showing 5 changed files with 14 additions and 11 deletions   Show diff stats
app/assets/stylesheets/generic/issue_box.scss
  Diff comments   View file @d9739b8
... ... @@ -56,23 +56,22 @@
56 56  
57 57 .state {
58 58 border-bottom: 1px solid #DDD;
59   - padding: 10px 25px;
  59 + padding: 10px 15px;
60 60 }
61 61  
62 62 .title {
63   - font-size: 26px;
  63 + font-size: 28px;
64 64 font-weight: normal;
65 65 line-height: 1.5;
66 66 margin: 0;
67 67 color: #333;
68   - padding-bottom: 0;
69   - padding: 15px 25px;
  68 + padding: 10px 15px;
70 69 }
71 70  
72 71 .context {
73 72 border: none;
74 73 border-top: 1px solid #eee;
75   - padding: 15px 25px;
  74 + padding: 10px 15px;
76 75  
77 76 // Reset text align for children
78 77 .text-right > * { text-align: left; }
... ... @@ -88,7 +87,7 @@
88 87 }
89 88  
90 89 .description {
91   - padding: 0 25px 15px 25px;
  90 + padding: 0 15px 10px 15px;
92 91 }
93 92  
94 93 .title, .context, .description {
... ...
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @d9739b8
... ... @@ -118,3 +118,7 @@
118 118 .merge-request-show-labels .label {
119 119 padding: 6px 10px;
120 120 }
  121 +
  122 +.mr-commits .commit {
  123 + padding: 10px 15px;
  124 +}
... ...
app/views/projects/issues/_issue_context.html.haml
  Diff comments   View file @d9739b8
1 1 = form_for [@project, @issue], remote: true, html: {class: 'edit-issue inline-update'} do |f|
2 2 .row
3   - .col-md-6
  3 + .col-sm-6
4 4 %strong.append-right-10
5 5 Assignee:
6 6  
... ... @@ -11,7 +11,7 @@
11 11 - else
12 12 None
13 13  
14   - .col-md-6.text-right
  14 + .col-sm-6.text-right
15 15 %strong.append-right-10
16 16 Milestone:
17 17 - if can?(current_user, :modify_issue, @issue)
... ...
app/views/projects/merge_requests/show/_commits.html.haml
  Diff comments   View file @d9739b8
... ... @@ -3,7 +3,7 @@
3 3 .panel-heading
4 4 %i.icon-list
5 5 Commits (#{@commits.count})
6   - .commits
  6 + .commits.mr-commits
7 7 - if @commits.count > 8
8 8 %ul.first-commits.well-list
9 9 - @commits.first(8).each do |commit|
... ...
app/views/projects/merge_requests/show/_context.html.haml
  Diff comments   View file @d9739b8
1 1 = form_for [@project, @merge_request], remote: true, html: {class: 'edit-merge_request inline-update'} do |f|
2 2 .row
3   - .col-md-6
  3 + .col-sm-6
4 4 %strong.append-right-10
5 5 Assignee:
6 6  
... ... @@ -11,7 +11,7 @@
11 11 - else
12 12 None
13 13  
14   - .col-md-6.text-right
  14 + .col-sm-6.text-right
15 15 %strong.append-right-10
16 16 Milestone:
17 17 - if can?(current_user, :modify_merge_request, @merge_request)
... ...