diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less index 8410cc7ca..2ee3b21e4 100644 --- a/customize.dist/src/less2/include/alertify.less +++ b/customize.dist/src/less2/include/alertify.less @@ -170,7 +170,7 @@ } } a { - color: @colortheme_logo-2; + color: @cryptpad_color_brand; text-decoration: underline; } } @@ -201,7 +201,7 @@ background-color: @cp_alertify-hover; } &.disabled { - color: @colortheme_alertify-cancel-border; + color: @cp_alertify-disable-border; cursor: not-allowed; } &:not(.alertify-tabs-active) { diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less index a92e0ff80..598197d9d 100644 --- a/customize.dist/src/less2/include/colortheme-dark.less +++ b/customize.dist/src/less2/include/colortheme-dark.less @@ -3,68 +3,6 @@ @colortheme_app-font-size-small: 13px; @colortheme_app-font: @colortheme_app-font-size @colortheme_font; -@colortheme_logo-1: #326599; -@colortheme_logo-2: #0087FF; -@colortheme_logo_2_light: lighten(@colortheme_logo-2, 40%); -@colortheme_loading_bg: #E7E7E7; - -@colortheme_link-color: #0275D8; -@colortheme_link-color-visited: lighten(@colortheme_link-color, 10%); -@colortheme_info-background: #eeeeee; - -@colortheme_base: #fff; -@colortheme_light-base: lighten(@colortheme_base, 20%); - -@colortheme_cp-red: #FA5858; // remove red -@colortheme_cp-green: #46E981; - -@colortheme_old-fore: #fafafa; - -@colortheme_form-border: #bbbbbb; -@colortheme_form-bg: @colortheme_logo-2; -@colortheme_form-color: #ffffff; -@colortheme_form-bg-alt: #ffffff; -@colortheme_form-color-alt: @colortheme_logo-2; -@colortheme_form-warning: #f49842; -@colortheme_form-warning-hov: darken(@colortheme_form-warning, 5%); - -@colortheme_context-menu-icon-color: #7b7b7b; - -@colortheme_modal-bg: @colortheme_form-bg-alt; // TODO Modals bg -@colortheme_modal-fg: @colortheme_form-color-alt; -@colortheme_modal-link: @colortheme_link-color; -@colortheme_modal-link-visited: lighten(@colortheme_modal-link, 10%); -@colortheme_modal-dim: fade(@cryptpad_text_col, 50%); // TODO transparent background behind modals -@colortheme_modal-input: @colortheme_form-bg; -@colortheme_modal-input-fg: @colortheme_form-color; - -@colortheme_loading-bg: @colortheme_logo-1; -@colortheme_loading-bg-alt: @colortheme_logo-2; -@colortheme_loading-color: @colortheme_old-fore; - - -// TODO modals buttons -@colortheme_alertify-red: #E55236; -@colortheme_alertify-red-color: #FFF; -@colortheme_alertify-red-border: transparent; -@colortheme_alertify-primary: @colortheme_form-bg; -@colortheme_alertify-primary-text: @colortheme_form-color; -@colortheme_alertify-primary-border: transparent; -@colortheme_alertify-disabled: #6c757d; -@colortheme_alertify-disabled-text: #ffffff; -@colortheme_alertify-disabled-border: #6c757d; -@colortheme_alertify-cancel: @colortheme_modal-bg; -@colortheme_alertify-cancel-border: #949494; - -@colortheme_notification-warn: rgba(205, 37, 50, 0.8); - -// Apps, these colors are used for customizing the toolbar for the apps. -@colortheme_toolbar-warn: @colortheme_alertify-red; -@colortheme_pad-toolbar-bg: #eeeeee; -@colortheme_help-bg: #ddd; -@colortheme_userlist-bg: #eee; -@colortheme_pad-chat-bg: #AAA; - @colortheme_apps: { default: #0087FF; drive: #0087FF; // Used as icon color in index.js (index.html) @@ -86,38 +24,12 @@ contacts: #607B8D; } -@colortheme_poll-color: #fff; -@colortheme_poll-help-bg: #bbffbb; -@colortheme_poll-th-bg: #005bef; -@colortheme_poll-th-fg: #fff; - -// Sidebar layout (profile / settings) -@colortheme_sidebar-active: #fff; -@colortheme_sidebar-left-bg: #eee; -@colortheme_sidebar-left-fg: #000; -@colortheme_sidebar-left-branch: #888; -@colortheme_sidebar-right-bg: #fff; -@colortheme_sidebar-right-fg: #000; -@colortheme_sidebar-description: #777; -@colortheme_sidebar-button-bg: #3066e5; -@colortheme_sidebar-button-red-bg: #e54e4e; -@colortheme_sidebar-button-alt-bg: #fff; - -@cryptpad_color_blue: #4591C4; -@cryptpad_header_col: #1E1F1F; -@cryptpad_text_col: #FFF-#3F4141; - -@colortheme_checkmark-back0: @colortheme_form-bg-alt; -@colortheme_checkmark-back0-active: @colortheme_form-border; -@colortheme_checkmark-back1: @colortheme_form-bg; -@colortheme_checkmark-col1: @colortheme_form-color; -@colortheme_checkmark-back2: @colortheme_form-bg-alt; -@colortheme_checkmark-col2: @colortheme_form-color-alt; -@colortheme_checkmark-disabled: #AAA; +// Colors +@cryptpad_color_brand: #0087FF; +@cryptpad_color_brand_soft: lighten(@cryptpad_color_brand, 40%); -// New variables +@cryptpad_text_col: #FFF-#3F4141; -// Colors @cryptpad_color_hint_grey: #FFF-#777; @cryptpad_color_dark_grey: #FFF-#999999; @cryptpad_color_neutral_grey: #FFF-#aaaaaa; @@ -128,14 +40,15 @@ @cryptpad_color_light_grey: #FFF-#f1f1f1; @cryptpad_color_lighter_grey: #FFF-#f9f9f9; +@cryptpad_color_blue: #326599; // former logo-1 @cryptpad_color_light_blue: #FFF-#00b7d8; @cryptpad_color_warn_red: #FFF-#eb675e; +@cryptpad_color_red: #f00; @cryptpad_color_dark_red: #9e0000; @cryptpad_color_orange: #f49842; @cryptpad_color_black: #FFF-#000; @cryptpad_color_white: #FFF-#FFF; @cryptpad_color_green: #5cb85c; - @cryptpad_color_light_red: darken(#FFD4D4, 75%); @cryptpad_color_light_green: darken(#c5ffa8, 75%); @cryptpad_color_light_yellow: darken(#FFE69C, 75%); @@ -155,7 +68,7 @@ @cp_loading-error-bg: @cryptpad_color_dark_red; @cp_loading-error-fg: @cryptpad_color_white; @cp_loading-progress-bg: @cryptpad_color_white; -@cp_loading-progress-bar-bg: @colortheme_logo-2; +@cp_loading-progress-bar-bg: @cryptpad_color_brand; @cp_loading-spinner: @cryptpad_color_dark_grey; // Chat @@ -167,31 +80,32 @@ // Alertify @cp_alertify-bg: @cryptpad_color_white; -@cp_alertify-fg: @colortheme_logo-2; +@cp_alertify-fg: @cryptpad_color_brand; @cp_alertify-hover: fade(@cp_alertify-fg, 25%); @cp_alertify-overlay: fade(@cryptpad_text_col, 50%); -@cp_alertify-log-bg: fade(@colortheme_logo-2, 90%); +@cp_alertify-log-bg: fade(@cryptpad_color_brand, 90%); @cp_alertify-log-fg: @cryptpad_color_white; @cp_alertify-warn-bg: rgba(205, 37, 50); +@cp_alertify-disable-border: @cryptpad_color_dark_grey; // Forms @cp_forms-fg: @cryptpad_text_col; @cp_forms-bg: @cryptpad_color_white; -@cp_forms-border: @colortheme_logo-2; +@cp_forms-border: @cryptpad_color_brand; @cp_forms-placeholder: @cryptpad_color_dark_grey; -@cp_forms-readonly: fade(@colortheme_logo-2, 25%); +@cp_forms-readonly: fade(@cryptpad_color_brand, 25%); @cp_forms-readonly-border: @cryptpad_color_white; @cp_forms-disabled: #AAA; // Buttons -@cp_buttons-fg: @colortheme_logo-2; +@cp_buttons-fg: @cryptpad_color_brand; @cp_buttons-default: #CCC; @cp_buttons-default-color: @cryptpad_text_col; @cp_buttons-default-border: @cryptpad_text_col; @cp_buttons-red: #E55236; @cp_buttons-red-color: #FFF; @cp_buttons-red-border: transparent; -@cp_buttons-primary: @colortheme_logo-2; +@cp_buttons-primary: @cryptpad_color_brand; @cp_buttons-primary-text: #FFFFFF; @cp_buttons-primary-border: transparent; @cp_buttons-disabled: #6c757d; @@ -220,7 +134,7 @@ @cp_drive-selection-overlay: fade(@cryptpad_color_black, 70%); @cp_drive-selection-bg: @cryptpad_color_neutral_grey; @cp_drive-selection-fg: @cryptpad_text_col; -@cp_drive-droppable-bg: @colortheme_logo-2; +@cp_drive-droppable-bg: @cryptpad_color_brand; @cp_drive-droppable-fg: contrast(@cp_drive-droppable-bg, @cryptpad_text_col, @cryptpad_color_light_grey); @cp_drive-infobox-bg: @cryptpad_color_lighter_blue; @cp_drive-infobox-fg: @cryptpad_color_black; @@ -261,15 +175,15 @@ @cp_context-disabled: @cryptpad_color_neutral_grey; // Corner -@cp_corner-primary: @colortheme_logo-1; -@cp_corner-secondary: @cryptpad_color_white; +@cp_corner-primary: @cryptpad_color_blue; +@cp_corner-secondary: @cryptpad_color_black; // XXX // Pad Creation Screen @cp_creation-bg: @cryptpad_color_white; @cp_creation-fg: @cryptpad_text_col; -@cp_creation-button-bg: @colortheme_logo-2; +@cp_creation-button-bg: @cryptpad_color_brand; @cp_creation-button-fg: @cryptpad_color_white; -@cp_creation-error-bg: @colortheme_logo-1; +@cp_creation-error-bg: @cryptpad_color_blue; @cp_creation-error-fg: @cryptpad_color_light_grey; // Export @@ -280,7 +194,7 @@ @cp_export-error-bg2: @cryptpad_color_neutral2_grey; // File upload -@cp_upload-fg: @colortheme_logo-2; +@cp_upload-fg: @cryptpad_color_brand; @cp_upload-header: @cryptpad_color_help_grey; @cp_upload-progress: @cryptpad_color_help_grey; @@ -292,11 +206,11 @@ // Static pages @cp_static-bg: @cryptpad_color_grey; @cp_static-fg: @cryptpad_text_col; -@cp_static-link: @colortheme_logo-2; -@cp_static-title: @colortheme_logo-2; +@cp_static-link: @cryptpad_color_brand; +@cp_static-title: @cryptpad_color_brand; @cp_static-footer: @cryptpad_color_help_grey; @cp_static-footer-border: @cryptpad_color_white; -@cp_static-topbar-fg: @colortheme_logo-2; +@cp_static-topbar-fg: @cryptpad_color_brand; // Limit @cp_limit-fg: @cryptpad_text_col; @@ -337,7 +251,7 @@ // Usergrid @cp_usergrid-fg: @cryptpad_text_col; -@cp_usergrid-selected-bg: @colortheme_logo-2; +@cp_usergrid-selected-bg: @cryptpad_color_brand; @cp_usergrid-selected-fg: @cryptpad_color_white; // Other @@ -364,7 +278,7 @@ @cp_accounts-tab-border: @cryptpad_color_neutral_grey; // Admin -@cp_admin-isadmin-fg: @colortheme_logo-2; +@cp_admin-isadmin-fg: @cryptpad_color_brand; @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%); @@ -384,7 +298,7 @@ @cp_mediatag-text-fg: @cryptpad_text_col; // File -@cp_file-progress-bg: @colortheme_logo-2; +@cp_file-progress-bg: @cryptpad_color_brand; @cp_file-progress-fg: @cryptpad_text_col; // Kanban @@ -437,7 +351,7 @@ // Teams @cp_teams-card-bg: @cryptpad_color_grey; @cp_teams-leftside-bg: @cryptpad_color_grey; -@cp_teams-invite-bg: fade(@colortheme_logo-2, 50%); +@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%); diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index 9a45020c6..0fc0e3624 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -3,68 +3,6 @@ @colortheme_app-font-size-small: 13px; @colortheme_app-font: @colortheme_app-font-size @colortheme_font; -@colortheme_logo-1: #326599; -@colortheme_logo-2: #0087FF; -@colortheme_logo_2_light: lighten(@colortheme_logo-2, 40%); -@colortheme_loading_bg: #E7E7E7; - -@colortheme_link-color: #0275D8; -@colortheme_link-color-visited: lighten(@colortheme_link-color, 10%); -@colortheme_info-background: #eeeeee; - -@colortheme_base: #fff; -@colortheme_light-base: lighten(@colortheme_base, 20%); - -@colortheme_cp-red: #FA5858; // remove red -@colortheme_cp-green: #46E981; - -@colortheme_old-fore: #fafafa; - -@colortheme_form-border: #bbbbbb; -@colortheme_form-bg: @colortheme_logo-2; -@colortheme_form-color: #ffffff; -@colortheme_form-bg-alt: #ffffff; -@colortheme_form-color-alt: @colortheme_logo-2; -@colortheme_form-warning: #f49842; -@colortheme_form-warning-hov: darken(@colortheme_form-warning, 5%); - -@colortheme_context-menu-icon-color: #7b7b7b; - -@colortheme_modal-bg: @colortheme_form-bg-alt; // TODO Modals bg -@colortheme_modal-fg: @colortheme_form-color-alt; -@colortheme_modal-link: @colortheme_link-color; -@colortheme_modal-link-visited: lighten(@colortheme_modal-link, 10%); -@colortheme_modal-dim: fade(@cryptpad_text_col, 50%); // TODO transparent background behind modals -@colortheme_modal-input: @colortheme_form-bg; -@colortheme_modal-input-fg: @colortheme_form-color; - -@colortheme_loading-bg: @colortheme_logo-1; -@colortheme_loading-bg-alt: @colortheme_logo-2; -@colortheme_loading-color: @colortheme_old-fore; - - -// TODO modals buttons -@colortheme_alertify-red: #E55236; -@colortheme_alertify-red-color: #FFF; -@colortheme_alertify-red-border: transparent; -@colortheme_alertify-primary: @colortheme_form-bg; -@colortheme_alertify-primary-text: @colortheme_form-color; -@colortheme_alertify-primary-border: transparent; -@colortheme_alertify-disabled: #6c757d; -@colortheme_alertify-disabled-text: #ffffff; -@colortheme_alertify-disabled-border: #6c757d; -@colortheme_alertify-cancel: @colortheme_modal-bg; -@colortheme_alertify-cancel-border: #949494; - -@colortheme_notification-warn: rgba(205, 37, 50, 0.8); - -// Apps, these colors are used for customizing the toolbar for the apps. -@colortheme_toolbar-warn: @colortheme_alertify-red; -@colortheme_pad-toolbar-bg: #eeeeee; -@colortheme_help-bg: #ddd; -@colortheme_userlist-bg: #eee; -@colortheme_pad-chat-bg: #AAA; - @colortheme_apps: { default: #0087FF; drive: #0087FF; // Used as icon color in index.js (index.html) @@ -86,40 +24,11 @@ contacts: #607B8D; } -@colortheme_poll-color: #fff; -@colortheme_poll-help-bg: #bbffbb; -@colortheme_poll-th-bg: #005bef; -@colortheme_poll-th-fg: #fff; - -// Sidebar layout (profile / settings) -@colortheme_sidebar-active: #fff; -@colortheme_sidebar-left-bg: #eee; -@colortheme_sidebar-left-fg: #000; -@colortheme_sidebar-left-branch: #888; -@colortheme_sidebar-right-bg: #fff; -@colortheme_sidebar-right-fg: #000; -@colortheme_sidebar-description: #777; -@colortheme_sidebar-button-bg: #3066e5; -@colortheme_sidebar-button-red-bg: #e54e4e; -@colortheme_sidebar-button-alt-bg: #fff; - -@cryptpad_color_blue: #4591C4; -@cryptpad_header_col: #1E1F1F; -@cryptpad_text_col: #3F4141; - -@colortheme_checkmark-back0: @colortheme_form-bg-alt; -@colortheme_checkmark-back0-active: @colortheme_form-border; -@colortheme_checkmark-back1: @colortheme_form-bg; -@colortheme_checkmark-col1: @colortheme_form-color; -@colortheme_checkmark-back2: @colortheme_form-bg-alt; -@colortheme_checkmark-col2: @colortheme_form-color-alt; -@colortheme_checkmark-disabled: #AAA; - -// New variables - // Colors -// XXX @cryptpad_color_brand = @colortheme_logo-2 -@cryptpad_color_brand_soft: lighten(@colortheme_logo-2, 40%); +@cryptpad_color_brand: #0087FF; +@cryptpad_color_brand_soft: lighten(@cryptpad_color_brand, 40%); + +@cryptpad_text_col: #3F4141; @cryptpad_color_hint_grey: #777; @cryptpad_color_dark_grey: #999999; @@ -131,6 +40,7 @@ @cryptpad_color_light_grey: #f1f1f1; @cryptpad_color_lighter_grey: #f9f9f9; +@cryptpad_color_blue: #326599; // former logo-1 @cryptpad_color_light_blue: #00b7d8; @cryptpad_color_lighter_blue: #d2e1f2; @cryptpad_color_warn_red: #eb675e; @@ -158,7 +68,7 @@ @cp_loading-error-bg: @cryptpad_color_dark_red; @cp_loading-error-fg: @cryptpad_color_white; @cp_loading-progress-bg: @cryptpad_color_white; -@cp_loading-progress-bar-bg: @colortheme_logo-2; +@cp_loading-progress-bar-bg: @cryptpad_color_brand; @cp_loading-spinner: @cryptpad_color_dark_grey; // Chat @@ -170,31 +80,32 @@ // Alertify @cp_alertify-bg: @cryptpad_color_white; -@cp_alertify-fg: @colortheme_logo-2; +@cp_alertify-fg: @cryptpad_color_brand; @cp_alertify-hover: fade(@cp_alertify-fg, 25%); @cp_alertify-overlay: fade(@cryptpad_text_col, 50%); -@cp_alertify-log-bg: fade(@colortheme_logo-2, 90%); +@cp_alertify-log-bg: fade(@cryptpad_color_brand, 90%); @cp_alertify-log-fg: @cryptpad_color_white; @cp_alertify-warn-bg: rgba(205, 37, 50); +@cp_alertify-disable-border: @cryptpad_color_dark_grey; // Forms @cp_forms-fg: @cryptpad_text_col; @cp_forms-bg: @cryptpad_color_white; -@cp_forms-border: @colortheme_logo-2; +@cp_forms-border: @cryptpad_color_brand; @cp_forms-placeholder: @cryptpad_color_dark_grey; -@cp_forms-readonly: fade(@colortheme_logo-2, 25%); +@cp_forms-readonly: fade(@cryptpad_color_brand, 25%); @cp_forms-readonly-border: @cryptpad_color_white; @cp_forms-disabled: #AAA; // Buttons -@cp_buttons-fg: @colortheme_logo-2; +@cp_buttons-fg: @cryptpad_color_brand; @cp_buttons-default: #CCC; @cp_buttons-default-color: @cryptpad_text_col; @cp_buttons-default-border: @cryptpad_text_col; @cp_buttons-red: #E55236; @cp_buttons-red-color: #FFF; @cp_buttons-red-border: transparent; -@cp_buttons-primary: @colortheme_logo-2; +@cp_buttons-primary: @cryptpad_color_brand; @cp_buttons-primary-text: #FFFFFF; @cp_buttons-primary-border: transparent; @cp_buttons-disabled: #6c757d; @@ -223,7 +134,7 @@ @cp_drive-selection-overlay: fade(@cryptpad_color_black, 70%); @cp_drive-selection-bg: @cryptpad_color_neutral_grey; @cp_drive-selection-fg: @cryptpad_text_col; -@cp_drive-droppable-bg: @colortheme_logo-2; +@cp_drive-droppable-bg: @cryptpad_color_brand; @cp_drive-droppable-fg: contrast(@cp_drive-droppable-bg, @cryptpad_text_col, @cryptpad_color_light_grey); @cp_drive-infobox-bg: @cryptpad_color_lighter_blue; @cp_drive-infobox-fg: @cryptpad_color_black; @@ -264,15 +175,15 @@ @cp_context-disabled: @cryptpad_color_neutral_grey; // Corner -@cp_corner-primary: @colortheme_logo-1; +@cp_corner-primary: @cryptpad_color_blue; @cp_corner-secondary: @cryptpad_color_white; // Pad Creation Screen @cp_creation-bg: @cryptpad_color_white; @cp_creation-fg: @cryptpad_text_col; -@cp_creation-button-bg: @colortheme_logo-2; +@cp_creation-button-bg: @cryptpad_color_brand; @cp_creation-button-fg: @cryptpad_color_white; -@cp_creation-error-bg: @colortheme_logo-1; +@cp_creation-error-bg: @cryptpad_color_blue; @cp_creation-error-fg: @cryptpad_color_light_grey; // Export @@ -283,7 +194,7 @@ @cp_export-error-bg2: @cryptpad_color_neutral2_grey; // File upload -@cp_upload-fg: @colortheme_logo-2; +@cp_upload-fg: @cryptpad_color_brand; @cp_upload-header: @cryptpad_color_help_grey; @cp_upload-progress: @cryptpad_color_help_grey; @@ -295,11 +206,11 @@ // Static pages @cp_static-bg: @cryptpad_color_toolbar_grey; @cp_static-fg: @cryptpad_text_col; -@cp_static-link: @colortheme_logo-2; -@cp_static-title: @colortheme_logo-2; +@cp_static-link: @cryptpad_color_brand; +@cp_static-title: @cryptpad_color_brand; @cp_static-footer: @cryptpad_color_help_grey; @cp_static-footer-border: @cryptpad_color_white; -@cp_static-topbar-fg: @colortheme_logo-2; +@cp_static-topbar-fg: @cryptpad_color_brand; // Limit @cp_limit-fg: @cryptpad_text_col; @@ -340,14 +251,13 @@ // Usergrid @cp_usergrid-fg: @cryptpad_text_col; -@cp_usergrid-selected-bg: @colortheme_logo-2; +@cp_usergrid-selected-bg: @cryptpad_color_brand; @cp_usergrid-selected-fg: @cryptpad_color_white; // Other @cp_shadow-color: rgba(0,0,0,0.4); // Apps - @cp_app-bg: @cryptpad_color_light_grey; @cp_app-fg: @cryptpad_text_col; @@ -366,7 +276,7 @@ @cp_accounts-tab-border: @cryptpad_color_neutral_grey; // Admin -@cp_admin-isadmin-fg: @colortheme_logo-2; +@cp_admin-isadmin-fg: @cryptpad_color_brand; @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%); @@ -386,7 +296,7 @@ @cp_mediatag-text-fg: @cryptpad_text_col; // File -@cp_file-progress-bg: @colortheme_logo-2; +@cp_file-progress-bg: @cryptpad_color_brand; @cp_file-progress-fg: @cryptpad_text_col; // Kanban @@ -438,7 +348,7 @@ // Teams @cp_teams-card-bg: @cryptpad_color_grey; @cp_teams-leftside-bg: @cryptpad_color_grey; -@cp_teams-invite-bg: fade(@colortheme_logo-2, 50%); +@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%); diff --git a/customize.dist/src/less2/include/corner.less b/customize.dist/src/less2/include/corner.less index f1b72b640..0c395d6fc 100644 --- a/customize.dist/src/less2/include/corner.less +++ b/customize.dist/src/less2/include/corner.less @@ -4,8 +4,8 @@ --LessLoader_require: LessLoader_currentFile(); }; & { - @corner-blue: @colortheme_logo-1; - @corner-white: @colortheme_base; + @corner-blue: @cp_corner-primary; + @corner-white: @cp_corner-secondary; @corner-blue-alt: darken(@corner-blue, 10%); @corner-white-alt: darken(@corner-white, 10%); diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less index 0d9320eb4..9b0915b73 100644 --- a/customize.dist/src/less2/include/modals-ui-elements.less +++ b/customize.dist/src/less2/include/modals-ui-elements.less @@ -40,7 +40,7 @@ margin-bottom: 10px; .cp-app-prop-size-container { height: 20px; - background-color: @colortheme_logo-2; + background-color: @cryptpad_color_brand; margin: 10px 0; padding: 0; div { @@ -70,7 +70,7 @@ background-color: @cryptpad_color_neutral2_grey; } .cp-app-prop-contents-size-color { - background-color: @colortheme_logo-2; + background-color: @cryptpad_color_brand; } } } @@ -249,7 +249,7 @@ } } .cp-spinner { - border-color: @colortheme_logo-1; + border-color: @cryptpad_color_brand; border-top-color: transparent; } } diff --git a/customize.dist/src/less2/include/password-input.less b/customize.dist/src/less2/include/password-input.less index ef99dddb8..0ca6930a6 100644 --- a/customize.dist/src/less2/include/password-input.less +++ b/customize.dist/src/less2/include/password-input.less @@ -18,7 +18,7 @@ justify-content: center; cursor: pointer; &:hover { - color: darken(@colortheme_logo-2, 10%); + color: darken(@cryptpad_color_brand, 10%); } } } diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less index 70509577b..ae2904407 100644 --- a/customize.dist/src/less2/include/sidebar-layout.less +++ b/customize.dist/src/less2/include/sidebar-layout.less @@ -127,38 +127,6 @@ span.cp-password-container { margin-bottom: 1px; } -/* - button.btn { - @button-bg: @colortheme_sidebar-button-bg; - @button-red-bg: @colortheme_sidebar-button-red-bg; - @button-alt-bg: @colortheme_sidebar-button-alt-bg; - background-color: @button-bg; - border-color: darken(@button-bg, 10%); - color: white; - .fa { - margin-right: 0.2em; - } - &:hover { - background-color: darken(@button-bg, 10%); - } - &.btn-secondary { - background-color: @button-alt-bg; - border-color: darken(@button-alt-bg, 10%); - color: black; - &:hover { - background-color: darken(@button-alt-bg, 10%); - } - } - &.btn-danger { - background-color: @button-red-bg; - border-color: darken(@button-red-bg, 10%); - color: white; - &:hover { - background-color: darken(@button-red-bg, 10%); - } - } - } -*/ } @media screen and (max-width: @browser_media-medium-screen) { flex-flow: column; diff --git a/customize.dist/src/less2/pages/page-features.less b/customize.dist/src/less2/pages/page-features.less index 67e22c686..1fe267144 100644 --- a/customize.dist/src/less2/pages/page-features.less +++ b/customize.dist/src/less2/pages/page-features.less @@ -11,7 +11,7 @@ .cp-features-register-button { font-size: 20px; color: #fff; - background: @colortheme_logo-2; + background: @cryptpad_color_brand; border-radius: 0; &:hover { cursor: pointer; @@ -22,7 +22,7 @@ .cp-shadow(); border: none; .title-card { - background-color: @colortheme_logo-2; + background-color: @cryptpad_color_brand; padding: 20px; } .card-body, .title-card { @@ -37,7 +37,7 @@ &.cp-pricing { div { font-size: 1.2em; - color: @colortheme_logo-2; + color: @cryptpad_color_brand; &:first-child { font-weight: bold; } @@ -67,7 +67,7 @@ content: "\f00c"; font-family: "FontAwesome"; font-size: 14px; - color: @colortheme_logo-2; + color: @cryptpad_color_brand; } } &.cp-content { diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index dd51dadf9..a144c6216 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -39,7 +39,7 @@ align-items: center; justify-content: center; flex-direction: column; - color: @colortheme_logo-2; + color: @cryptpad_color_brand; margin-top: 1.5em; img { max-width: 200px; diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less index 403b7d409..f79f93017 100644 --- a/customize.dist/src/less2/pages/page-login.less +++ b/customize.dist/src/less2/pages/page-login.less @@ -28,7 +28,7 @@ color: @cryptpad_text_col; margin-bottom: 5px; &:focus { - border-color: @colortheme_logo-2; + border-color: @cryptpad_color_brand; } } .checkbox-container { @@ -43,9 +43,9 @@ margin-top: 1em; #register { - border-color: @colortheme_logo-2; + border-color: @cryptpad_color_brand; background: @cryptpad_color_white; - color: @colortheme_logo-2; + color: @cryptpad_color_brand; padding: 10px; border-radius: 0; } diff --git a/www/common/file-dialog.less b/www/common/file-dialog.less deleted file mode 100644 index 5fc260f43..000000000 --- a/www/common/file-dialog.less +++ /dev/null @@ -1,52 +0,0 @@ -@import (reference) '../customize/src/less2/include/colortheme-all.less'; -@import (reference) '../customize/src/less2/include/modal.less'; - -.fileDialog_main () { - #fileDialog { - .modal_main(); - display: none; - .cp-modal { - .fileContainer { - display: flex; - flex-wrap: wrap; - justify-content: center; - overflow-y: auto; - } - - .element { - @darker: darken(@colortheme_modal-fg, 30%); - - width: 200px; - min-width: 200px; - height: 1em; - padding: 0.5em; - margin: 5px; - box-sizing: content-box; - - text-align: left; - line-height: 1em; - cursor: pointer; - - background-color: #111; - color: @darker; - - transition: all 0.1s; - - &:hover { - color: @colortheme_modal-fg; - } - - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - align-items: center; - - .fa { - cursor: pointer; - margin-right: 0.5em; - } - } - } - } -} diff --git a/www/secureiframe/app-secure.less b/www/secureiframe/app-secure.less index 3e966f4f8..7a6d85db7 100644 --- a/www/secureiframe/app-secure.less +++ b/www/secureiframe/app-secure.less @@ -35,7 +35,7 @@ .cp-loading-spinner-container { height: 100px; .cp-spinner { - border-color: @colortheme_logo-2; + border-color: @cryptpad_color_brand; border-top-color: transparent; } } diff --git a/www/teams/app-team.less b/www/teams/app-team.less index bdce5fd0a..5f4b6e59f 100644 --- a/www/teams/app-team.less +++ b/www/teams/app-team.less @@ -14,7 +14,7 @@ .drive_main(); .messenger_main( - @bg-color: @colortheme_pad-chat-bg + @bg-color: @cp_messenger-bg ); .sidebar-layout_main();