Download as
Browse Code »

Commit 87415ab2a67495713be5da79a60c1ec26060be9b

Authored by Dmitriy Zaporozhets
1 parent b6a609ed
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Add bottom margin to nav-tabs 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 9 changed files with 10 additions and 8 deletions   Show diff stats
app/assets/stylesheets/gl_bootstrap.scss
  Diff comments   View file @87415ab
@@ -108,6 +108,8 @@ $pagination-active-bg: $bg_style_color; @@ -108,6 +108,8 @@ $pagination-active-bg: $bg_style_color;
108 108
109 // Nav tabs 109 // Nav tabs
110 .nav.nav-tabs { 110 .nav.nav-tabs {
  111 + margin-bottom: 15px;
  112 +
111 li { 113 li {
112 > a { 114 > a {
113 padding: 8px 20px; 115 padding: 8px 20px;
app/assets/stylesheets/sections/dashboard.scss
  Diff comments   View file @87415ab
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 .dash-sidebar-tabs { 41 .dash-sidebar-tabs {
42 margin-bottom: 2px; 42 margin-bottom: 2px;
43 border: none; 43 border: none;
44 - margin: 0; 44 + margin: 0 !important;
45 45
46 li { 46 li {
47 &.active { 47 &.active {
app/views/devise/sessions/new.html.haml
  Diff comments   View file @87415ab
1 .login-box 1 .login-box
2 %h3.page-title Sign in 2 %h3.page-title Sign in
3 - if ldap_enabled? 3 - if ldap_enabled?
4 - %ul.nav.nav-tabs.append-bottom-20 4 + %ul.nav.nav-tabs
5 %li.active 5 %li.active
6 = link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab' 6 = link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab'
7 %li 7 %li
app/views/projects/commits/_head.html.haml
  Diff comments   View file @87415ab
1 -%ul.nav.nav-tabs.append-bottom-15 1 +%ul.nav.nav-tabs
2 %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} 2 %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
3 3
4 = nav_link(controller: [:commit, :commits]) do 4 = nav_link(controller: [:commit, :commits]) do
app/views/projects/issues/_head.html.haml
  Diff comments   View file @87415ab
1 -%ul.nav.nav-tabs.append-bottom-15 1 +%ul.nav.nav-tabs
2 = nav_link(controller: :issues) do 2 = nav_link(controller: :issues) do
3 = link_to project_issues_path(@project), class: "tab" do 3 = link_to project_issues_path(@project), class: "tab" do
4 Browse Issues 4 Browse Issues
app/views/projects/merge_requests/_show.html.haml
  Diff comments   View file @87415ab
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 = render "projects/merge_requests/show/commits" 12 = render "projects/merge_requests/show/commits"
13 13
14 - if @commits.present? 14 - if @commits.present?
15 - %ul.nav.nav-tabs.append-bottom-10 15 + %ul.nav.nav-tabs
16 %li.notes-tab{data: {action: 'notes'}} 16 %li.notes-tab{data: {action: 'notes'}}
17 = link_to project_merge_request_path(@project, @merge_request) do 17 = link_to project_merge_request_path(@project, @merge_request) do
18 %i.icon-comment 18 %i.icon-comment
app/views/projects/milestones/show.html.haml
  Diff comments   View file @87415ab
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 = preserve do 48 = preserve do
49 = markdown @milestone.description 49 = markdown @milestone.description
50 50
51 -%ul.nav.nav-tabs.append-bottom-10 51 +%ul.nav.nav-tabs
52 %li.active 52 %li.active
53 = link_to '#tab-issues', 'data-toggle' => 'tab' do 53 = link_to '#tab-issues', 'data-toggle' => 'tab' do
54 Issues 54 Issues
app/views/projects/wikis/_nav.html.haml
  Diff comments   View file @87415ab
1 -%ul.nav.nav-tabs.append-bottom-20 1 +%ul.nav.nav-tabs
2 = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do 2 = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
3 = link_to 'Home', project_wiki_path(@project, :home) 3 = link_to 'Home', project_wiki_path(@project, :home)
4 4
app/views/search/_project_results.html.haml
  Diff comments   View file @87415ab
1 -%ul.nav.nav-tabs.append-bottom-10 1 +%ul.nav.nav-tabs
2 %li{class: ("active" if params[:search_code].present?)} 2 %li{class: ("active" if params[:search_code].present?)}
3 = link_to search_path(params.merge(search_code: true)) do 3 = link_to search_path(params.merge(search_code: true)) do
4 Repository Code 4 Repository Code