From e4763d809b288aaef696432788dc0ae2761f9963 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Mon, 5 Sep 2016 18:55:49 +0200 Subject: [PATCH] Project view: Fix transparent background of tree/sidebar --- src/scripts/tutti/0_navbar.js | 2 +- src/styles/_project.sass | 2 ++ src/templates/projects/view.jade | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/scripts/tutti/0_navbar.js b/src/scripts/tutti/0_navbar.js index d796c7b3..99eb57a3 100644 --- a/src/scripts/tutti/0_navbar.js +++ b/src/scripts/tutti/0_navbar.js @@ -5,7 +5,7 @@ $(function () { function NavbarTransparent() { - var startingpoint = 50; + var startingpoint = 15; $(window).on("load scroll", function () { diff --git a/src/styles/_project.sass b/src/styles/_project.sass index dcebfc3a..7cede2bf 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -46,6 +46,7 @@ width: 100% ul.project-tabs + background-color: $color-background-nav-dark margin: 0 padding: 0 list-style: none @@ -735,6 +736,7 @@ ul.project_nav-edit-list padding-bottom: 5px // some padding on bottom of jstree position: relative // for scrollbar alignment margin-top: $project_header-height + background-color: $color-background-nav &.edit margin-top: 0 diff --git a/src/templates/projects/view.jade b/src/templates/projects/view.jade index ebfaf906..4c1bd9b1 100644 --- a/src/templates/projects/view.jade +++ b/src/templates/projects/view.jade @@ -578,9 +578,13 @@ script. // Initialize the page loadContent(); + var project_container = document.getElementById('project-container'); + /* UI Stuff */ $(window).on("load resize",function(){ containerResizeY($(window).height()); + + project_container.style.height = (window.innerHeight - project_container.offsetTop) + "px"; }); if (projectTree){