From 3f2f769d3f19aac87106189971b1574c007c7679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Wed, 10 Feb 2021 10:05:48 +0000 Subject: [PATCH 1/4] Darken Teams sidebar --- customize.dist/src/less2/include/colortheme-dark.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less index 23a485479..eb578ad68 100644 --- a/customize.dist/src/less2/include/colortheme-dark.less +++ b/customize.dist/src/less2/include/colortheme-dark.less @@ -415,7 +415,7 @@ // Teams @cp_teams-card-bg: @cryptpad_color_grey_800; -@cp_teams-leftside-bg: darken(@cryptpad_color_grey_800, 5%); +@cp_teams-leftside-bg: darken(@cryptpad_color_grey_800, 10%); @cp_teams-invite-bg: fade(@cryptpad_color_brand, 50%); @cp_teams-invite-fg: @cryptpad_text_col; @cp_teams-roster-odd: fade(@cryptpad_text_col, 15%); From 4c204d997d2a8bc8661ab15a9be47d9983868da8 Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 10 Feb 2021 15:46:02 +0530 Subject: [PATCH 2/4] update version string to 4.1.0 --- customize.dist/pages.js | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 838378e9a..436c3be93 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -62,7 +62,7 @@ define([ var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ? '/imprint.html' : AppConfig.imprint); - Pages.versionString = "v4.0.0"; + Pages.versionString = "v4.1.0"; // used for the about menu Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined; diff --git a/package-lock.json b/package-lock.json index 08335a04c..eb0d82927 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cryptpad", - "version": "4.0.0", + "version": "4.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b93299935..4f150fc38 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "4.0.0", + "version": "4.1.0", "license": "AGPL-3.0+", "repository": { "type": "git", From 6ab1c63a18a177ba924f20c9ec104d9a5126789f Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 10 Feb 2021 15:46:41 +0530 Subject: [PATCH 3/4] change non-blocking XXXs to FIXME or TODO --- customize.dist/src/less2/include/dropdown.less | 2 +- customize.dist/src/less2/pages/page-404.less | 2 +- www/common/LessLoader.js | 4 ++-- www/settings/inner.js | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index 277fab81d..f67a51dc6 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -12,7 +12,7 @@ color: @cp_autocomplete-fg; } ul.ui-menu { - border: 1px solid @cp_autocomplete-border; // XXX doesn't work + border: 1px solid @cp_autocomplete-border; // FIXME doesn't work .ui-state-active { background-color: @cp_autocomplete-hover; color: @cp_autocomplete-fg; diff --git a/customize.dist/src/less2/pages/page-404.less b/customize.dist/src/less2/pages/page-404.less index f8f55e29c..575efa19c 100644 --- a/customize.dist/src/less2/pages/page-404.less +++ b/customize.dist/src/less2/pages/page-404.less @@ -5,7 +5,7 @@ html, body { .font_main(); margin: 0px; padding: 0px; - background-color: @cp_static-bg; // XXX doesn't get applied + background-color: @cp_static-bg; // FIXME doesn't get applied color: @cryptpad_text_col; font-family: "IBM Plex Mono"; #cp-main { diff --git a/www/common/LessLoader.js b/www/common/LessLoader.js index 60d21fdad..df46f344c 100644 --- a/www/common/LessLoader.js +++ b/www/common/LessLoader.js @@ -95,7 +95,7 @@ define([ var COLORTHEME = '/customize/src/less2/include/colortheme.less'; var COLORTHEME_DARK = '/customize/src/less2/include/colortheme-dark.less'; - //COLORTHEME_DARK = '/customize/src/less2/include/colortheme.less'; // XXX + //COLORTHEME_DARK = '/customize/src/less2/include/colortheme.less'; // TODO var getColortheme = function () { return window.CryptPad_theme; }; @@ -139,7 +139,7 @@ define([ if (col) { //console.warn(text, lastModified); if (getColortheme() === "custom") { - // XXX COLOR: append custom theme here + // TODO COLOR: append custom theme here var custom = [ '@cryptpad_text_col: #FF0000;' ].join('\n'); diff --git a/www/settings/inner.js b/www/settings/inner.js index a87dbb249..80c77e8b0 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -450,7 +450,9 @@ define([ } if (val === 'default') { val = ''; } - window.location.hash = ''; // XXX This is a hack to fix Firefox trying to be smart + // browsers try to load iframes from cache if they have the same id as was previously seen + // this seems to help? + window.location.hash = ''; sframeChan.query('Q_COLORTHEME_CHANGE', { theme: val, flush: flush From 5fe111d22134dc9d21493c46a5f4168b06e957f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Wed, 10 Feb 2021 10:30:06 +0000 Subject: [PATCH 4/4] Fix hover color in sidebar --- customize.dist/src/less2/include/leftside-menu.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/src/less2/include/leftside-menu.less b/customize.dist/src/less2/include/leftside-menu.less index 807055184..5a69f528f 100644 --- a/customize.dist/src/less2/include/leftside-menu.less +++ b/customize.dist/src/less2/include/leftside-menu.less @@ -15,7 +15,7 @@ min-width: 25px; } &:hover { - background: rgba(0,0,0,0.05); + background: fade(@cryptpad_text_col, 10%); } &.cp-leftside-active { background: @cp_sidebar-left-active;