Download as
Browse Code »

Commit 87e0fe6f76fa8829abb99dd90a8af65ed11bc3a3

Authored by Dmitriy Zaporozhets
1 parent 7bb0551f
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Use big colorful pills for switch between MR tabs 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 6 additions and 10 deletions   Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @87e0fe6
@@ -20,18 +20,14 @@ @@ -20,18 +20,14 @@
20 } 20 }
21 21
22 .merge-request .merge-request-tabs{ 22 .merge-request .merge-request-tabs{
23 - border-color: #AAA; 23 + border-bottom: 2px solid $border_primary;
  24 + padding-bottom: 10px;
  25 + margin-bottom: 20px;
  26 +
24 li { 27 li {
25 a { 28 a {
26 - border-color: #AAA;  
27 - padding: 14px 40px; 29 + padding: 20px 40px;
28 font-size: 14px; 30 font-size: 14px;
29 - background-color: #F9F9F9;  
30 - }  
31 - &.active a {  
32 - border-color: #AAA;  
33 - border-bottom-color: #FFF;  
34 - background-color: #FFF;  
35 } 31 }
36 } 32 }
37 } 33 }
app/views/projects/merge_requests/_show.html.haml
  Diff comments   View file @87e0fe6
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 = render "projects/merge_requests/show/participants" 7 = render "projects/merge_requests/show/participants"
8 8
9 - if @commits.present? 9 - if @commits.present?
10 - %ul.nav.nav-tabs.merge-request-tabs 10 + %ul.nav.nav-pills.merge-request-tabs
11 %li.notes-tab{data: {action: 'notes'}} 11 %li.notes-tab{data: {action: 'notes'}}
12 = link_to project_merge_request_path(@project, @merge_request) do 12 = link_to project_merge_request_path(@project, @merge_request) do
13 %i.icon-comment 13 %i.icon-comment