From 1dabea84d9029c013c3d7d7e80ece92a8d1ab834 Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Tue, 5 Dec 2017 18:32:23 +0100 Subject: [PATCH] Overrides to colortheme.less will nolonger block the adding of new keys to the original file --- customize.dist/src/less/bar.less | 2 +- customize.dist/src/less/cryptpad.less | 2 +- customize.dist/src/less/footer.less | 2 +- customize.dist/src/less/sidebar-layout.less | 2 +- customize.dist/src/less/toolbar.less | 2 +- customize.dist/src/less/topbar.less | 2 +- customize.dist/src/less/variables.less | 2 +- customize.dist/src/less2/include/colortheme-all.less | 6 ++++++ customize.dist/src/less2/include/sidebar-layout.less | 2 +- customize.dist/src/less2/loading.less | 2 +- customize.dist/src/less2/pages/page-about.less | 2 +- customize.dist/src/less2/pages/page-contact.less | 2 +- customize.dist/src/less2/pages/page-index.less | 2 +- customize.dist/src/less2/pages/page-login.less | 2 +- customize.dist/src/less2/pages/page-privacy.less | 2 +- customize.dist/src/less2/pages/page-register.less | 2 +- customize.dist/src/less2/pages/page-terms.less | 2 +- customize.dist/src/less2/pages/page-what-is-cryptpad.less | 2 +- www/common/file-dialog.less | 2 +- www/filepicker/app-filepicker.less | 2 +- www/settings/app-settings.less | 2 +- 21 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 customize.dist/src/less2/include/colortheme-all.less diff --git a/customize.dist/src/less/bar.less b/customize.dist/src/less/bar.less index 91744728b..289cdf265 100644 --- a/customize.dist/src/less/bar.less +++ b/customize.dist/src/less/bar.less @@ -1,5 +1,5 @@ /* Bottom Bar */ -@import (once) "../less2/include/colortheme.less"; +@import (once) "../less2/include/colortheme-all.less"; .top-bar, .bottom-bar { position:fixed; diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 12168ec88..23f7d7899 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -2,7 +2,7 @@ @import "./mixins.less"; @import "../less2/include/alertify.less"; -@import "../less2/include/colortheme.less"; +@import "../less2/include/colortheme-all.less"; @import "../less2/include/modal.less"; @import "../less2/include/font.less"; @import "../less2/loading.less"; diff --git a/customize.dist/src/less/footer.less b/customize.dist/src/less/footer.less index 97b5bda8c..4baa4f04e 100644 --- a/customize.dist/src/less/footer.less +++ b/customize.dist/src/less/footer.less @@ -1,5 +1,5 @@ @import "./variables.less"; -@import (once) "../less2/include/colortheme.less"; +@import (once) "../less2/include/colortheme-all.less"; footer { background: @category-bg; diff --git a/customize.dist/src/less/sidebar-layout.less b/customize.dist/src/less/sidebar-layout.less index 47e4e86f9..27bb67099 100644 --- a/customize.dist/src/less/sidebar-layout.less +++ b/customize.dist/src/less/sidebar-layout.less @@ -1,6 +1,6 @@ @import '/customize/src/less/variables.less'; @import '/customize/src/less/mixins.less'; -@import (once) "/customize/src/less2/include/colortheme.less"; +@import (once) "/customize/src/less2/include/colortheme-all.less"; @leftside-bg: @colortheme_sidebar-left-bg; @leftside-color: @colortheme_sidebar-left-fg; diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less index aadc0b6b0..126c08c8c 100644 --- a/customize.dist/src/less/toolbar.less +++ b/customize.dist/src/less/toolbar.less @@ -2,7 +2,7 @@ @import "./mixins.less"; @import (once) "../less2/include/dropdown.less"; -@import (once) "../less2/include/colortheme.less"; +@import (once) "../less2/include/colortheme-all.less"; @import (once) "../less2/include/ckeditor-fix.less"; @import (once) "../less2/include/icon-colors.less"; diff --git a/customize.dist/src/less/topbar.less b/customize.dist/src/less/topbar.less index 2f7f55edb..154d44b29 100644 --- a/customize.dist/src/less/topbar.less +++ b/customize.dist/src/less/topbar.less @@ -1,5 +1,5 @@ @import "./variables.less"; -@import (once) "../less2/include/colortheme.less"; +@import (once) "../less2/include/colortheme-all.less"; #cryptpadTopBar { background: @topbar-back; diff --git a/customize.dist/src/less/variables.less b/customize.dist/src/less/variables.less index 1d3415d89..74cd0fca7 100644 --- a/customize.dist/src/less/variables.less +++ b/customize.dist/src/less/variables.less @@ -1,4 +1,4 @@ -@import (once) '../less2/include/colortheme.less'; +@import (once) '../less2/include/colortheme-all.less'; @import (once) '../less2/include/browser.less'; @base: @colortheme_base; diff --git a/customize.dist/src/less2/include/colortheme-all.less b/customize.dist/src/less2/include/colortheme-all.less new file mode 100644 index 000000000..0495ff076 --- /dev/null +++ b/customize.dist/src/less2/include/colortheme-all.less @@ -0,0 +1,6 @@ +// Don't override/edit this file directly, you can create +// create a file: customize/src/less2/include/colortheme.less +// override whatever colors you want. When you update, the new colors will be +// added ok because the original file is pulled in first. +@import (once) "/customize.dist/src/less2/include/colortheme.less"; +@import (once) "/customize/src/less2/include/colortheme.less"; \ No newline at end of file diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less index 2d667cee5..89d23d946 100644 --- a/customize.dist/src/less2/include/sidebar-layout.less +++ b/customize.dist/src/less2/include/sidebar-layout.less @@ -1,4 +1,4 @@ -@import (once) "/customize/src/less2/include/colortheme.less"; +@import (once) "/customize/src/less2/include/colortheme-all.less"; @import (once) "/customize/src/less2/include/leftside-menu.less"; @leftside-bg: @colortheme_sidebar-left-bg; diff --git a/customize.dist/src/less2/loading.less b/customize.dist/src/less2/loading.less index 504e1e393..e13a56de6 100644 --- a/customize.dist/src/less2/loading.less +++ b/customize.dist/src/less2/loading.less @@ -3,7 +3,7 @@ WARNING: THIS FILE DOES NOTHING It exists only as a proposal of what CSS you should use in loading.js The CSS inside of loading.js is precompiled in order to save 200ish milliseconds to the loading screen. */ -@import (once) "./include/colortheme.less"; +@import (once) "./include/colortheme-all.less"; @import (once) "./include/browser.less"; #cp-loading { diff --git a/customize.dist/src/less2/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less index d356fecd0..f8decce8f 100644 --- a/customize.dist/src/less2/pages/page-about.less +++ b/customize.dist/src/less2/pages/page-about.less @@ -1,5 +1,5 @@ @import (once) "../include/infopages.less"; -@import (once) "../include/colortheme.less"; +@import (once) "../include/colortheme-all.less"; .infopages_main(); .infopages_topbar(); diff --git a/customize.dist/src/less2/pages/page-contact.less b/customize.dist/src/less2/pages/page-contact.less index a8ce6fa04..19bbd57a2 100644 --- a/customize.dist/src/less2/pages/page-contact.less +++ b/customize.dist/src/less2/pages/page-contact.less @@ -1,5 +1,5 @@ @import (once) "../include/infopages.less"; -@import (once) "../include/colortheme.less"; +@import (once) "../include/colortheme-all.less"; .infopages_main(); .infopages_topbar(); diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 90a765a4a..49e179b75 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -1,7 +1,7 @@ //@import (once) "./variables.less"; @import (once) "../include/infopages.less"; -@import (once) "../include/colortheme.less"; +@import (once) "../include/colortheme-all.less"; .infopages_main(); diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less index 2b8064486..28916f730 100644 --- a/customize.dist/src/less2/pages/page-login.less +++ b/customize.dist/src/less2/pages/page-login.less @@ -1,5 +1,5 @@ @import (once) "../include/infopages.less"; -@import (once) "../include/colortheme.less"; +@import (once) "../include/colortheme-all.less"; @import (once) "../include/alertify.less"; @import (once) "../loading.less"; diff --git a/customize.dist/src/less2/pages/page-privacy.less b/customize.dist/src/less2/pages/page-privacy.less index 59fa4b1fd..a1f8b2955 100644 --- a/customize.dist/src/less2/pages/page-privacy.less +++ b/customize.dist/src/less2/pages/page-privacy.less @@ -1,5 +1,5 @@ @import (once) "../include/infopages.less"; -@import (once) "../include/colortheme.less"; +@import (once) "../include/colortheme-all.less"; .infopages_main(); .infopages_topbar(); diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less index af2e06d51..311e877a4 100644 --- a/customize.dist/src/less2/pages/page-register.less +++ b/customize.dist/src/less2/pages/page-register.less @@ -1,5 +1,5 @@ @import (once) "../include/infopages.less"; -@import (once) "../include/colortheme.less"; +@import (once) "../include/colortheme-all.less"; @import (once) "../include/alertify.less"; @import (once) "../loading.less"; diff --git a/customize.dist/src/less2/pages/page-terms.less b/customize.dist/src/less2/pages/page-terms.less index 59fa4b1fd..a1f8b2955 100644 --- a/customize.dist/src/less2/pages/page-terms.less +++ b/customize.dist/src/less2/pages/page-terms.less @@ -1,5 +1,5 @@ @import (once) "../include/infopages.less"; -@import (once) "../include/colortheme.less"; +@import (once) "../include/colortheme-all.less"; .infopages_main(); .infopages_topbar(); diff --git a/customize.dist/src/less2/pages/page-what-is-cryptpad.less b/customize.dist/src/less2/pages/page-what-is-cryptpad.less index cf127e1ec..de7e552f2 100644 --- a/customize.dist/src/less2/pages/page-what-is-cryptpad.less +++ b/customize.dist/src/less2/pages/page-what-is-cryptpad.less @@ -1,5 +1,5 @@ @import (once) "../include/infopages.less"; -@import (once) "../include/colortheme.less"; +@import (once) "../include/colortheme-all.less"; .infopages_main(); .infopages_topbar(); diff --git a/www/common/file-dialog.less b/www/common/file-dialog.less index d09c61f10..c27b6a377 100644 --- a/www/common/file-dialog.less +++ b/www/common/file-dialog.less @@ -1,4 +1,4 @@ -@import (once) '../customize/src/less2/include/colortheme.less'; +@import (once) '../customize/src/less2/include/colortheme-all.less'; @import '../customize/src/less2/include/modal.less'; .fileDialog_main () { diff --git a/www/filepicker/app-filepicker.less b/www/filepicker/app-filepicker.less index b148e5780..df1fec8fb 100644 --- a/www/filepicker/app-filepicker.less +++ b/www/filepicker/app-filepicker.less @@ -1,4 +1,4 @@ -@import (once) '../../customize/src/less2/include/colortheme.less'; +@import (once) '../../customize/src/less2/include/colortheme-all.less'; @import (once) '../../customize/src/less2/include/modal.less'; @import (once) '../../customize/src/less2/include/icon-colors.less'; @import (once) '../../customize/src/less2/include/fileupload.less'; diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less index 7af0a0ff1..b96384bc0 100644 --- a/www/settings/app-settings.less +++ b/www/settings/app-settings.less @@ -1,4 +1,4 @@ -@import (once) "../../customize/src/less2/include/colortheme.less"; +@import (once) "../../customize/src/less2/include/colortheme-all.less"; @import (once) "../../customize/src/less2/include/browser.less"; @import (once) "../../customize/src/less2/include/toolbar.less"; @import (once) "../../customize/src/less2/include/markdown.less";