From 56a25e103655e7d098e680df253367d42802d747 Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 29 Jun 2017 15:15:40 +0200 Subject: [PATCH] Small fixes for the new toolbar --- customize.dist/images/avatar.png | Bin 0 -> 24560 bytes customize.dist/src/less/cryptpad.less | 2 +- customize.dist/src/less/dropdown.less | 21 ++- customize.dist/src/less/toolbar.less | 65 +++++--- customize.dist/translations/messages.fr.js | 2 +- customize.dist/translations/messages.js | 2 +- www/common/common-interface.js | 23 +++ www/common/cryptpad-common.js | 12 +- www/common/toolbar2.js | 52 +++++-- www/drive/file.less | 171 +++++++++++++++------ www/drive/inner.js | 2 +- www/drive/main.js | 91 ++++++----- 12 files changed, 300 insertions(+), 143 deletions(-) create mode 100644 customize.dist/images/avatar.png diff --git a/customize.dist/images/avatar.png b/customize.dist/images/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..5605809af6f330cdc7360ad609aea950d07dc55a GIT binary patch literal 24560 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 literal 0 HcmV?d00001 diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 5f75301a2..2094ab624 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -577,7 +577,7 @@ noscript { line-height: 24px; vertical-align: middle; .usage { - height: 24px; + height: 100%; display: inline-block; background: blue; position: absolute; diff --git a/customize.dist/src/less/dropdown.less b/customize.dist/src/less/dropdown.less index 46c01e697..cf35f72e2 100644 --- a/customize.dist/src/less/dropdown.less +++ b/customize.dist/src/less/dropdown.less @@ -32,6 +32,9 @@ z-index: 1000; max-height: 300px; overflow-y: auto; + font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif; + font-size: 16px; + line-height: 1em; &.left { right: 0; @@ -45,7 +48,7 @@ color: black; padding: 5px 16px; text-decoration: none; - display: block; + display: flex; cursor: pointer; -webkit-user-select: none; -moz-user-select: none; @@ -53,6 +56,16 @@ user-select: none; float: none; text-align: left; + font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif; + font-size: 16px; + line-height: 1em; + + + .fa { + width: 20px; + text-align: center; + margin-right: 5px; + } &:hover { background-color: #f1f1f1; @@ -77,7 +90,13 @@ margin: 0; white-space: normal; text-align: left; + color: black; + font-size: 14px; + * { + font-size: 14px; + } h2 { + color: black; font-weight: bold; text-align: center; background-color: #EEEEEE; diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less index 3a01e9a78..fca423e9a 100644 --- a/customize.dist/src/less/toolbar.less +++ b/customize.dist/src/less/toolbar.less @@ -28,16 +28,38 @@ #cke_1_contents { margin-top: -1px; display: flex; + overflow: visible; } +.padColor { color: @toolbar-pad-bg; } +.codeColor { color: @toolbar-code-bg; } +.slideColor { color: @toolbar-slide-bg; } +.pollColor { color: @toolbar-poll-bg; } +.fileColor { color: @toolbar-file-bg; } +.whiteboardColor { color: @toolbar-whiteboard-bg; } +.driveColor { color: @toolbar-drive-bg; } +.defaultColor { color: @toolbar-default-bg; } + .userlist-drawer { font: normal normal normal 14px Arial,Helvetica,Tahoma,Verdana,Sans-Serif; + min-width: 175px; width: 175px; display: block; overflow-y: auto; overflow-x: hidden; padding: 10px; box-sizing: border-box; + .close { + position: absolute; + margin-top: -11px; + margin-left: 149px; + font-size: 15px; + opacity: 0.5; + cursor: pointer; + &:hover { + opacity: 1; + } + } h2 { color: inherit; font-size: 1.2em; @@ -96,24 +118,20 @@ body { } .cryptpad-toolbar-leftside, .cryptpad-toolbar-rightside, .drawer-content { background-color: lighten(@bgcolor, 8%); - button:hover { + button:hover, button.active { background-color: @bgcolor; } } .hoverable:hover { - .editable { + .editable, .pencilIcon { cursor: text; border: 1px solid darken(@bgcolor, 15%); background: darken(@bgcolor, 10%); + transition: all 0.15s; color: @color; } - .pencilIcon { - border: 1px solid darken(@bgcolor, 15%); - background: darken(@bgcolor, 10%); - color: @color; - &:hover { - background: darken(@bgcolor, 5%); - } + .editable { + cursor: text; } } .saveIcon { @@ -129,7 +147,7 @@ body { background: darken(@bgcolor, 10%); color: @color; } - .dropdown-bar-content { + /*.dropdown-bar-content { background: darken(@bgcolor, 5%); border: 1px solid @color; color: @color; @@ -155,7 +173,7 @@ body { background-color: @bgcolor; } } - } + }*/ } } @@ -229,9 +247,6 @@ body { margin: 0; background: transparent; } - .dropdown-bar-content { - line-height: 14px; - } } .separator { @@ -248,6 +263,7 @@ body { } button { + transition: all 0.15s; .unselectable(); &#shareButton, &.buttonSuccess { // Bootstrap 4 colors @@ -297,14 +313,9 @@ body { } } .cryptpad-toolbar-rightside button, .cryptpad-toolbar-leftside button { - //background-color: #fff; - //border-color: #ccc; background: transparent; &:hover { - //color: #292b2c; background-color: rgba(50,50,50,0.3); - //background-color: #e6e6e6; - border-color: #adadad; } } @@ -603,7 +614,7 @@ body { display: inline-flex; align-items: center; line-height: @toolbar-top-height; - margin: 0 20px; + margin: 0 10px; .title, .pencilIcon, .saveIcon { font-size: 25px; vertical-align: middle; @@ -671,6 +682,8 @@ body { } order: 2; text-align: center; + font-size: 32px; + margin-left: 10px; &> button { display: flex; align-items: center; @@ -696,10 +709,6 @@ body { color: inherit; } } - .dropdown-bar-content { - font-size: 12px; - line-height: 14px; - } } .cryptpad-link { display: inline-flex; @@ -728,6 +737,7 @@ body { display: inline-block; order: 5; line-height: @toolbar-top-height; + color: white; &> * { display: inline-block; height: 100%; @@ -739,13 +749,15 @@ body { cursor: pointer; } .cryptpad-user-dropdown { - margin-left: 20px; + z-index: 10000; + //margin-left: 20px; height: 64px; width: 64px; padding: 0px; box-sizing: border-box; text-align: center; background-color: rgba(0,0,0,0.3); + transition: all 0.15s; &:hover { background-color: rgba(0,0,0,0.4); } @@ -838,6 +850,9 @@ body { display: flex; flex-flow: column; z-index:1000; + .fa { + font-size: 17px; + } &> span { box-sizing: border-box; width: 150px; diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index b50b83c01..e373765ac 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -241,7 +241,7 @@ define(function () { out.fm_templateName = "Modèles"; out.fm_searchName = "Recherche"; out.fm_searchPlaceholder = "Rechercher..."; - out.fm_newButton = "Ajouter à ce dossier"; + out.fm_newButton = "Nouveau"; out.fm_newButtonTitle = "Créer un nouveau pad ou un dossier, importer un fichier dans le dossier courant"; out.fm_newFolder = "Nouveau dossier"; out.fm_newFile = "Nouveau pad"; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 149d1ebff..9f7f34be7 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -244,7 +244,7 @@ define(function () { out.fm_templateName = "Templates"; out.fm_searchName = "Search"; out.fm_searchPlaceholder = "Search..."; - out.fm_newButton = "Add to this folder"; + out.fm_newButton = "New"; out.fm_newButtonTitle = "Create a new pad or folder, import a file in the current folder"; out.fm_newFolder = "New folder"; out.fm_newFile = "New pad"; diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 8209149c7..755e75a8e 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -263,5 +263,28 @@ define([ }; }; + var $fileIcon = $('', {"class": "fa fa-file-text-o file icon"}); + var $fileAppIcon = $('', {"class": "fa fa-file-text-o file icon fileColor"}); + var $padIcon = $('', {"class": "fa fa-file-word-o file icon padColor"}); + var $codeIcon = $('', {"class": "fa fa-file-code-o file icon codeColor"}); + var $slideIcon = $('', {"class": "fa fa-file-powerpoint-o file icon slideColor"}); + var $pollIcon = $('', {"class": "fa fa-calendar file icon pollColor"}); + var $whiteboardIcon = $('', {"class": "fa fa-paint-brush whiteboardColor"}); + UI.getIcon = function (type) { + var $icon; + + switch(type) { + case 'pad': $icon = $padIcon.clone(); break; + case 'file': $icon = $fileAppIcon.clone(); break; + case 'code': $icon = $codeIcon.clone(); break; + case 'slide': $icon = $slideIcon.clone(); break; + case 'poll': $icon = $pollIcon.clone(); break; + case 'whiteboard': $icon = $whiteboardIcon.clone(); break; + default: $icon = $fileIcon.clone(); + } + + return $icon; + }; + return UI; }); diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index 2643e3a23..7c0990a84 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -66,6 +66,7 @@ define([ common.errorLoadingScreen = UI.errorLoadingScreen; common.notify = UI.notify; common.unnotify = UI.unnotify; + common.getIcon = UI.getIcon; // import common utilities for export common.find = Util.find; @@ -850,8 +851,9 @@ define([ common.createUsageBar = function (cb) { // getPinnedUsage updates common.account.usage, and other values // so we can just use those and only check for errors + var $container = $('', {'class':'limit-container'}); var todo = function (err) { - var $container = $('', {'class':'limit-container'}); + $container.html(''); if (err) { return void window.setTimeout(function () { common.getPinnedUsage(todo); @@ -867,8 +869,7 @@ define([ var $limit = $('', {'class': 'cryptpad-limit-bar'}).appendTo($container); var quota = usage/limit; - var width = Math.floor(Math.min(quota, 1)*$limit.width()); // the bar is 200px width - var $usage = $('', {'class': 'usage'}).css('width', width+'px'); + var $usage = $('', {'class': 'usage'}).css('width', quota*100+'%'); var makeDonateButton = function () { $('', { @@ -921,9 +922,9 @@ define([ window.setTimeout(function () { common.getPinnedUsage(todo); }, LIMIT_REFRESH_RATE); - cb(err, $container); }; common.getPinnedUsage(todo); + cb(null, $container); }; var prepareFeedback = common.prepareFeedback = function (key) { @@ -1104,8 +1105,7 @@ define([ } button = $('