web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Active folder in drive is not underlined anymore

Browse Source
This commit is contained in:
yflory
2017-03-20 14:16:44 +01:00
parent cd77f50717
commit 85105a1382
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/drive/file.css
View File

@@ -122,14 +122,14 @@ span.fa-folder-open {
margin-left: -5px; margin-left: -5px;
padding-left: 5px; padding-left: 5px;
} }
#tree li > span.element-row:not(.selected):hover { #tree li > span.element-row:not(.selected):not(.active):hover {
background-color: #eee; background-color: #eee;
} }
#tree span.element { #tree span.element {
cursor: pointer; cursor: pointer;
} }
#tree .active { #tree .active:not(.selected) {
text-decoration: underline; background-color: #c8c8c8;
} }
#tree .category2 { #tree .category2 {
margin-top: 2em; margin-top: 2em;

6
www/drive/file.less
View File

@@ -156,7 +156,7 @@ span {
margin-left: -5px; margin-left: -5px;
padding-left: 5px; padding-left: 5px;
} }
& > span.element-row:not(.selected):hover { & > span.element-row:not(.selected):not(.active):hover {
background-color: @drive-hover; background-color: @drive-hover;
} }
} }
@@ -164,7 +164,9 @@ span {
cursor: pointer; cursor: pointer;
} }
.active { .active {
text-decoration: underline; &:not(.selected) {
background-color: darken(@drive-hover, 15%);
}
} }
.category2 { .category2 {
margin-top: 2em; margin-top: 2em;

6
www/drive/main.js
View File

@@ -438,7 +438,7 @@ define([
var updateContextButton = function () { var updateContextButton = function () {
var $li = $content.find('.selected'); var $li = $content.find('.selected');
if ($li.length === 0) { if ($li.length === 0) {
$li = findDataHolder($tree.find('.element.active')); $li = findDataHolder($tree.find('.active'));
} }
var $button = $driveToolbar.find('#contextButton'); var $button = $driveToolbar.find('#contextButton');
if ($button.length) { // mobile if ($button.length) { // mobile
@@ -1538,7 +1538,7 @@ define([
e.stopPropagation(); e.stopPropagation();
var $li = $content.find('.selected'); var $li = $content.find('.selected');
if ($li.length !== 1) { if ($li.length !== 1) {
$li = findDataHolder($tree.find('.element.active')); $li = findDataHolder($tree.find('.active'));
} }
// Close if already opened // Close if already opened
if ($iframe.find('.contextMenu:visible').length) { if ($iframe.find('.contextMenu:visible').length) {
@@ -1657,7 +1657,7 @@ define([
} }
$elementRow.data('path', path); $elementRow.data('path', path);
addDragAndDropHandlers($elementRow, path, true, droppable); addDragAndDropHandlers($elementRow, path, true, droppable);
if (active) { $name.addClass('active'); } if (active) { $elementRow.addClass('active'); }
return $element; return $element;
}; };