diff --git a/src/styles/_apps_base.sass b/src/styles/_apps_base.sass index e3044259..4075fb6a 100644 --- a/src/styles/_apps_base.sass +++ b/src/styles/_apps_base.sass @@ -3,10 +3,10 @@ height: 5px ::-webkit-scrollbar-track - background-color: $color-background + background-color: rgba($color-background, .2) ::-webkit-scrollbar-thumb - background-color: $color-text-dark-hint + background-color: rgba($color-text-dark-hint, .6) $splitter-width: 5px diff --git a/src/styles/_project.sass b/src/styles/_project.sass index 0ee7702a..ca1573c4 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -1,3 +1,5 @@ +$project-sidebar-background: $color-background-nav + #project-container display: flex flex-direction: row @@ -164,7 +166,7 @@ visibility: visible width: $project_nav-width position: relative - background-color: $color-background-light + background-color: $project-sidebar-background color: white left: 0 @@ -738,9 +740,9 @@ ul.project_nav-edit-list /* The actual navigation tree container */ #project_tree padding: 5px 0 // some padding on top/bottom of jstree - position: relative // for scrollbar alignment + position: relative margin-top: $project_header-height - background-color: $color-background-light + background-color: $project-sidebar-background overflow-y: auto &.edit @@ -769,7 +771,7 @@ ul.project_nav-edit-list right: 0 bottom: 0 width: 2px - background-color: $color-background + background-color: $color-background-nav-light /* Node Context */ =project-node-title diff --git a/src/styles/plugins/_jstree.sass b/src/styles/plugins/_jstree.sass index 5bdb70f9..a30fd616 100644 --- a/src/styles/plugins/_jstree.sass +++ b/src/styles/plugins/_jstree.sass @@ -1,8 +1,8 @@ /* jsTree overrides */ -$tree-color-text: $color-text-dark -$tree-color-highlight: hsl(hue($color-background-active), 50%, 50%) -$tree-color-highlight-background: hsl(hue($color-background-active), 40%, 50%) +$tree-color-text: $color-text-light-primary +$tree-color-highlight: white +$tree-color-highlight-background: hsl(hue($color-background-active), 40%, 40%) $tree-color-highlight-background-text: white .jstree-default @@ -34,7 +34,6 @@ $tree-color-highlight-background-text: white /* Items at top level */ &.jstree-leaf - // border-left: 2px solid lighten($color-background-nav, 15%) .jstree-icon.jstree-themeicon opacity: 1 width: 24px !important @@ -62,11 +61,10 @@ $tree-color-highlight-background-text: white font-size: .85em !important .jstree-anchor - border-left: thin solid $color-text-dark-hint + border-left: thin solid rgba($tree-color-text, .2) /* Closed Folder */ - &.jstree-closed - // border-left: 2px solid lighten($color-background-nav, 20%) + // &.jstree-closed &.jstree-open .jstree-icon.jstree-ocl, &.jstree-closed .jstree-icon.jstree-ocl