deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

b2 fixes

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-10 21:39:04 +03:00
parent 8f22834c4e
commit ba3c359fd5
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/common.scss
View file

@ -287,7 +287,7 @@ nav.main_menu {
background: rgba(0,0,0,.12); background: rgba(0,0,0,.12);
text-align: center; text-align: center;
padding: 2px 4px; padding: 2px 4px;
line-height:20px; line-height:18px;
margin-left:2px; margin-left:2px;
} }

2
app/assets/stylesheets/gitlab_bootstrap.scss
View file

@ -381,7 +381,7 @@ form {
margin:0px; margin:0px;
} }
.pills { .nav-pills {
li { li {
padding:3px 0; padding:3px 0;
&.active a { background-color:$style_color; } &.active a { background-color:$style_color; }

2
app/views/dashboard/issues.html.haml
View file

@ -15,7 +15,7 @@
= render(:partial => 'issues/show', :locals => {:issue => issue}) = render(:partial => 'issues/show', :locals => {:issue => issue})
%li.bottom %li.bottom
.row .row
.span10= paginate @issues, :theme => "gitlab" .span7= paginate @issues, :theme => "gitlab"
.span4.right .span4.right
%span.cgray.right #{@issues.total_count} issues %span.cgray.right #{@issues.total_count} issues

2
app/views/dashboard/merge_requests.html.haml
View file

@ -15,7 +15,7 @@
= render(:partial => 'merge_requests/merge_request', :locals => {:merge_request => merge_request}) = render(:partial => 'merge_requests/merge_request', :locals => {:merge_request => merge_request})
%li.bottom %li.bottom
.row .row
.span10= paginate @merge_requests, :theme => "gitlab" .span7= paginate @merge_requests, :theme => "gitlab"
.span4.right .span4.right
%span.cgray.right #{@merge_requests.total_count} merge requests %span.cgray.right #{@merge_requests.total_count} merge requests

4
app/views/issues/_issues.html.haml
View file

@ -7,8 +7,8 @@
- if @issues.present? - if @issues.present?
%li.bottom %li.bottom
.row .row
.span10= paginate @issues, :remote => true, :theme => "gitlab" .span7= paginate @issues, :remote => true, :theme => "gitlab"
.span4.right .span3.right
%span.cgray.right #{@issues.total_count} issues for this filter %span.cgray.right #{@issues.total_count} issues for this filter
- else - else
%li %li

2
app/views/merge_requests/index.html.haml
View file

@ -30,7 +30,7 @@
- if @merge_requests.present? - if @merge_requests.present?
%li.bottom %li.bottom
.row .row
.span10= paginate @merge_requests, :theme => "gitlab" .span7= paginate @merge_requests, :theme => "gitlab"
.span4.right .span4.right
%span.cgray.right #{@merge_requests.total_count} merge requests for this filter %span.cgray.right #{@merge_requests.total_count} merge requests for this filter

2
app/views/projects/show.html.haml
View file

@ -1,6 +1,6 @@
= render "project_head" = render "project_head"
.alert.alert-info .entry
.row .row
-#.span2 -#.span2
.back_link .back_link