diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less index 286b8f68d..f69e6505f 100644 --- a/customize.dist/src/less2/include/colortheme-dark.less +++ b/customize.dist/src/less2/include/colortheme-dark.less @@ -132,6 +132,8 @@ @cryptpad_color_lighter_blue: #FFF-#d2e1f2; @cryptpad_color_warn_red: #FFF-#eb675e; @cryptpad_color_dark_red: #9e0000; +@cryptpad_color_light_red: #FFD4D4; +@cryptpad_color_orange: #f49842; @cryptpad_color_black: #FFF-#000; @cryptpad_color_white: #FFF-#FFF; @cryptpad_color_light_green: #c5ffa8; @@ -139,6 +141,11 @@ @cryptpad_color_link: #FFF-#0275D8; +// Premium plans colors +@cryptpad_color_basic: #DDEFFF; +@cryptpad_color_pro: #E4FFDD; +@cryptpad_color_power: #F6DDFF; + // Loading screen @cp_loading-bg: #FFF-#E7E7E7; @cp_loading-fg: @cryptpad_text_col; @@ -332,3 +339,41 @@ // Other @cp_shadow-color: rgba(0,0,0,0.4); + + +// Apps + +// Accounts +@cp_accounts-basic: @cryptpad_color_basic; +@cp_accounts-pro: @cryptpad_color_pro; +@cp_accounts-power: @cryptpad_color_power; +@cp_accounts-active: @cryptpad_color_light_green; +@cp_accounts-inactive: @cryptpad_color_light_red; +@cp_accounts-mysubs-alert: @cryptpad_color_white; +@cp_accounts-mysubs-bg: @cryptpad_color_toolbar_grey; +@cp_accounts-mysubs-fg: @cryptpad_text_col; +@cp_accounts-contact-hover: fade(@cryptpad_color_black, 20%); +@cp_accounts-tab-bg: @cryptpad_color_toolbar_grey; +@cp_accounts-tab-hover: @cryptpad_color_grey; +@cp_accounts-tab-border: @cryptpad_color_neutral_grey; + +// Admin +@cp_admin-isadmin-fg: @colortheme_logo-2; +@cp_admin-isadmin-bg: @cryptpad_color_white; +@cp_admin-premium-fg: @cryptpad_color_warn_red; +@cp_admin-premium-bg: lighten(@cryptpad_color_warn_red, 25%); +@cp_admin-last-fg: @cryptpad_color_warn_red; +@cp_admin-last-bg: lighten(@cryptpad_color_orange, 25%); + +// Code +@cp_preview-bg: @cryptpad_color_white; +@cp_preview-fg: @cryptpad_text_col; + +// Debug +@cp_debug-hover: fade(@cryptpad_color_black, 10%); +@cp_debug-icon-hover: @cryptpad_color_dark_grey; + + + + + diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index 4f38333b8..8c983c151 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -132,6 +132,8 @@ @cryptpad_color_lighter_blue: #d2e1f2; @cryptpad_color_warn_red: #eb675e; @cryptpad_color_dark_red: #9e0000; +@cryptpad_color_light_red: #FFD4D4; +@cryptpad_color_orange: #f49842; @cryptpad_color_black: #000; @cryptpad_color_white: #FFF; @cryptpad_color_light_green: #c5ffa8; @@ -139,6 +141,11 @@ @cryptpad_color_link: #0275D8; +// Premium plans colors +@cryptpad_color_basic: #DDEFFF; +@cryptpad_color_pro: #E4FFDD; +@cryptpad_color_power: #F6DDFF; + // Loading screen @cp_loading-bg: #E7E7E7; @cp_loading-fg: @cryptpad_text_col; @@ -332,3 +339,37 @@ // Other @cp_shadow-color: rgba(0,0,0,0.4); + +// Apps + +// Accounts +@cp_accounts-basic: @cryptpad_color_basic; +@cp_accounts-pro: @cryptpad_color_pro; +@cp_accounts-power: @cryptpad_color_power; +@cp_accounts-active: @cryptpad_color_light_green; +@cp_accounts-inactive: @cryptpad_color_light_red; +@cp_accounts-mysubs-alert: @cryptpad_color_white; +@cp_accounts-mysubs-bg: @cryptpad_color_toolbar_grey; +@cp_accounts-mysubs-fg: @cryptpad_text_col; +@cp_accounts-contact-hover: fade(@cryptpad_color_black, 20%); +@cp_accounts-tab-bg: @cryptpad_color_toolbar_grey; +@cp_accounts-tab-hover: @cryptpad_color_grey; +@cp_accounts-tab-border: @cryptpad_color_neutral_grey; + +// Admin +@cp_admin-isadmin-fg: @colortheme_logo-2; +@cp_admin-isadmin-bg: @cryptpad_color_white; +@cp_admin-premium-fg: @cryptpad_color_warn_red; +@cp_admin-premium-bg: lighten(@cryptpad_color_warn_red, 25%); +@cp_admin-last-fg: @cryptpad_color_warn_red; +@cp_admin-last-bg: lighten(@cryptpad_color_orange, 25%); + +// Code +@cp_preview-bg: @cryptpad_color_white; +@cp_preview-fg: @cryptpad_text_col; + +// Debug +@cp_debug-hover: fade(@cryptpad_color_black, 10%); +@cp_debug-icon-hover: @cryptpad_color_dark_grey; + + diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less index d19e6b4d7..cbe62cd87 100644 --- a/www/admin/app-admin.less +++ b/www/admin/app-admin.less @@ -104,8 +104,8 @@ color: #666; .cp-support-ispremium { padding: 0 5px; - color: @colortheme_cp-red; - background-color: lighten(@colortheme_cp-red, 25%); + color: @cp_admin-premium-fg; + background-color: @cp_admin-premium-bg; } } } @@ -119,18 +119,18 @@ } .cp-support-list-message { &:last-child:not(.cp-support-fromadmin) { - color: @colortheme_cp-red; - background-color: lighten(@colortheme_form-warning, 25%); + color: @cp_admin-last-fg; + background-color: @cp_admin-last-bg; .cp-support-showdata { - background-color: lighten(@colortheme_form-warning, 30%); + background-color: lighten(@cp_admin-last-bg, 5%); } } &:last-child { &.cp-support-frompremium { - background-color: lighten(@colortheme_cp-red, 25%); + background-color: @cp_admin-premium-bg; .cp-support-showdata { - background-color: lighten(@colortheme_cp-red, 30%); + background-color: lighten(@cp_admin-premium-bg, 30%); } } } @@ -160,10 +160,10 @@ } .cp-support-fromadmin { - color: @colortheme_logo-2; - background-color: #FFF; + color: @cp_admin-isadmin-fg; + background-color: @cp_admin-isadmin-bg; .cp-support-message-content { - color: @colortheme_logo-2; + color: @cp_admin-isadmin-fg; } } diff --git a/www/code/app-code.less b/www/code/app-code.less index fbeac6f23..c21a63582 100644 --- a/www/code/app-code.less +++ b/www/code/app-code.less @@ -98,6 +98,8 @@ } #cp-app-code-preview-content { + background-color: @cp_preview-bg; + color: @cp_preview-fg; max-width: 40vw; margin: 1em auto; diff --git a/www/debug/app-debug.less b/www/debug/app-debug.less index 52a19387c..ee7d43152 100644 --- a/www/debug/app-debug.less +++ b/www/debug/app-debug.less @@ -20,6 +20,8 @@ overflow: auto; white-space: pre-wrap; display: none; + color: @cp_preview-fg; + background-color: @cp_preview-bg; } #cp-app-debug-content { margin: 10px 50px; @@ -49,20 +51,20 @@ max-width: 500px; } .cp-debug-ok { - background-color: #eeffee; + background-color: @cryptpad_color_light_green; } .cp-debug-nok { - background-color: #ffeeee; + background-color: @cryptpad_color_light_red; } tr:not(:first-child):hover { - background-color: rgba(0,0,0,0.1); + background-color: @cp_debug-hover; } } .fa-chevron-left, .fa-chevron-right { margin: 5px 20px; cursor: pointer; &:hover { - color: #777; + color: @cp_debug-icon-hover; } } .cp-app-debug-progress {