From cf01bd8215f778a5ff2af0c38cc61317c3efe648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 9 May 2022 13:53:39 +0100 Subject: [PATCH] Clean up and lint --- customize.dist/pages.js | 16 ---------------- customize.dist/pages/index.js | 3 --- customize.dist/pages/login.js | 2 +- .../src/less2/include/colortheme-dark.less | 2 +- customize.dist/src/less2/include/creation.less | 2 +- customize.dist/src/less2/include/drive.less | 8 ++------ customize.dist/src/less2/include/dropdown.less | 1 - .../src/less2/include/sidebar-layout.less | 2 +- customize.dist/src/less2/include/toolbar.less | 4 ---- customize.dist/src/less2/pages/page-index.less | 4 ++-- www/kanban/app-kanban.less | 4 ++-- www/teams/app-team.less | 4 ++-- 12 files changed, 12 insertions(+), 40 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index d7ba9c6ad..3e1bb1510 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -74,22 +74,6 @@ define([ return select; }; -/* // XXX remove ? - var footerCol = function (title, L, n) { - n = n || 3; - return h('div.col-sm-' + n, [ - h('ul.list-unstyled', [ - h('li.footer-title', { - 'data-localization': title, - }, Msg[title]) - ].concat(L.map(function (l) { - return h('li', [ l ]); - })) - ) - ]); - }; -*/ - var footLink = function (ref, loc, text, icon) { if (!ref) { return; } var attrs = { diff --git a/customize.dist/pages/index.js b/customize.dist/pages/index.js index c3713655c..9f4919d63 100644 --- a/customize.dist/pages/index.js +++ b/customize.dist/pages/index.js @@ -112,7 +112,6 @@ define([ Msg.terms = Msg.footer_tos; //"Terms of Service"; // XXX Msg.home_location = "Encrypted data is hosted in {0}"; // XXX - // XXX DB: this may be wrong, pasted over form pages.js var imprintLink = fastLink('imprint'); var privacyLink = fastLink('privacy'); var termsLink = fastLink('terms'); @@ -148,11 +147,9 @@ define([ Msg.home_morestorage = 'For more storage space:'; // XXX var subButton = function () { - // XXX display donation button even if instance doesn't accept subscriptions if (Pages.areSubscriptionsAllowed()) { var sub = h('div.cp-sub-prompt', [ h('span', Msg.home_morestorage), - // XXX how to link these properly to accounts? h('a', {href:"/accounts/"}, h('button', [ h('i.fa.fa-ticket'), Msg.features_f_subscribe diff --git a/customize.dist/pages/login.js b/customize.dist/pages/login.js index b28c61e13..996936df4 100644 --- a/customize.dist/pages/login.js +++ b/customize.dist/pages/login.js @@ -5,7 +5,7 @@ define([ '/customize/pages.js', '/api/config', ], function (h, UI, Msg, Pages, Config) { - Msg.login_instance = "Connect to your account on {0}"; // XXX insert instance name + Msg.login_instance = "Connect to your account on {0}"; // XXX DB highlight instance name? return function () { document.title = Msg.login_login; return [h('div#cp-main', [ diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less index f1ad36526..777232105 100644 --- a/customize.dist/src/less2/include/colortheme-dark.less +++ b/customize.dist/src/less2/include/colortheme-dark.less @@ -175,7 +175,7 @@ @cp_sidebar-right-bg: @cryptpad_color_grey_900; @cp_sidebar-right-fg: @cryptpad_text_col; @cp_sidebar-left-active: @cryptpad_color_grey_400; -@cp_sidebar-left-active-fg: @cryptpad_color_grey_900; // XXX create text_col_inv ? +@cp_sidebar-left-active-fg: @cryptpad_color_grey_900; @cp_sidebar-hint: fade(@cryptpad_text_col, 80%); // Drive diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less index f0189ff0e..e64bd74a3 100644 --- a/customize.dist/src/less2/include/creation.less +++ b/customize.dist/src/less2/include/creation.less @@ -329,7 +329,7 @@ max-height: 159px; align-items: center; .cp-creation-template-element { - box-shadow: 0px 0px 5px 1px #00000030; // XXX + box-shadow: 0px 0px 5px 1px #00000030; // XXX DB: make shadow var width: 300px; max-width: calc(100% - 10px); padding: 5px; diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index 705bcce47..2dd9bd46d 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -300,7 +300,6 @@ display: none; } input { - //width: ~"calc(100% - 30px)"; flex: 1; min-width: 0; padding: 0 10px; @@ -310,11 +309,8 @@ & > span.cp-app-drive-element-row { overflow: hidden; text-overflow: ellipsis; - //min-width: ~"calc(100% + 5px)"; .leftside-menu-category_main(); - //width: ~"calc(100% + 5px)"; // XXX remove margin: 0; - //margin-bottom: -6px; display: flex; align-items: center; cursor: pointer; @@ -344,7 +340,7 @@ margin-top: 10px; background-color: @cp_sidebar-left-item-bg; border-radius: @variables_radius; - box-shadow: 0px 0px 5px 1px #00000030; // XXX + box-shadow: 0px 0px 5px 1px #00000030; // XXX DB: make shadow var .cp-app-drive-tree-root { .fa-trash-o { padding-left: 2px; @@ -385,7 +381,7 @@ } } .cp-app-drive-tree-docs { - box-shadow: 0px 0px 5px 1px #00000030; // XXX + box-shadow: 0px 0px 5px 1px #00000030; // XXX DB: make shadow var padding: 2px; .cp-app-drive-element-row { diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index 0526900ec..5f55cb3e7 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -163,7 +163,6 @@ height: 1px; background: @cp_dropdown-bg-active; border: 0 !important; - //border-top: 1px solid rgba(0,0,0,.1) !important; // XXX & + hr { display: none; } diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less index 39f142742..ff14f3dff 100644 --- a/customize.dist/src/less2/include/sidebar-layout.less +++ b/customize.dist/src/less2/include/sidebar-layout.less @@ -31,7 +31,7 @@ display: flex; align-items: center; .leftside-menu-category_main(); - box-shadow: 0px 0px 5px 1px #00000030; // XXX + box-shadow: 0px 0px 5px 1px #00000030; // XXX DB: make shadow var } } &.cp-leftside-narrow { diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less index dc5c52116..e963dfbcd 100644 --- a/customize.dist/src/less2/include/toolbar.less +++ b/customize.dist/src/less2/include/toolbar.less @@ -15,10 +15,7 @@ @bg-color: @colortheme_apps[default], // color of the toolbar background ) { @toolbar-bg-color: @bg-color; - // XXX Todo: clean up unused variables // XXX: check contrasts of app colors used as btn background - // @desat-color: desaturate(@bg-color, 20%); - // @toolbar-bg-color-active: contrast(@cp_toolbar-fg, lighten(@bg-color, 20%), darken(@desat-color, 10%)); @toolbar-bg-color-light: lighten(@bg-color, 30%); @toolbar-bg-color-fade: fade(@toolbar-bg-color-light, 80%); }; @@ -32,7 +29,6 @@ --toolbar-bg-color: @toolbar-bg-color; --toolbar-bg-color-fade: @toolbar-bg-color-fade; --toolbar-bg-color-light: @toolbar-bg-color-light; - // --toolbar-bg-color-active: @toolbar-bg-color-active; .help_main(); .notifications_main(); diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 8ab544127..692ba3e8a 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -48,7 +48,7 @@ align-self: center; align-items: center; justify-content: flex-end; - @media screen and (max-width: 990px){ + @media screen and (max-width: 990px) { justify-content: center; } } @@ -93,7 +93,7 @@ text-decoration: none; } - .cp-apps{ + .cp-apps { max-width: 575px; @media screen and (max-width: 990px) { align-self: baseline; diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 2b0f41e87..a1f3553b7 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -36,7 +36,7 @@ display: flex; flex-flow: column; border-radius: @variables_radius; - box-shadow: 0px 0px 5px 1px #00000030; // XXX DB + box-shadow: 0px 0px 5px 1px #00000030; // XXX DB: make shadow var } color: @cp_kanban-fg; button { @@ -186,7 +186,7 @@ border-radius: @variables_radius; flex-wrap: wrap; background: @cp_kanban-item-bg; - box-shadow: 0px 0px 5px 1px #00000030; // XXX DB make this a variable? + box-shadow: 0px 0px 5px 1px #00000030; // XXX DB: make shadow var .tools_unselectable(); touch-action: none; cursor: move; diff --git a/www/teams/app-team.less b/www/teams/app-team.less index 615a18284..a8f6dc9ec 100644 --- a/www/teams/app-team.less +++ b/www/teams/app-team.less @@ -216,9 +216,9 @@ height: 50px; display: inline-block; border-radius: @variables_radius; - background-color: red; // XXX hard coded colors + background-color: @cryptpad_color_red; &.online { - background-color: green; + background-color: @cryptpad_color_green; } } .cp-team-member-name {