diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-10 21:39:04 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-10 21:39:04 +0300 |
| commit | ba3c359fd565b6ccc7ce318b38224f32c0daaf15 (patch) | |
| tree | f1fda4160d215964ca9bd0779dd5924347c487f3 | |
| parent | 8f22834c4ed08f29d9ab2a5c1be58fc6da62402a (diff) | |
| download | gitlab-ce-ba3c359fd565b6ccc7ce318b38224f32c0daaf15.tar.gz | |
b2 fixes
| -rw-r--r-- | app/assets/stylesheets/common.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap.scss | 2 | ||||
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 2 | ||||
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | app/views/issues/_issues.html.haml | 4 | ||||
| -rw-r--r-- | app/views/merge_requests/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 9fb9de4b2ec..9336d67fed7 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 fd436018c3b..1e5ee51eee3 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 9cb29b382b4..bcbfc77404b 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 6e85b19a02d..00803531f00 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 ee5dc79585f..fd269066bae 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 9c7a67ad731..c49df6bb4d7 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 4c57db7e9eb..b764f2225d2 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 |