Download as
Browse Code »

Commit b3a0ee8e631c3e272c8ce3b60929192d3f7f1f22

Authored by Dmitriy Zaporozhets
1 parent 15a03e1d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix MR tab width

Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
app/assets/stylesheets/nav.scss
  Diff comments   View file @b3a0ee8
@@ -79,6 +79,11 @@ nav.main_menu { @@ -79,6 +79,11 @@ nav.main_menu {
79 border-left:none; 79 border-left:none;
80 } 80 }
81 } 81 }
  82 +
  83 + &.wide {
  84 + width:185px;
  85 + @media (min-width: 1080px) and (max-width: 1200px) { width:160px; }
  86 + }
82 } 87 }
83 } 88 }
84 /* 89 /*
app/views/layouts/_project_menu.html.haml
  Diff comments   View file @b3a0ee8
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 Issues 12 Issues
13 %span.count= @project.issues.opened.count 13 %span.count= @project.issues.opened.count
14 - if @project.merge_requests_enabled 14 - if @project.merge_requests_enabled
15 - = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do 15 + = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current wide" : "wide" do
16 Merge Requests 16 Merge Requests
17 %span.count= @project.merge_requests.opened.count 17 %span.count= @project.merge_requests.opened.count
18 18