From 1fd29253e653b11dc1e4792e02fc2bb4a00b013a Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 21 Nov 2017 11:45:06 +0000 Subject: [PATCH] Handle filetree multiselection. --- .../stylesheets/app/editor/file-tree.less | 21 ++++++++++++++++--- .../public/stylesheets/core/ol-variables.less | 4 ++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/services/web/public/stylesheets/app/editor/file-tree.less b/services/web/public/stylesheets/app/editor/file-tree.less index 9ceb415ec3..ea485d590e 100644 --- a/services/web/public/stylesheets/app/editor/file-tree.less +++ b/services/web/public/stylesheets/app/editor/file-tree.less @@ -14,6 +14,7 @@ aside#file-tree { } } + // TODO; Consolidate with "Project files" in Overleaf h3 { font-size: 1rem; border-bottom: 1px solid @gray; @@ -67,6 +68,7 @@ aside#file-tree { line-height: 1.6; } &.droppable-hover { + // TODO background-color: fade(@file-tree-droppable-background-color, 60%); } } @@ -89,10 +91,23 @@ aside#file-tree { } &.multi-selected { - > .entity > .entity-name { - background-color: lighten(@brand-info, 40%); + > .entity > .entity-name when (@is-overleaf = false) { + background-color: @file-tree-multiselect-bg; &:hover { - background-color: lighten(@brand-info, 30%); + background-color: @file-tree-multiselect-hover-bg; + } + } + > .entity when (@is-overleaf = true) { + i.fa { + color: #FFF; + } + > .entity-name { + background-color: @file-tree-multiselect-bg; + box-shadow: -200px 0 0 @file-tree-multiselect-bg; + &:hover { + background-color: @file-tree-multiselect-hover-bg; + box-shadow: -200px 0 0 @file-tree-multiselect-hover-bg; + } } } } diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less index 30d11f7a83..caee24c450 100644 --- a/services/web/public/stylesheets/core/ol-variables.less +++ b/services/web/public/stylesheets/core/ol-variables.less @@ -180,8 +180,8 @@ @file-tree-item-folder-color : @ol-blue-gray-2; @file-tree-item-hover-bg : @ol-blue-gray-5; @file-tree-item-selected-bg : @ol-green; -@file-tree-multiselect-bg : lighten(@brand-warning, 10%); -@file-tree-multiselect-hover-bg : lighten(@brand-warning, 20%); +@file-tree-multiselect-bg : @ol-blue; +@file-tree-multiselect-hover-bg : @ol-dark-blue; //== Colors // //## Gray and brand colors for use across Bootstrap.