diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 9ad1a1db2c..dc23272b48 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -52,8 +52,6 @@ header { border-width: 0; font-size: 18px; - .app_logo { margin-left: -15px; } - .title { @include str-truncated(70%); } diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss index d23ce7d236..188f40fe4f 100644 --- a/app/assets/stylesheets/sections/sidebar.scss +++ b/app/assets/stylesheets/sections/sidebar.scss @@ -47,11 +47,6 @@ body.project { .sidebar-wrapper { z-index: 1000; - position: absolute; - left: 250px; - width: 0; - height: 100%; - margin-left: -250px; overflow-y: auto; background: #F5F5F5; } @@ -63,12 +58,12 @@ body.project { } .nav-sidebar { - position: fixed; - top: 45px; - width: 250px; margin: 0; list-style: none; - margin-top: 20px; + + &.navbar-collapse { + padding: 0px !important; + } } .nav-sidebar li a .count { @@ -143,6 +138,17 @@ body.project { .sidebar-wrapper { width: 250px; + position: absolute; + left: 250px; + height: 100%; + margin-left: -250px; + + .nav-sidebar { + margin-top: 20px; + position: fixed; + top: 45px; + width: 250px; + } } .content-wrapper { @@ -154,4 +160,3 @@ body.project { .profiler-results { display: none; } - diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 05d637f212..000bb1475d 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -1,4 +1,4 @@ -%ul.project-navigation.nav.nav-sidebar +%ul.project-navigation.nav.nav-sidebar.navbar-collapse.collapse = nav_link(path: 'projects#show', html_options: {class: "home"}) do = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do Project