infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix default color check in palette

pull/1/head
ClemDee 2019-06-19 14:35:56 +02:00
parent 0d3a9b5e40
commit 7bfb62d5ae
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/drive/app-drive.less
View File

@ -207,13 +207,17 @@
position: absolute;
top: -1px; left: 0;
width: 200%;
border: 1px solid #666;
border: 1px solid #bbb;
transform-origin: top left;
-ms-transform-origin: top left;
transform: rotate(45deg);
-ms-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
}
&.cp-app-drive-current-color > .fa-check {
top: 35%; left: 35%;
color: black;
}
}
.cp-app-drive-icon-folder {

13
www/drive/inner.js
View File

@ -876,8 +876,17 @@ define([
var element;
if (i === 0) {
element = h("span.cp-app-drive-color-picker-color.cp-app-drive-no-color");
element = h("span.cp-app-drive-color-picker-color.cp-app-drive-no-color", [
h("span.fa.fa-check")
]);
if (currentColor === "") {
currentElement = element;
$(element).addClass("cp-app-drive-current-color");
}
$(element).on("click", function () {
$(currentElement).removeClass("cp-app-drive-current-color");
currentElement = element;
$(element).addClass("cp-app-drive-current-color");
cb("");
});
colorsElements.push(element);
@ -907,7 +916,7 @@ define([
var getFolderColor = function (path) {
if (path.length === 0) { return; }
return manager.getFolderData(path).color || "#000";
return manager.getFolderData(path).color || "";
};
var setFolderColor = function ($element, path, color) {