From 7509ce1cc7f6b448810d97dd574d77853c651301 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 5 Nov 2018 12:02:27 +0100 Subject: [PATCH] Use new application icons --- .../fonts/cptools/fonts/cptools.svg | 18 ++++++- .../fonts/cptools/fonts/cptools.ttf | Bin 1772 -> 6108 bytes .../fonts/cptools/fonts/cptools.woff | Bin 1848 -> 6184 bytes customize.dist/fonts/cptools/style.css | 49 ++++++++++++++++-- customize.dist/pages/index.js | 9 ++-- .../src/less2/include/dropdown.less | 4 +- customize.dist/src/less2/include/icons.less | 2 +- .../src/less2/include/leftside-menu.less | 2 +- .../src/less2/pages/page-index.less | 32 ++++++------ customize.dist/template.js | 3 +- www/common/application_config_internal.js | 19 +++---- www/common/common-interface.js | 5 +- www/drive/app-drive.less | 46 ++++++++-------- www/drive/inner.js | 21 ++++---- www/filepicker/app-filepicker.less | 4 +- 15 files changed, 140 insertions(+), 74 deletions(-) diff --git a/customize.dist/fonts/cptools/fonts/cptools.svg b/customize.dist/fonts/cptools/fonts/cptools.svg index 2ea458f12..bfa30f3ad 100644 --- a/customize.dist/fonts/cptools/fonts/cptools.svg +++ b/customize.dist/fonts/cptools/fonts/cptools.svg @@ -7,6 +7,20 @@ - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/customize.dist/fonts/cptools/fonts/cptools.ttf b/customize.dist/fonts/cptools/fonts/cptools.ttf index 179ba4d98d4afb8e71a47182735302e35bfe1d8d..a4483404e909b7d74fb0b04d7adee5820aea8fba 100644 GIT binary patch literal 6108 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 delta 992 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 literal 1848 zcmah}QA}H96h8m|-&<%m3WXM=h1x>tpiJZfw}k}QmP|5Y7Q$4b7?locyQQ=ZEpbF& zd~h*7C^3tf@y!??HTouMf{BTVFAGY4j31PRXPz7*63t*&SXQvd zP5~(;#5UW(0dZGfK>&k2V;zT zU^%LXG@8WIgHB0Yf+Dv?y;`q>BVe+ysPA`a&KuSMj39xiRx69mNut!0Rr-GYM|0?2 zeOKi%>kc|WC&?g_rf7!F&{H%|=V_6iqh*we_PGLv&)+$2M8}e*;hTu}clcfXMzk-^ zUXuCFfT2fyQ6KK8PecPzvq62p4_`Wut5`J_P9(ze7F$iqYD_96(@7T55la zqsI(k+6#j>H$a_9x9I2#Iw9*2fQLwkGZ zCimky`k|2<-&O~{xnAmXdXq#y^7Jn45Owg}c~PddQfsM}u{d6-`H-MEr!IKiEp2S2P(&;}rp;i-#tKF_BCevmzCk6{p0k7#|&*66iYbL#iJ+`i*{0 z9I!2K)_B0Oyk#cWF*qtGU$4F;RIMr!VzKu5qqKIDY9+EspGh4_It#DX%0LQ(Nv34QK@M%ssOc!VtM}HptcXa z91Ko(ch3ZaqBj^!HQZ-z+<0I9&Lt1O=pAei%nZj;?lmdZ0++3}=xv^$+wXbNjC=fU zsY!9XT^E{W4#dq|L}{Ah!cwyfYZ8U+Gl_Gtcy-8lrFHr*ItC81_vX#J_n*%0^M4B` z#}d3_oo##)Eb4m0iL)4T*(0{Yuc^EhXA>UsQ;Hb{%Hq$C`j+{ze96_@nXcr5;*H%1w7+m4fqWQ z>(ogR2fM&uaIl9a=#$k_rC7|DX_ZP;p(3t4m6tLbG^U%OHE 2) { s += '.cp-more.cp-hidden'; } + var icon = AppConfig.applicationsIcon[x[3]]; + var font = icon.indexOf('cptools') === 0 ? 'cptools' : 'fa'; return h('a', [ { href: x[1] }, h(s, [ - h('i.fa.' + AppConfig.applicationsIcon[x[3]]), + h('i.' + font + '.' + icon), h('div.pad-button-text', [ h('h4', x[2]) ]) ]) ]); diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index ac393fe3a..e937142e3 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -64,7 +64,7 @@ &:not(.fa) { font: @dropdown_font; } - &.fa { + &.fa, &.cptools { font-size: 18px; &::before { width: 40px; @@ -76,7 +76,7 @@ } } - .fa { + .fa, .cptools { width: 20px; text-align: center; margin-right: 5px !important; diff --git a/customize.dist/src/less2/include/icons.less b/customize.dist/src/less2/include/icons.less index c2ddfef32..ebadf5185 100644 --- a/customize.dist/src/less2/include/icons.less +++ b/customize.dist/src/less2/include/icons.less @@ -28,7 +28,7 @@ background-color: rgba(0,0,0,0.2); color: #666; } - .fa { + .fa, .cptools { display: block; font-size: 64px; margin: 18px 0; diff --git a/customize.dist/src/less2/include/leftside-menu.less b/customize.dist/src/less2/include/leftside-menu.less index baca3ac4d..1c0b828dd 100644 --- a/customize.dist/src/less2/include/leftside-menu.less +++ b/customize.dist/src/less2/include/leftside-menu.less @@ -11,7 +11,7 @@ cursor: pointer; height: @variables_bar-height; line-height: @variables_bar-height - 10px; - .fa { + .fa, .cptools { width: 25px; } &:hover { diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 9c900bcef..ad92531c0 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -149,21 +149,23 @@ .bs-callout:hover.cp-callout-more { transform: none !important; } - .bs-callout .fa { - display: flex; - align-items: center; - font-size: 2em; - padding-left: 0.57em; - width: 2em; - transition: width 0.1s; - color: #fff; + .bs-callout { + .fa, .cptools { + display: flex; + align-items: center; + font-size: 2.5em; + justify-content: center; + width: 1.3em; + transition: width 0.1s; + color: #fff; + } } - .cp-callout-pad .fa { background-color: @colortheme_pad-bg; } - .cp-callout-code .fa { background-color: @colortheme_code-bg; } - .cp-callout-slide .fa { background-color: @colortheme_slide-bg; } - .cp-callout-poll .fa { background-color: @colortheme_poll-bg; } - .cp-callout-kanban .fa { background-color: @colortheme_kanban-bg; } - .cp-callout-whiteboard .fa { background-color: @colortheme_whiteboard-bg; } + .cp-callout-pad .cptools { background-color: @colortheme_pad-bg; } + .cp-callout-code .cptools { background-color: @colortheme_code-bg; } + .cp-callout-slide .cptools { background-color: @colortheme_slide-bg; } + .cp-callout-poll .cptools { background-color: @colortheme_poll-bg; } + .cp-callout-kanban .cptools { background-color: @colortheme_kanban-bg; } + .cp-callout-whiteboard .cptools { background-color: @colortheme_whiteboard-bg; } .cp-callout-recent .fa { background-color: @colortheme_drive-bg; } .cp-hidden { display: none !important; } .cp-callout-more { @@ -179,7 +181,7 @@ div { .infopages_link(); color: #fff; - .fa { + .fa, .cptools { font-size: inherit; padding: 0; width: 1em; diff --git a/customize.dist/template.js b/customize.dist/template.js index b7bb57513..e53772041 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -38,7 +38,8 @@ $(function () { }).nThen(function () { require([ 'less!/customize/src/less2/pages/page-' + pageName + '.less', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css' + 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/customize/fonts/cptools/style.css' ], function () { var $main = $(infoPage()); diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js index afd4fc540..f9d73debc 100644 --- a/www/common/application_config_internal.js +++ b/www/common/application_config_internal.js @@ -73,15 +73,16 @@ define(function() { // Customize the icon used for each application. // You can update the colors by making a copy of /customize.dist/src/less2/include/colortheme.less config.applicationsIcon = { - file: 'fa-file-text-o', - pad: 'fa-file-word-o', - code: 'fa-file-code-o', - slide: 'fa-file-powerpoint-o', - poll: 'fa-calendar', - whiteboard: 'fa-paint-brush', - todo: 'fa-tasks', - contacts: 'fa-users', - kanban: 'fa-columns', + file: 'cptools-file', + fileupload: 'cptools-file-upload', + pad: 'cptools-pad', + code: 'cptools-code', + slide: 'cptools-slide', + poll: 'cptools-poll', + whiteboard: 'cptools-whiteboard', + todo: 'cptools-todo', + contacts: 'cptools-contacts', + kanban: 'cptools-kanban', drive: 'fa-hdd-o', }; diff --git a/www/common/common-interface.js b/www/common/common-interface.js index acee76dac..56e2d8d3a 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -765,8 +765,11 @@ define([ var $icon = $defaultIcon.clone(); if (AppConfig.applicationsIcon && AppConfig.applicationsIcon[type]) { + var icon = AppConfig.applicationsIcon[type]; + var font = icon.indexOf('cptools') === 0 ? 'cptools' : 'fa'; + if (type === 'fileupload') { type = 'file'; } var appClass = ' cp-icon cp-icon-color-'+type; - $icon = $('', {'class': 'fa ' + AppConfig.applicationsIcon[type] + appClass}); + $icon = $('', {'class': font + ' ' + icon + appClass}); } return $icon; diff --git a/www/drive/app-drive.less b/www/drive/app-drive.less index a2841adfa..d67c7d171 100644 --- a/www/drive/app-drive.less +++ b/www/drive/app-drive.less @@ -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
- needed to position the dropdown content */ .cp-dropdown-container { diff --git a/www/drive/inner.js b/www/drive/inner.js index 71bd21d2f..9fe6a15a1 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -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 = $('', { - "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 = $('', {src: "/customize/images/icons/folder.svg", "class": "folder icon"}); var $folderEmptyIcon = $folderIcon.clone(); - var $folderOpenedIcon = $('', {"class": faFolderOpen + " fa cp-app-drive-icon-folder"}); + var $folderOpenedIcon = $('', {"class": faFolderOpen + " cptools cp-app-drive-icon-folder"}); //var $folderOpenedIcon = $('', {src: "/customize/images/icons/folderOpen.svg", "class": "folder icon"}); var $folderOpenedEmptyIcon = $folderOpenedIcon.clone(); - var $sharedFolderIcon = $('', {"class": faSharedFolder + " fa cp-app-drive-icon-folder"}); - //var $sharedFolderOpenedIcon = $sharedFolderIcon.clone(); + var $sharedFolderIcon = $('', {"class": faSharedFolder + " cptools cp-app-drive-icon-folder"}); + var $sharedFolderOpenedIcon = $('', {"class": faSharedFolderOpen + " cptools cp-app-drive-icon-folder"}); //var $upIcon = $('', {"class": "fa fa-arrow-circle-up"}); var $unsortedIcon = $('', {"class": "fa fa-files-o"}); var $templateIcon = $('', {"class": "fa fa-cubes"}); @@ -1889,7 +1890,7 @@ define([ options.push({ tag: 'a', attributes: {'class': 'cp-app-drive-new-upload'}, - content: $('
').append(getIcon('file')).html() + Messages.uploadButton + content: $('
').append(getIcon('fileupload')).html() + Messages.uploadButton }); options.push({tag: 'hr'}); } @@ -2169,7 +2170,7 @@ define([ var $element2 = $('
  • ', { '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($('', {'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]); diff --git a/www/filepicker/app-filepicker.less b/www/filepicker/app-filepicker.less index 03780c796..d31b4ddb1 100644 --- a/www/filepicker/app-filepicker.less +++ b/www/filepicker/app-filepicker.less @@ -71,7 +71,7 @@ margin-top: 5px; max-width: 100%; } - .fa { + .fa, .cptools { cursor: pointer; width: 100px; height: 100px; @@ -82,4 +82,4 @@ } } } -} \ No newline at end of file +}