From 18ec206a4032280f19af9c2a902398e728c0c21d Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Tue, 2 Apr 2019 16:39:54 +0200 Subject: [PATCH] UI Breadcrums: Always show. --- src/scripts/tutti/1_project-navigation.js | 10 ---------- src/styles/_project.sass | 10 +++++++++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/scripts/tutti/1_project-navigation.js b/src/scripts/tutti/1_project-navigation.js index 32d7b423..8265a619 100644 --- a/src/scripts/tutti/1_project-navigation.js +++ b/src/scripts/tutti/1_project-navigation.js @@ -77,10 +77,6 @@ function containerResizeY(window_height){ 'height': window_height_minus_nav + 'px'} ); - $('#project_context, #project_context-header').css( - {'top' : breadcrumbs_height} - ); - $('#project_nav-container, #project_tree').css( {'max-height': (window_height_minus_nav) + 'px', 'height': (window_height_minus_nav) + 'px'} @@ -113,18 +109,12 @@ function showProjectSidebar(){ Cookies.remove('bcloud_ui', 'hide_project_sidebar'); $('#project-container').addClass('is-sidebar-visible'); - - // Hide the toggle button. - $('.breadcrumbs-container .project-sidebar-toggle').hide(); } function hideProjectSidebar(){ setJSONCookie('bcloud_ui', 'hide_project_sidebar', true); $('#project-container').removeClass('is-sidebar-visible'); - - // Show the toggle button. - $('.breadcrumbs-container .project-sidebar-toggle').show(); } function toggleProjectSidebar(){ diff --git a/src/styles/_project.sass b/src/styles/_project.sass index 861cb46c..c9905ffd 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -1,4 +1,5 @@ $node-latest-thumbnail-size: 160px +$breadcrumbs-container-height: 26px /* Dark navbar when browsing a project. */ body.project, @@ -32,8 +33,11 @@ body.svnman, body.edit_node_types, body.search-project +media-xl left: $project_nav-width-xl + .project-sidebar-toggle + @extend .d-none + #project-side-container - display: none + display: none // It's 'flex' when is-sidebar-visible is in #project-container +media-xs position: fixed @@ -126,6 +130,7 @@ body.svnman, body.edit_node_types, body.search-project /* Header with name and node edit tools */ #project_context-header + top: $breadcrumbs-container-height right: 0 z-index: $z-index-base + 3 @@ -258,9 +263,12 @@ ul.project-edit-tools border: none .breadcrumbs-container + height: $breadcrumbs-container-height top: $project_header-height + 1 #project_context + padding-top: $breadcrumbs-container-height + 1 + .node-details-description font: size: 1.2em