From fc36e020f918611e7cbd09f685d87f24e66d6781 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 13 Nov 2025 10:52:55 +0200 Subject: [PATCH 1/6] remove old styling on drive tree --- customize.dist/src/less2/include/drive.less | 24 --------------------- 1 file changed, 24 deletions(-) diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index 1ea26cd98..356fc4aa3 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -418,8 +418,6 @@ left: -17px; top: 10px; overflow: hidden; - width: calc(1em - 2px) !important; - height: calc(1em - 2px) !important; background-color: @cp_sidebar-left-item-bg; padding: 0; margin: 0; @@ -428,8 +426,6 @@ display: inline-flex; svg { margin: -1px; - width: 1em; - height: 1em; } &:focus-visible { outline: none; @@ -490,26 +486,6 @@ padding-left: 10px; li { position: relative; - &:before { - position: absolute; - left: -10px; - top: -10px; - content: ''; - display: block; - border-left: 1px solid @cp_drive-tree-branch; - height: ~"calc(1em + 11px)"; - border-bottom: 1px solid @cp_drive-tree-branch; - width: 11px; - } - &:after { - position: absolute; - left: -10px; - bottom: -7px; - content: ''; - display: block; - border-left: 1px solid @cp_drive-tree-branch; - height: 100%; - } &.cp-app-drive-tree-root { margin: 0px 0px 0px -10px; &:before { From 2be88cecba054384bbe785c1f4a99b0221192cef Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 13 Nov 2025 10:53:44 +0200 Subject: [PATCH 2/6] update icons on drive tree --- www/common/drive-ui.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index 0466f4e3b..9831373cb 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -124,8 +124,8 @@ define([ var $recentIcon = $(Icons.get('drive-recent')); var $trashIcon = $(Icons.get('trash-full')); var $trashEmptyIcon = $(Icons.get('trash-empty')); - var $expandIcon = $(Icons.get('expand')); - var $expandedIcon = $(Icons.get('collapse')); + var $expandIcon = $(Icons.get('chevron-right')); + var $expandedIcon = $(Icons.get('chevron-down')); var $sortAscIcon = $(Icons.get('sort-asc', {'class': 'sortasc'})); var $sortDescIcon = $(Icons.get('sort-desc', {'class': 'sortdesc'})); var $closeIcon = $(Icons.get('close')); @@ -4643,9 +4643,7 @@ define([ // Display the root element in the tree if (isRoot) { var isRootOpened = manager.comparePath(path.slice(), currentPath); - var $rootIcon = manager.isFolderEmpty(files[ROOT]) ? - (isRootOpened ? $folderOpenedEmptyIcon : $folderEmptyIcon) : - (isRootOpened ? $folderOpenedIcon : $folderIcon); + var $rootIcon = $(Icons.get('drive')); var $rootElement = createTreeElement(rootName, $rootIcon.clone(), path.slice(), false, true, true, isRootOpened); if (!manager.hasSubfolder(root)) { $rootElement.find('.cp-app-drive-icon-expcol').addClass('cp-icon-hidden').attr('tabindex','-1'); From f31c7e9cb0f06b59608896669cee85c8674d0331 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 13 Nov 2025 11:01:48 +0200 Subject: [PATCH 3/6] fix spacing --- customize.dist/src/less2/include/drive.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index 356fc4aa3..b89b17797 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -366,7 +366,7 @@ display: flex; align-items: center; cursor: pointer; - margin: 0 0 2px -5px; + margin: 0 0 2px 0; .cp-app-drive-element { flex: 1; min-width: 0; From 0836d536c6e57c9e10644b86b3e26c9a3a8189ab Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 13 Nov 2025 11:34:10 +0200 Subject: [PATCH 4/6] change margin --- customize.dist/src/less2/include/drive.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index b89b17797..a33ac1bb5 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -449,7 +449,7 @@ .cp-app-drive-tree-root > .cp-app-drive-element-row { margin-left: 0px; .cp-icon-hidden ~ svg { - margin-left: -21px; + margin-left: -10px; } .cp-app-drive-icon-expcol { top: -1px; From b403f00fc6eb9cfa92df42f8f8f2cd8550be938d Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 13 Nov 2025 12:10:02 +0200 Subject: [PATCH 5/6] update expand icon styling --- customize.dist/src/less2/include/drive.less | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index a33ac1bb5..f36308222 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -416,9 +416,7 @@ font-size: 14px; position: absolute; left: -17px; - top: 10px; overflow: hidden; - background-color: @cp_sidebar-left-item-bg; padding: 0; margin: 0; z-index: 10; @@ -474,7 +472,7 @@ padding-left: 15px; } &> ul { - padding-left: 30px; + padding-left: 20px; } } } @@ -483,7 +481,7 @@ .cp-app-drive-tree-docs ul { margin: 0px 0px 0px 10px; list-style: none; - padding-left: 10px; + padding-left: 5px; li { position: relative; &.cp-app-drive-tree-root { From 440b6fe74063b8fc303bc39f323691bce4cb9a80 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Thu, 13 Nov 2025 12:19:51 +0200 Subject: [PATCH 6/6] fix focus outline for expand icon --- customize.dist/src/less2/include/drive.less | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index f36308222..6494be1f5 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -423,15 +423,11 @@ cursor: default; display: inline-flex; svg { - margin: -1px; + margin: 0; } &:focus-visible { - outline: none; - svg { - outline: @variables_focus_style; - border-radius: @variables_radius_S; - margin: 0; - } + outline: @variables_focus_style; + border-radius: @variables_radius_S; } } .cp-app-drive-tree-docs {