web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Overrides to colortheme.less will nolonger block the adding of new keys to the original file

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-12-05 18:32:23 +01:00
parent c702a23c77
commit 1dabea84d9
21 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/src/less/bar.less
View File

@ -1,5 +1,5 @@
/* Bottom Bar */ /* Bottom Bar */
@import (once) "../less2/include/colortheme.less"; @import (once) "../less2/include/colortheme-all.less";
.top-bar, .bottom-bar { .top-bar, .bottom-bar {
position:fixed; position:fixed;

2
customize.dist/src/less/cryptpad.less
View File

@ -2,7 +2,7 @@
@import "./mixins.less"; @import "./mixins.less";
@import "../less2/include/alertify.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/modal.less";
@import "../less2/include/font.less"; @import "../less2/include/font.less";
@import "../less2/loading.less"; @import "../less2/loading.less";

2
customize.dist/src/less/footer.less
View File

@ -1,5 +1,5 @@
@import "./variables.less"; @import "./variables.less";
@import (once) "../less2/include/colortheme.less"; @import (once) "../less2/include/colortheme-all.less";
footer { footer {
background: @category-bg; background: @category-bg;

2
customize.dist/src/less/sidebar-layout.less
View File

@ -1,6 +1,6 @@
@import '/customize/src/less/variables.less'; @import '/customize/src/less/variables.less';
@import '/customize/src/less/mixins.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-bg: @colortheme_sidebar-left-bg;
@leftside-color: @colortheme_sidebar-left-fg; @leftside-color: @colortheme_sidebar-left-fg;

2
customize.dist/src/less/toolbar.less
View File

@ -2,7 +2,7 @@
@import "./mixins.less"; @import "./mixins.less";
@import (once) "../less2/include/dropdown.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/ckeditor-fix.less";
@import (once) "../less2/include/icon-colors.less"; @import (once) "../less2/include/icon-colors.less";

2
customize.dist/src/less/topbar.less
View File

@ -1,5 +1,5 @@
@import "./variables.less"; @import "./variables.less";
@import (once) "../less2/include/colortheme.less"; @import (once) "../less2/include/colortheme-all.less";
#cryptpadTopBar { #cryptpadTopBar {
background: @topbar-back; background: @topbar-back;

2
customize.dist/src/less/variables.less
View File

@ -1,4 +1,4 @@
@import (once) '../less2/include/colortheme.less'; @import (once) '../less2/include/colortheme-all.less';
@import (once) '../less2/include/browser.less'; @import (once) '../less2/include/browser.less';
@base: @colortheme_base; @base: @colortheme_base;

6
customize.dist/src/less2/include/colortheme-all.less Normal file
View File

@ -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";

2
customize.dist/src/less2/include/sidebar-layout.less
View File

@ -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"; @import (once) "/customize/src/less2/include/leftside-menu.less";
@leftside-bg: @colortheme_sidebar-left-bg; @leftside-bg: @colortheme_sidebar-left-bg;

2
customize.dist/src/less2/loading.less
View File

@ -3,7 +3,7 @@ WARNING: THIS FILE DOES NOTHING
It exists only as a proposal of what CSS you should use in loading.js 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. 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"; @import (once) "./include/browser.less";
#cp-loading { #cp-loading {

2
customize.dist/src/less2/pages/page-about.less
View File

@ -1,5 +1,5 @@
@import (once) "../include/infopages.less"; @import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less"; @import (once) "../include/colortheme-all.less";
.infopages_main(); .infopages_main();
.infopages_topbar(); .infopages_topbar();

2
customize.dist/src/less2/pages/page-contact.less
View File

@ -1,5 +1,5 @@
@import (once) "../include/infopages.less"; @import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less"; @import (once) "../include/colortheme-all.less";
.infopages_main(); .infopages_main();
.infopages_topbar(); .infopages_topbar();

2
customize.dist/src/less2/pages/page-index.less
View File

@ -1,7 +1,7 @@
//@import (once) "./variables.less"; //@import (once) "./variables.less";
@import (once) "../include/infopages.less"; @import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less"; @import (once) "../include/colortheme-all.less";
.infopages_main(); .infopages_main();

2
customize.dist/src/less2/pages/page-login.less
View File

@ -1,5 +1,5 @@
@import (once) "../include/infopages.less"; @import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less"; @import (once) "../include/colortheme-all.less";
@import (once) "../include/alertify.less"; @import (once) "../include/alertify.less";
@import (once) "../loading.less"; @import (once) "../loading.less";

2
customize.dist/src/less2/pages/page-privacy.less
View File

@ -1,5 +1,5 @@
@import (once) "../include/infopages.less"; @import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less"; @import (once) "../include/colortheme-all.less";
.infopages_main(); .infopages_main();
.infopages_topbar(); .infopages_topbar();

2
customize.dist/src/less2/pages/page-register.less
View File

@ -1,5 +1,5 @@
@import (once) "../include/infopages.less"; @import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less"; @import (once) "../include/colortheme-all.less";
@import (once) "../include/alertify.less"; @import (once) "../include/alertify.less";
@import (once) "../loading.less"; @import (once) "../loading.less";

2
customize.dist/src/less2/pages/page-terms.less
View File

@ -1,5 +1,5 @@
@import (once) "../include/infopages.less"; @import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less"; @import (once) "../include/colortheme-all.less";
.infopages_main(); .infopages_main();
.infopages_topbar(); .infopages_topbar();

2
customize.dist/src/less2/pages/page-what-is-cryptpad.less
View File

@ -1,5 +1,5 @@
@import (once) "../include/infopages.less"; @import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less"; @import (once) "../include/colortheme-all.less";
.infopages_main(); .infopages_main();
.infopages_topbar(); .infopages_topbar();

2
www/common/file-dialog.less
View File

@ -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'; @import '../customize/src/less2/include/modal.less';
.fileDialog_main () { .fileDialog_main () {

2
www/filepicker/app-filepicker.less
View File

@ -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/modal.less';
@import (once) '../../customize/src/less2/include/icon-colors.less'; @import (once) '../../customize/src/less2/include/icon-colors.less';
@import (once) '../../customize/src/less2/include/fileupload.less'; @import (once) '../../customize/src/less2/include/fileupload.less';

2
www/settings/app-settings.less
View File

@ -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/browser.less";
@import (once) "../../customize/src/less2/include/toolbar.less"; @import (once) "../../customize/src/less2/include/toolbar.less";
@import (once) "../../customize/src/less2/include/markdown.less"; @import (once) "../../customize/src/less2/include/markdown.less";