Download as
Browse Code »

Commit ba3c359fd565b6ccc7ce318b38224f32c0daaf15

Authored by Dmitriy Zaporozhets
1 parent 8f22834c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

b2 fixes

Showing 7 changed files with 8 additions and 8 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @ba3c359
... ... @@ -287,7 +287,7 @@ nav.main_menu {
287 287 background: rgba(0,0,0,.12);
288 288 text-align: center;
289 289 padding: 2px 4px;
290   - line-height:20px;
  290 + line-height:18px;
291 291 margin-left:2px;
292 292 }
293 293  
... ...
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @ba3c359
... ... @@ -381,7 +381,7 @@ form {
381 381 margin:0px;
382 382 }
383 383  
384   - .pills {
  384 + .nav-pills {
385 385 li {
386 386 padding:3px 0;
387 387 &.active a { background-color:$style_color; }
... ...
app/views/dashboard/issues.html.haml
  Diff comments   View file @ba3c359
... ... @@ -15,7 +15,7 @@
15 15 = render(:partial => 'issues/show', :locals => {:issue => issue})
16 16 %li.bottom
17 17 .row
18   - .span10= paginate @issues, :theme => "gitlab"
  18 + .span7= paginate @issues, :theme => "gitlab"
19 19 .span4.right
20 20 %span.cgray.right #{@issues.total_count} issues
21 21  
... ...
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @ba3c359
... ... @@ -15,7 +15,7 @@
15 15 = render(:partial => 'merge_requests/merge_request', :locals => {:merge_request => merge_request})
16 16 %li.bottom
17 17 .row
18   - .span10= paginate @merge_requests, :theme => "gitlab"
  18 + .span7= paginate @merge_requests, :theme => "gitlab"
19 19 .span4.right
20 20 %span.cgray.right #{@merge_requests.total_count} merge requests
21 21  
... ...
app/views/issues/_issues.html.haml
  Diff comments   View file @ba3c359
... ... @@ -7,8 +7,8 @@
7 7 - if @issues.present?
8 8 %li.bottom
9 9 .row
10   - .span10= paginate @issues, :remote => true, :theme => "gitlab"
11   - .span4.right
  10 + .span7= paginate @issues, :remote => true, :theme => "gitlab"
  11 + .span3.right
12 12 %span.cgray.right #{@issues.total_count} issues for this filter
13 13 - else
14 14 %li
... ...
app/views/merge_requests/index.html.haml
  Diff comments   View file @ba3c359
... ... @@ -30,7 +30,7 @@
30 30 - if @merge_requests.present?
31 31 %li.bottom
32 32 .row
33   - .span10= paginate @merge_requests, :theme => "gitlab"
  33 + .span7= paginate @merge_requests, :theme => "gitlab"
34 34 .span4.right
35 35 %span.cgray.right #{@merge_requests.total_count} merge requests for this filter
36 36  
... ...
app/views/projects/show.html.haml
  Diff comments   View file @ba3c359
1 1 = render "project_head"
2 2  
3   -.alert.alert-info
  3 +.entry
4 4 .row
5 5 -#.span2
6 6 .back_link
... ...