diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 9fb9de4b2ec7afd849411220607931568aac9c7b..9336d67fed7c3b60398dda2decba4dd7ef7a6e56 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -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; } diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index fd436018c3b553eb29493787880c6ec27bb6f852..1e5ee51eee30c97f5bad0bed2c5b29497f9b6128 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -381,7 +381,7 @@ form { margin:0px; } - .pills { + .nav-pills { li { padding:3px 0; &.active a { background-color:$style_color; } diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 9cb29b382b4795a2372293a2d538a83fceab4a8d..bcbfc77404b886b03089592bf52d58a956017ae4 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -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 diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 6e85b19a02d8c0777692efec5a871117f1581fb7..00803531f00adf873f143ee238f252ebd38fefe9 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -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 diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml index ee5dc79585f5106eae4715a6658cae66e6e6c6b0..fd269066bae5bb2767ee6f2209f70df8c1b9dfaf 100644 --- a/app/views/issues/_issues.html.haml +++ b/app/views/issues/_issues.html.haml @@ -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 diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index 9c7a67ad731958cc91f67d2031f8174524508981..c49df6bb4d785676ce5c59a181121c3d4829b007 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -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 diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 4c57db7e9eba75521b7e40db16352f8a031729f1..b764f2225d20ddd10516a7f09cba98cf19238615 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,6 +1,6 @@ = render "project_head" -.alert.alert-info +.entry .row -#.span2 .back_link