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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz 2017-06-30 11:21:27 +02:00
commit 9e91739044
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/drive/file.less
View File

@ -154,8 +154,8 @@ li {
span { span {
&.fa-folder, &.fa-folder-open { &.fa-folder, &.fa-folder-open {
color: #FEDE8B; //color: #FEDE8B;
text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black; //text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
} }
} }

8
www/drive/main.js
View File

@ -152,11 +152,11 @@ define([
}; };
// Icons // Icons
//var $folderIcon = $('<span>', {"class": "fa fa-folder folder icon"}); var $folderIcon = $('<span>', {"class": "fa fa-folder folder icon"});
var $folderIcon = $('<img>', {src: "/customize/images/icons/folder.svg", "class": "folder icon"}); //var $folderIcon = $('<img>', {src: "/customize/images/icons/folder.svg", "class": "folder icon"});
var $folderEmptyIcon = $folderIcon.clone(); var $folderEmptyIcon = $folderIcon.clone();
//var $folderOpenedIcon = $('<span>', {"class": "fa fa-folder-open folder"}); var $folderOpenedIcon = $('<span>', {"class": "fa fa-folder-open folder"});
var $folderOpenedIcon = $('<img>', {src: "/customize/images/icons/folderOpen.svg", "class": "folder icon"}); //var $folderOpenedIcon = $('<img>', {src: "/customize/images/icons/folderOpen.svg", "class": "folder icon"});
var $folderOpenedEmptyIcon = $folderOpenedIcon.clone(); var $folderOpenedEmptyIcon = $folderOpenedIcon.clone();
//var $upIcon = $('<span>', {"class": "fa fa-arrow-circle-up"}); //var $upIcon = $('<span>', {"class": "fa fa-arrow-circle-up"});
var $unsortedIcon = $('<span>', {"class": "fa fa-files-o"}); var $unsortedIcon = $('<span>', {"class": "fa fa-files-o"});

1
www/pad/main.js
View File

@ -496,7 +496,6 @@ define([
editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys); editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
} }
var $existingButton = $bar.find('#cke_1_toolbar_collapser').hide();
if (!readOnly) { if (!readOnly) {
// Expand / collapse the toolbar // Expand / collapse the toolbar
var $collapse = Cryptpad.createButton(null, true); var $collapse = Cryptpad.createButton(null, true);