b2 fixes

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 9fb9de4..9336d67 100644 (file)
--- 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 fd43601..1e5ee51 100644 (file)
--- 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 9cb29b3..bcbfc77 100644 (file)
--- 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 6e85b19..0080353 100644 (file)
--- 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 ee5dc79..fd26906 100644 (file)
--- 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 9c7a67a..c49df6b 100644 (file)
--- 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 4c57db7..b764f22 100644 (file)
--- 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