Download as
Browse Code »

Commit 31fcac9ff9e1c3a0b08617bcc9d5e549c11634b6

Authored by Dmitriy Zaporozhets
2 parents a54bef0a 87e0fe6f
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'ui-improvements' into 'master' 

Ui improvements
Showing 6 changed files with 15 additions and 16 deletions   Show diff stats
app/assets/stylesheets/generic/lists.scss
  Diff comments   View file @31fcac9
... ... @@ -8,7 +8,7 @@
8 8 list-style: none;
9 9  
10 10 li {
11   - padding: 10px;
  11 + padding: 10px 15px;
12 12 min-height: 20px;
13 13 border-bottom: 1px solid #eee;
14 14 border-bottom: 1px solid rgba(0, 0, 0, 0.05);
... ...
app/assets/stylesheets/gl_bootstrap.scss
  Diff comments   View file @31fcac9
... ... @@ -262,6 +262,10 @@ ul.breadcrumb {
262 262 &.panel-small {
263 263 .panel-heading {
264 264 padding: 6px 15px;
  265 + font-size: 13px;
  266 + a {
  267 + color: #777;
  268 + }
265 269 }
266 270 }
267 271 }
... ...
app/assets/stylesheets/sections/dashboard.scss
  Diff comments   View file @31fcac9
... ... @@ -60,7 +60,7 @@
60 60 }
61 61  
62 62 .project-row, .group-row {
63   - padding: 8px 12px !important;
  63 + padding: 8px 15px !important;
64 64 font-size: 14px;
65 65 line-height: 24px;
66 66  
... ... @@ -74,7 +74,6 @@
74 74  
75 75 .arrow {
76 76 float: right;
77   - padding: 0px 5px;
78 77 margin: 0;
79 78 font-size: 20px;
80 79 color: #666;
... ...
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @31fcac9
1 1 .issues-list {
2 2 .issue {
3   - padding: 10px;
  3 + padding: 10px 15px;
4 4 position: relative;
5 5  
6 6 .issue-title {
... ... @@ -42,7 +42,7 @@
42 42 height: 32px;
43 43 float: left;
44 44 margin-right: 12px;
45   - padding: 6px 10px;
  45 + padding: 6px 15px;
46 46 border: 1px solid #ccc;
47 47 @include border-radius(4px);
48 48 }
... ...
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @31fcac9
... ... @@ -20,18 +20,14 @@
20 20 }
21 21  
22 22 .merge-request .merge-request-tabs{
23   - border-color: #AAA;
  23 + border-bottom: 2px solid $border_primary;
  24 + padding-bottom: 10px;
  25 + margin-bottom: 20px;
  26 +
24 27 li {
25 28 a {
26   - border-color: #AAA;
27   - padding: 14px 40px;
  29 + padding: 20px 40px;
28 30 font-size: 14px;
29   - background-color: #F9F9F9;
30   - }
31   - &.active a {
32   - border-color: #AAA;
33   - border-bottom-color: #FFF;
34   - background-color: #FFF;
35 31 }
36 32 }
37 33 }
... ... @@ -70,7 +66,7 @@
70 66  
71 67 .mr-list {
72 68 .merge-request {
73   - padding: 10px;
  69 + padding: 10px 15px;
74 70 position: relative;
75 71  
76 72 .merge-request-title {
... ...
app/views/projects/merge_requests/_show.html.haml
  Diff comments   View file @31fcac9
... ... @@ -7,7 +7,7 @@
7 7 = render "projects/merge_requests/show/participants"
8 8  
9 9 - if @commits.present?
10   - %ul.nav.nav-tabs.merge-request-tabs
  10 + %ul.nav.nav-pills.merge-request-tabs
11 11 %li.notes-tab{data: {action: 'notes'}}
12 12 = link_to project_merge_request_path(@project, @merge_request) do
13 13 %i.icon-comment
... ...