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

Merge branch 'theming-improvement' into staging

Browse Source
This commit is contained in:
Evilham 2017-10-26 20:44:56 +02:00
commit 735f0a7e30
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
customize.dist/src/less2/include/colortheme.less
View File

@ -41,6 +41,7 @@
@colortheme_pad-bg: #1c4fa0; @colortheme_pad-bg: #1c4fa0;
@colortheme_pad-color: #fff; @colortheme_pad-color: #fff;
@colortheme_pad-toolbar-bg: #c1e7ff;
@colortheme_slide-bg: #e57614; @colortheme_slide-bg: #e57614;
@colortheme_slide-color: #fff; @colortheme_slide-color: #fff;
@ -50,6 +51,9 @@
@colortheme_poll-bg: #006304; @colortheme_poll-bg: #006304;
@colortheme_poll-color: #fff; @colortheme_poll-color: #fff;
@colortheme_poll-help-bg: #bbffbb;
@colortheme_poll-th-bg: #005bef;
@colortheme_poll-th-fg: #fff;
@colortheme_whiteboard-bg: #800080; @colortheme_whiteboard-bg: #800080;
@colortheme_whiteboard-color: #fff; @colortheme_whiteboard-color: #fff;
@ -60,7 +64,7 @@
@colortheme_file-bg: #cd2532; @colortheme_file-bg: #cd2532;
@colortheme_file-color: #fff; @colortheme_file-color: #fff;
@colortheme_friends-bg: #607B8D; @colortheme_friends-bg: #607b8d;
@colortheme_friends-color: #fff; @colortheme_friends-color: #fff;
@colortheme_default-bg: #ddd; @colortheme_default-bg: #ddd;

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

@ -16,7 +16,7 @@
#cke_1_toolbox { #cke_1_toolbox {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
background-color: #c1e7ff; background-color: @colortheme_pad-toolbar-bg;
} }
#cke_1_toolbox .cke_toolbar { #cke_1_toolbox .cke_toolbar {
height: 28px; height: 28px;

6
www/poll/app-poll.less
View File

@ -14,15 +14,15 @@
@poll-fore: #555; @poll-fore: #555;
@poll-th-bg: #005bef; @poll-th-bg: @colortheme_poll-th-bg;
@poll-th-fg: #fff; @poll-th-fg: @colortheme_poll-th-fg;
@poll-th-user-bg: darken(@poll-th-bg, 10%); @poll-th-user-bg: darken(@poll-th-bg, 10%);
@poll-editing: lighten(@poll-th-bg, 10%); @poll-editing: lighten(@poll-th-bg, 10%);
@poll-winner: darken(@poll-th-bg, 15%); @poll-winner: darken(@poll-th-bg, 15%);
@poll-td-bg: @poll-th-bg; @poll-td-bg: @poll-th-bg;
@poll-td-fg: @poll-th-fg; @poll-td-fg: @poll-th-fg;
@poll-help-bg: #bbffbb; // lightgreen @poll-help-bg: @colortheme_poll-help-bg;
@poll-uncommitted-cell: #eee; @poll-uncommitted-cell: #eee;
@poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%); @poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%);