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

Use new application icons

Browse Source
This commit is contained in:
yflory
2018-11-05 12:02:27 +01:00
parent 4edb1c2e0d
commit 7509ce1cc7
15 changed files with 140 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@
max-width: none;
margin: 8px 0;
}
.fa {
.fa, .cptools {
display: block;
margin: auto;
font-size: 64px;
@@ -134,6 +134,9 @@
.fa {
font-family: FontAwesome;
}
.cptools {
font-family: cptools;
}
ul {
list-style: none;
@@ -172,13 +175,6 @@
}
}
span {
&.fa-folder, &.fa-folder-open {
//color: #FEDE8B;
//text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
}
}
/* TREE */
@@ -247,7 +243,7 @@
margin: 0;
margin-top: 15px;
.cp-app-drive-tree-root {
&> .fa {
.fa, .cptools {
min-width: 30px;
cursor: pointer;
}
@@ -259,9 +255,6 @@
padding-left: 20px;
.leftside-menu-category_main();
margin: 0;
.fa {
width: 25px;
}
}
}
}
@@ -523,7 +516,7 @@
position: absolute;
top: 3px;
right: 3px;
.fa {
.fa, .cptools {
margin:0;
font-size: 18px;
}
@@ -531,7 +524,7 @@
.cp-app-drive-element-thumbnail {
max-width: 100px;
max-height: 100px;
& ~ .fa {
& ~ .fa, & ~ .cptools {
display: inline;
font-size: 17px;
position: absolute;
@@ -555,7 +548,7 @@
&:hover {
opacity: 0.7;
}
.fa {
.fa, .cptools {
cursor: pointer;
font-size: 90px;
margin-top: 5px;
@@ -594,7 +587,7 @@
cursor: default;
color: @drive_table-header-fg;
span {
&:not(.fa) {
&:not(.fa):not(.cptools) {
text-align: left;
}
&.sortasc, &.sortdesc {
@@ -621,8 +614,10 @@
white-space: nowrap;
box-sizing: border-box;
&.cp-app-drive-element-state {
.fa:not(:last-child) {
margin-right: 5px;
.fa, .cptools {
&:not(:last-child) {
margin-right: 5px;
}
}
}
&.cp-app-drive-content-icon, &.cp-app-drive-element-state, &.cp-icon {
@@ -661,7 +656,7 @@
.cp-modal {
display: flex;
flex-flow: column;
li, li .fa {
li, li .fa, li .cptools {
cursor: pointer;
}
&> p {
@@ -699,7 +694,7 @@
display: flex;
align-items: center;
align-content: unset;
.fa {
.fa, .cptools {
font-size: 32px;
min-width: 50px;
}
@@ -748,7 +743,7 @@
display: inline-block;
margin: 0;
padding: 0;
.fa {
.fa, .cptools {
margin: 0;
}
button {
@@ -764,7 +759,7 @@
.drawer {
display: none;
}
.fa, span {
.fa, .cptools, span {
font-size: @colortheme_app-font-size;
}
&:hover {
@@ -794,14 +789,14 @@
}
button {
padding: 0 10px;
.fa {
.fa, .cptools {
margin-right: 5px;
}
.cp-dropdown-button-title {
display: inline-flex;
height: @variables_bar-height;
align-items: center;
span:not(.fa) {
span:not(.fa):not(.cptools) {
line-height: 23px;
}
}
@@ -816,6 +811,9 @@
.fa, &.fa {
font-family: FontAwesome;
}
.cptools, &.cptools {
font-family: cptools;
}
}
/* The container <div> - needed to position the dropdown content */
.cp-dropdown-container {

21
www/drive/inner.js
View File

@@ -71,9 +71,10 @@ define([
var SHARED_FOLDER_NAME = Messages.fm_sharedFolderName;
// Icons
var faFolder = 'fa-folder';
var faFolderOpen = 'fa-folder-open';
var faSharedFolder = 'fa-folder-o';
var faFolder = 'cptools-folder';
var faFolderOpen = 'cptools-folder-open';
var faSharedFolder = 'cptools-shared-folder';
var faSharedFolderOpen = 'cptools-shared-folder-open';
var faShared = 'fa-shhare-alt';
var faReadOnly = 'fa-eye';
var faRename = 'fa-pencil';
@@ -85,15 +86,15 @@ define([
var faRestore = 'fa-repeat';
var faShowParent = 'fa-location-arrow';
var $folderIcon = $('<span>', {
"class": faFolder + " fa cp-app-drive-icon-folder cp-app-drive-content-icon"
"class": faFolder + " cptools cp-app-drive-icon-folder cp-app-drive-content-icon"
});
//var $folderIcon = $('<img>', {src: "/customize/images/icons/folder.svg", "class": "folder icon"});
var $folderEmptyIcon = $folderIcon.clone();
var $folderOpenedIcon = $('<span>', {"class": faFolderOpen + " fa cp-app-drive-icon-folder"});
var $folderOpenedIcon = $('<span>', {"class": faFolderOpen + " cptools cp-app-drive-icon-folder"});
//var $folderOpenedIcon = $('<img>', {src: "/customize/images/icons/folderOpen.svg", "class": "folder icon"});
var $folderOpenedEmptyIcon = $folderOpenedIcon.clone();
var $sharedFolderIcon = $('<span>', {"class": faSharedFolder + " fa cp-app-drive-icon-folder"});
//var $sharedFolderOpenedIcon = $sharedFolderIcon.clone();
var $sharedFolderIcon = $('<span>', {"class": faSharedFolder + " cptools cp-app-drive-icon-folder"});
var $sharedFolderOpenedIcon = $('<span>', {"class": faSharedFolderOpen + " cptools cp-app-drive-icon-folder"});
//var $upIcon = $('<span>', {"class": "fa fa-arrow-circle-up"});
var $unsortedIcon = $('<span>', {"class": "fa fa-files-o"});
var $templateIcon = $('<span>', {"class": "fa fa-cubes"});
@@ -1889,7 +1890,7 @@ define([
options.push({
tag: 'a',
attributes: {'class': 'cp-app-drive-new-upload'},
content: $('<div>').append(getIcon('file')).html() + Messages.uploadButton
content: $('<div>').append(getIcon('fileupload')).html() + Messages.uploadButton
});
options.push({tag: 'hr'});
}
@@ -2169,7 +2170,7 @@ define([
var $element2 = $('<li>', {
'class': 'cp-app-drive-new-upload cp-app-drive-element-row ' +
'cp-app-drive-element-grid'
}).prepend(getIcon('file')).appendTo($container);
}).prepend(getIcon('fileupload')).appendTo($container);
$element2.append($('<span>', {'class': 'cp-app-drive-new-name'})
.text(Messages.uploadButton));
}
@@ -2868,7 +2869,7 @@ define([
// Fix name
key = manager.getSharedFolderData(fId).title;
// Fix icon
$icon = $sharedFolderIcon;
$icon = isCurrentFolder ? $sharedFolderOpenedIcon : $sharedFolderIcon;
} else {
var isEmpty = manager.isFolderEmpty(root[key]);
subfolder = manager.hasSubfolder(root[key]);