Commit ba3c359f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

b2 fixes

parent e9e01ca43f45
......@@ -287,7 +287,7 @@ nav.main_menu {
background: rgba(0,0,0,.12);
text-align: center;
padding: 2px 4px;
line-height:20px;
line-height:18px;
margin-left:2px;
}
......
......@@ -381,7 +381,7 @@ form {
margin:0px;
}
.pills {
.nav-pills {
li {
padding:3px 0;
&.active a { background-color:$style_color; }
......
......@@ -15,7 +15,7 @@
= render(:partial => 'issues/show', :locals => {:issue => issue})
%li.bottom
.row
.span10= paginate @issues, :theme => "gitlab"
.span7= paginate @issues, :theme => "gitlab"
.span4.right
%span.cgray.right #{@issues.total_count} issues
......
......@@ -15,7 +15,7 @@
= render(:partial => 'merge_requests/merge_request', :locals => {:merge_request => merge_request})
%li.bottom
.row
.span10= paginate @merge_requests, :theme => "gitlab"
.span7= paginate @merge_requests, :theme => "gitlab"
.span4.right
%span.cgray.right #{@merge_requests.total_count} merge requests
......
......@@ -7,8 +7,8 @@
- if @issues.present?
%li.bottom
.row
.span10= paginate @issues, :remote => true, :theme => "gitlab"
.span4.right
.span7= paginate @issues, :remote => true, :theme => "gitlab"
.span3.right
%span.cgray.right #{@issues.total_count} issues for this filter
- else
%li
......
......@@ -30,7 +30,7 @@
- if @merge_requests.present?
%li.bottom
.row
.span10= paginate @merge_requests, :theme => "gitlab"
.span7= paginate @merge_requests, :theme => "gitlab"
.span4.right
%span.cgray.right #{@merge_requests.total_count} merge requests for this filter
= render "project_head"
.alert.alert-info
.entry
.row
-#.span2
.back_link
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment