From bc74ca34d3e010b31fbce46dc005d45647c812c0 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Fri, 24 Feb 2023 18:31:03 +0100 Subject: [PATCH] Simplify CSS code --- dev/Styles/Admin/Layout.less | 2 +- dev/Styles/Login.less | 20 ++--- dev/Styles/Ui.less | 12 --- dev/Styles/User/Compose.less | 10 ++- dev/Styles/User/FolderList.less | 1 - dev/Styles/User/MessageList.less | 4 +- dev/Styles/User/MessageView.less | 24 ++--- dev/Styles/User/Settings.less | 2 +- .../templates/Views/User/MailMessageView.html | 24 ++--- .../v/0.0.0/themes/BlackWood/styles.css | 89 +++++------------- .../v/0.0.0/themes/BlurredDark/styles.css | 89 +++++------------- snappymail/v/0.0.0/themes/LoveDark/styles.css | 90 +++++-------------- .../v/0.0.0/themes/NightShine/styles.css | 90 +++++-------------- .../v/0.0.0/themes/SnowDarkV1/styles.css | 89 +++++------------- .../v/0.0.0/themes/SquaresDark/styles.css | 62 ++++--------- .../v/0.0.0/themes/StripesDark/styles.css | 89 +++++------------- snappymail/v/0.0.0/themes/example.css | 9 +- vendors/bootstrap/less/alerts.less | 14 ++- vendors/bootstrap/less/buttons.less | 3 +- 19 files changed, 204 insertions(+), 519 deletions(-) diff --git a/dev/Styles/Admin/Layout.less b/dev/Styles/Admin/Layout.less index f541d78e7..cb4be27a3 100644 --- a/dev/Styles/Admin/Layout.less +++ b/dev/Styles/Admin/Layout.less @@ -39,7 +39,7 @@ height: calc(100% - 50px - @rlLowMargin); margin: 50px @rlLowMargin 0 0; - background-color: var(--settings-bg-clr, #fff); + background-color: var(--panel-bg-clr, #fff); border: 1px solid var(--border-color, #aaa); border-radius: var(--border-radius, 5px); box-shadow: var(--smMainShadow); diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less index 120962a63..48e9ee3b8 100644 --- a/dev/Styles/Login.less +++ b/dev/Styles/Login.less @@ -10,10 +10,6 @@ z-index: 5; } -@glass-color: #fff; -@glass-error-color: #f76260; -@glass-m-color: rgba(255, 255, 255, .8); - .LoginView { .descWrapper { @@ -29,18 +25,18 @@ border: var(--login-border, 1px solid rgba(255, 255, 255, .2)); border-radius: var(--login-border-radius, 7px); box-shadow: var(--login-box-shadow); - color: var(--login-color, @glass-m-color); + color: var(--login-color, rgba(255, 255, 255, .8)); margin: 0; padding: 40px 40px 20px 40px; position: relative; * { - color: var(--login-color, @glass-m-color); + color: var(--login-color, rgba(255, 255, 255, .8)); } .controls.error * { - color: @glass-error-color; - border-color: @glass-error-color; + color: #f76260; + border-color: #f76260; } &.submitting > * { @@ -77,17 +73,17 @@ padding-right: 30px; &:placeholder { - color: @glass-color; + color: #fff; } &:focus, &:hover { - border-color: @glass-color; + border-color: #fff; } } input, .btn { background: none; - border: 1px solid @glass-m-color; + border: 1px solid rgba(255, 255, 255, .8); } .fontastic + input { @@ -107,7 +103,7 @@ font-size: 13px; &:hover, &:active { - border-color: @glass-color; + border-color: #fff; } } diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less index 13013e962..d3387f2aa 100644 --- a/dev/Styles/Ui.less +++ b/dev/Styles/Ui.less @@ -158,18 +158,6 @@ summary.legend { padding: 0 9px; } -.alert a:not(.close) { - text-decoration: underline; -} - -.alert.alert-info a:not(.close) { - color: var(--info-clr, #3a87ad); -} - -.alert.alert-error a:not(.close) { - color: var(--error-clr, #b94a48); -} - @media screen and (max-width: @maxMobileWidth) { .form-horizontal { .control-group { diff --git a/dev/Styles/User/Compose.less b/dev/Styles/User/Compose.less index 5ce9ce2a1..e6a290d91 100644 --- a/dev/Styles/User/Compose.less +++ b/dev/Styles/User/Compose.less @@ -45,7 +45,7 @@ padding-top: 50px; text-align: center; font-size: 24px; - color: #666; + opacity: 0.5; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } @@ -131,18 +131,20 @@ top: 5px; bottom: 5px; - border: 2px #777 dashed; + border: 2px var(--border-color, #ddd) dashed; z-index: 300; line-height: 119px; text-align: center; - background-color: #efefef; + background-color: var(--dialog-bg-clr, #fff); font-size: 24px; border-radius: 10px; + opacity: 0.9; &.dragAndDropOver { - background-color: #fff; + border-color: var(--main-color, #fff); + opacity: 1; } } } diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less index a05c97293..fdf4c6ce1 100644 --- a/dev/Styles/User/FolderList.less +++ b/dev/Styles/User/FolderList.less @@ -61,7 +61,6 @@ hr { margin: 10px; - border-color: #999; } li { diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less index 4073e835f..c3074740c 100644 --- a/dev/Styles/User/MessageList.less +++ b/dev/Styles/User/MessageList.less @@ -22,7 +22,7 @@ .messageList { height: calc(100% - 60px); - background-color: #fff; + background-color: var(--panel-bg-clr, #fff); border: 1px solid var(--border-color, #aaa); border-radius: var(--border-radius, 5px); display: flex; @@ -46,7 +46,7 @@ } .b-footer { - display: flex; + display: flex; flex-shrink: 0; padding: 7px; diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less index f4d404204..c339b85d1 100644 --- a/dev/Styles/User/MessageView.less +++ b/dev/Styles/User/MessageView.less @@ -37,7 +37,7 @@ } .messageView { - background-color: #fff; + background-color: var(--panel-bg-clr, #fff); border: 1px solid var(--border-color, #aaa); border-radius: var(--border-radius, 5px); height: calc(100% - 50px); @@ -126,7 +126,7 @@ .messageItemHeader { - background-color: #f8f8f8; + background-color: var(--message-header-bg-clr, #eee); border-bottom: 1px solid var(--border-color, #bbb); border-radius: var(--border-radius, 5px) var(--border-radius, 5px) 0 0; padding: 10px; @@ -201,7 +201,6 @@ } .openpgp-control { - margin: 0.5em; padding: 0.5em; span { @@ -234,9 +233,6 @@ display: none; } } - .b-text-part > iframe { - min-height: 50vh; - } .thread-controls { .dropdown-toggle { @@ -257,7 +253,6 @@ #messageItem { - color: #000; height: 100%; overflow: auto; scroll-behavior: smooth; @@ -269,11 +264,13 @@ padding: 50px 0; } + .bodySubHeader { + background-color: var(--message-header-bg-clr, #eee); + } .bodySubHeader > * { - background-color: #eee; border-bottom: 1px solid var(--border-color, #bbb); cursor: pointer; - padding: 10px 15px; + padding: 10px; } .pgpInfo { @@ -286,14 +283,8 @@ } } - .readReceipt { - background-color: #ffffd9; - } - .attachmentsPlace { - padding: 10px 10px 6px 10px; - background: #eee; border-bottom: 1px solid var(--border-color, #bbb); position: relative; @@ -323,7 +314,6 @@ .attachmentsControls { padding: 7px 5px 7px 14px; - background: #e8e8e8; border-bottom: 1px solid var(--border-color, #bbb); } .attachmentsControls > * { @@ -356,7 +346,7 @@ } a { - color: blue; + color: var(--link-color, blue); text-decoration: underline; &:visited { diff --git a/dev/Styles/User/Settings.less b/dev/Styles/User/Settings.less index aba093cfc..7f0a4a09c 100644 --- a/dev/Styles/User/Settings.less +++ b/dev/Styles/User/Settings.less @@ -35,7 +35,7 @@ padding:20px; width: 100%; - background-color: var(--settings-bg-clr, #fff); + background-color: var(--panel-bg-clr, #fff); border: 1px solid var(--border-color, #aaa); border-radius: var(--border-radius, 5px); box-shadow: var(--smMainShadow); diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html index 068938433..d74d936b7 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -291,20 +291,20 @@ - - -
- - +
+
+ + +
+
+
+
+ + +
+
- - -
- - -
-
diff --git a/snappymail/v/0.0.0/themes/BlackWood/styles.css b/snappymail/v/0.0.0/themes/BlackWood/styles.css index 29e484ae7..e1ecf4126 100644 --- a/snappymail/v/0.0.0/themes/BlackWood/styles.css +++ b/snappymail/v/0.0.0/themes/BlackWood/styles.css @@ -6,6 +6,11 @@ --main-bg-color: #48525C; --main-bg-image: url("images/background.jpg"); --main-bg-size: cover; + --link-color: #6AE; + --border-color: #555; + --hr-color: #666; + + --panel-bg-clr: #333; /* LOADING */ --loading-color: #ddd; @@ -38,15 +43,29 @@ --folders-drop-bg-color: rgba(0,0,0,0.5); /* SETTINGS */ - --settings-bg-clr: #333; --settings-menu-color: #fff; --settings-menu-selected-color: #fff; --settings-menu-selected-bg-color: #444; --settings-menu-hover-color: #fff; --settings-menu-hover-bg-color: rgba(0,0,0,0.5); - /* MESSAGE LIST */ - --message-list-toolbar-bg-color: #eee; + /* MESSAGES */ + --message-list-toolbar-bg-color: #111; + --message-header-bg-clr: #222; + + /* DIALOGS */ + --dialog-clr: #fff; + --dialog-bg-clr: #333; + --dialog-border-clr: #555; + + /* FORMS */ + --btn-clr: #fff; + --btn-bg-clr: #222; + --btn-border-clr: rgba(255,255,255,.20); + + --input-clr: #fff; + --input-bg-clr: #222; + --input-border-clr: #aaa; } ::-webkit-scrollbar { @@ -74,17 +93,9 @@ color: #ccc; } -.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar { - background-color: #111 !important; - color: var(--main-color); -} - .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) { - border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25); box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05); - color: var(--main-color); text-shadow: 0 -1px 0 rgba(255,255,255,.25); - background-color: #222; } .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active, .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active { @@ -94,56 +105,9 @@ border-color: #333; border-top-color: #ccc; } -.btn .caret { - border-top-color: var(--main-color); -} - -#rl-popups > dialog, -.messageList, -.messageView, -.alert-info, -#V-PopupsCompose .b-attachment-place { - background-color: #333; - border-color: #555; - color: var(--main-color); -} - -.legend, -dialog header, dialog footer, -.table td, .table th { - border-color: #555 !important; -} - -.legend, -.messageView #messageItem { - color: var(--main-color); -} - -.rl-mobile .squire-toolbar, -#V-PopupsCompose .b-attachment-place.dragAndDropOver { - background-color: #222; -} - -.g-ui-link, -.messageView .messageItemHeader .informationShort a, -.messageView #messageItem .bodyText .b-text-part a { - color: #6AE; -} - -.messageView .messageItemHeader, -.messageView #messageItem .pgpEncrypted, -.messageView #messageItem .pgpSigned, -.messageView #messageItem .readReceipt, -.messageView #messageItem .showImages, -.messageView #messageItem .attachmentsPlace, -.messageView #messageItem .attachmentsControls { - background-color: #222; - border-bottom-color: #444; -} .messageListItem { border-left-color: #111; - color: #EEE; } .table-hover tbody tr:hover td, @@ -164,19 +128,10 @@ dialog header, dialog footer, background: linear-gradient(#555 0%, #000 100%); } -input, textarea, .select, select, .emailaddresses { - background-color: #222; - border-color: #aaa; - color: #fff; -} .select, select { background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+); } -hr { - border-color: #666; -} - #messageItem .b-text-part blockquote, .b-settings-general .editMainIdentity { border-color: #999; diff --git a/snappymail/v/0.0.0/themes/BlurredDark/styles.css b/snappymail/v/0.0.0/themes/BlurredDark/styles.css index 4109f1abe..34ad09cdb 100644 --- a/snappymail/v/0.0.0/themes/BlurredDark/styles.css +++ b/snappymail/v/0.0.0/themes/BlurredDark/styles.css @@ -7,6 +7,11 @@ --main-bg-color: #48525C; --main-bg-image: url("images/background.jpg"); --main-bg-size: cover; + --link-color: #6AE; + --border-color: #555; + --hr-color: #666; + + --panel-bg-clr: #333; /* LOADING */ --loading-color: #ddd; @@ -39,15 +44,29 @@ --folders-drop-bg-color: rgba(0,0,0,0.5); /* SETTINGS */ - --settings-bg-clr: #333; --settings-menu-color: #fff; --settings-menu-selected-color: #fff; --settings-menu-selected-bg-color: #444; --settings-menu-hover-color: #fff; --settings-menu-hover-bg-color: rgba(0,0,0,0.5); - /* MESSAGE LIST */ - --message-list-toolbar-bg-color: #eee; + /* MESSAGES */ + --message-list-toolbar-bg-color: #111; + --message-header-bg-clr: #222; + + /* DIALOGS */ + --dialog-clr: #fff; + --dialog-bg-clr: #333; + --dialog-border-clr: #555; + + /* FORMS */ + --btn-clr: #fff; + --btn-bg-clr: #222; + --btn-border-clr: rgba(255,255,255,.20); + + --input-clr: #fff; + --input-bg-clr: #222; + --input-border-clr: #aaa; } ::-webkit-scrollbar { @@ -75,17 +94,9 @@ color: #ccc; } -.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar { - background-color: #111 !important; - color: var(--main-color); -} - .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) { - border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25); box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05); - color: var(--main-color); text-shadow: 0 -1px 0 rgba(255,255,255,.25); - background-color: #222; } .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active, .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active { @@ -95,56 +106,9 @@ border-color: #333; border-top-color: #ccc; } -.btn .caret { - border-top-color: var(--main-color); -} - -#rl-popups > dialog, -.messageList, -.messageView, -.alert-info, -#V-PopupsCompose .b-attachment-place { - background-color: #333; - border-color: #555; - color: var(--main-color); -} - -.legend, -dialog header, dialog footer, -.table td, .table th { - border-color: #555 !important; -} - -.legend, -.messageView #messageItem { - color: var(--main-color); -} - -.rl-mobile .squire-toolbar, -#V-PopupsCompose .b-attachment-place.dragAndDropOver { - background-color: #222; -} - -.g-ui-link, -.messageView .messageItemHeader .informationShort a, -.messageView #messageItem .bodyText .b-text-part a { - color: #6AE; -} - -.messageView .messageItemHeader, -.messageView #messageItem .pgpEncrypted, -.messageView #messageItem .pgpSigned, -.messageView #messageItem .readReceipt, -.messageView #messageItem .showImages, -.messageView #messageItem .attachmentsPlace, -.messageView #messageItem .attachmentsControls { - background-color: #222; - border-bottom-color: #444; -} .messageListItem { border-left-color: #111; - color: #EEE; } .table-hover tbody tr:hover td, @@ -165,19 +129,10 @@ dialog header, dialog footer, background: linear-gradient(#555 0%, #000 100%); } -input, textarea, .select, select, .emailaddresses { - background-color: #222; - border-color: #aaa; - color: #fff; -} .select, select { background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+); } -hr { - border-color: #666; -} - #messageItem .b-text-part blockquote, .b-settings-general .editMainIdentity { border-color: #999; diff --git a/snappymail/v/0.0.0/themes/LoveDark/styles.css b/snappymail/v/0.0.0/themes/LoveDark/styles.css index 29e484ae7..fd221a07b 100644 --- a/snappymail/v/0.0.0/themes/LoveDark/styles.css +++ b/snappymail/v/0.0.0/themes/LoveDark/styles.css @@ -6,6 +6,11 @@ --main-bg-color: #48525C; --main-bg-image: url("images/background.jpg"); --main-bg-size: cover; + --link-color: #6AE; + --border-color: #555; + --hr-color: #666; + + --panel-bg-clr: #333; /* LOADING */ --loading-color: #ddd; @@ -38,15 +43,30 @@ --folders-drop-bg-color: rgba(0,0,0,0.5); /* SETTINGS */ - --settings-bg-clr: #333; --settings-menu-color: #fff; --settings-menu-selected-color: #fff; --settings-menu-selected-bg-color: #444; --settings-menu-hover-color: #fff; --settings-menu-hover-bg-color: rgba(0,0,0,0.5); - /* MESSAGE LIST */ - --message-list-toolbar-bg-color: #eee; + /* MESSAGES */ + --message-list-toolbar-bg-color: #111; + --message-header-bg-clr: #222; + + /* DIALOGS */ + --dialog-clr: #fff; + --dialog-bg-clr: #333; + --dialog-border-clr: #555; + + + /* FORMS */ + --btn-clr: #fff; + --btn-bg-clr: #222; + --btn-border-clr: rgba(255,255,255,.20); + + --input-clr: #fff; + --input-bg-clr: #222; + --input-border-clr: #aaa; } ::-webkit-scrollbar { @@ -74,17 +94,9 @@ color: #ccc; } -.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar { - background-color: #111 !important; - color: var(--main-color); -} - .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) { - border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25); box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05); - color: var(--main-color); text-shadow: 0 -1px 0 rgba(255,255,255,.25); - background-color: #222; } .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active, .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active { @@ -94,56 +106,9 @@ border-color: #333; border-top-color: #ccc; } -.btn .caret { - border-top-color: var(--main-color); -} - -#rl-popups > dialog, -.messageList, -.messageView, -.alert-info, -#V-PopupsCompose .b-attachment-place { - background-color: #333; - border-color: #555; - color: var(--main-color); -} - -.legend, -dialog header, dialog footer, -.table td, .table th { - border-color: #555 !important; -} - -.legend, -.messageView #messageItem { - color: var(--main-color); -} - -.rl-mobile .squire-toolbar, -#V-PopupsCompose .b-attachment-place.dragAndDropOver { - background-color: #222; -} - -.g-ui-link, -.messageView .messageItemHeader .informationShort a, -.messageView #messageItem .bodyText .b-text-part a { - color: #6AE; -} - -.messageView .messageItemHeader, -.messageView #messageItem .pgpEncrypted, -.messageView #messageItem .pgpSigned, -.messageView #messageItem .readReceipt, -.messageView #messageItem .showImages, -.messageView #messageItem .attachmentsPlace, -.messageView #messageItem .attachmentsControls { - background-color: #222; - border-bottom-color: #444; -} .messageListItem { border-left-color: #111; - color: #EEE; } .table-hover tbody tr:hover td, @@ -164,19 +129,10 @@ dialog header, dialog footer, background: linear-gradient(#555 0%, #000 100%); } -input, textarea, .select, select, .emailaddresses { - background-color: #222; - border-color: #aaa; - color: #fff; -} .select, select { background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+); } -hr { - border-color: #666; -} - #messageItem .b-text-part blockquote, .b-settings-general .editMainIdentity { border-color: #999; diff --git a/snappymail/v/0.0.0/themes/NightShine/styles.css b/snappymail/v/0.0.0/themes/NightShine/styles.css index 29e484ae7..fd221a07b 100644 --- a/snappymail/v/0.0.0/themes/NightShine/styles.css +++ b/snappymail/v/0.0.0/themes/NightShine/styles.css @@ -6,6 +6,11 @@ --main-bg-color: #48525C; --main-bg-image: url("images/background.jpg"); --main-bg-size: cover; + --link-color: #6AE; + --border-color: #555; + --hr-color: #666; + + --panel-bg-clr: #333; /* LOADING */ --loading-color: #ddd; @@ -38,15 +43,30 @@ --folders-drop-bg-color: rgba(0,0,0,0.5); /* SETTINGS */ - --settings-bg-clr: #333; --settings-menu-color: #fff; --settings-menu-selected-color: #fff; --settings-menu-selected-bg-color: #444; --settings-menu-hover-color: #fff; --settings-menu-hover-bg-color: rgba(0,0,0,0.5); - /* MESSAGE LIST */ - --message-list-toolbar-bg-color: #eee; + /* MESSAGES */ + --message-list-toolbar-bg-color: #111; + --message-header-bg-clr: #222; + + /* DIALOGS */ + --dialog-clr: #fff; + --dialog-bg-clr: #333; + --dialog-border-clr: #555; + + + /* FORMS */ + --btn-clr: #fff; + --btn-bg-clr: #222; + --btn-border-clr: rgba(255,255,255,.20); + + --input-clr: #fff; + --input-bg-clr: #222; + --input-border-clr: #aaa; } ::-webkit-scrollbar { @@ -74,17 +94,9 @@ color: #ccc; } -.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar { - background-color: #111 !important; - color: var(--main-color); -} - .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) { - border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25); box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05); - color: var(--main-color); text-shadow: 0 -1px 0 rgba(255,255,255,.25); - background-color: #222; } .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active, .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active { @@ -94,56 +106,9 @@ border-color: #333; border-top-color: #ccc; } -.btn .caret { - border-top-color: var(--main-color); -} - -#rl-popups > dialog, -.messageList, -.messageView, -.alert-info, -#V-PopupsCompose .b-attachment-place { - background-color: #333; - border-color: #555; - color: var(--main-color); -} - -.legend, -dialog header, dialog footer, -.table td, .table th { - border-color: #555 !important; -} - -.legend, -.messageView #messageItem { - color: var(--main-color); -} - -.rl-mobile .squire-toolbar, -#V-PopupsCompose .b-attachment-place.dragAndDropOver { - background-color: #222; -} - -.g-ui-link, -.messageView .messageItemHeader .informationShort a, -.messageView #messageItem .bodyText .b-text-part a { - color: #6AE; -} - -.messageView .messageItemHeader, -.messageView #messageItem .pgpEncrypted, -.messageView #messageItem .pgpSigned, -.messageView #messageItem .readReceipt, -.messageView #messageItem .showImages, -.messageView #messageItem .attachmentsPlace, -.messageView #messageItem .attachmentsControls { - background-color: #222; - border-bottom-color: #444; -} .messageListItem { border-left-color: #111; - color: #EEE; } .table-hover tbody tr:hover td, @@ -164,19 +129,10 @@ dialog header, dialog footer, background: linear-gradient(#555 0%, #000 100%); } -input, textarea, .select, select, .emailaddresses { - background-color: #222; - border-color: #aaa; - color: #fff; -} .select, select { background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+); } -hr { - border-color: #666; -} - #messageItem .b-text-part blockquote, .b-settings-general .editMainIdentity { border-color: #999; diff --git a/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css b/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css index 4109f1abe..34ad09cdb 100644 --- a/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css +++ b/snappymail/v/0.0.0/themes/SnowDarkV1/styles.css @@ -7,6 +7,11 @@ --main-bg-color: #48525C; --main-bg-image: url("images/background.jpg"); --main-bg-size: cover; + --link-color: #6AE; + --border-color: #555; + --hr-color: #666; + + --panel-bg-clr: #333; /* LOADING */ --loading-color: #ddd; @@ -39,15 +44,29 @@ --folders-drop-bg-color: rgba(0,0,0,0.5); /* SETTINGS */ - --settings-bg-clr: #333; --settings-menu-color: #fff; --settings-menu-selected-color: #fff; --settings-menu-selected-bg-color: #444; --settings-menu-hover-color: #fff; --settings-menu-hover-bg-color: rgba(0,0,0,0.5); - /* MESSAGE LIST */ - --message-list-toolbar-bg-color: #eee; + /* MESSAGES */ + --message-list-toolbar-bg-color: #111; + --message-header-bg-clr: #222; + + /* DIALOGS */ + --dialog-clr: #fff; + --dialog-bg-clr: #333; + --dialog-border-clr: #555; + + /* FORMS */ + --btn-clr: #fff; + --btn-bg-clr: #222; + --btn-border-clr: rgba(255,255,255,.20); + + --input-clr: #fff; + --input-bg-clr: #222; + --input-border-clr: #aaa; } ::-webkit-scrollbar { @@ -75,17 +94,9 @@ color: #ccc; } -.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar { - background-color: #111 !important; - color: var(--main-color); -} - .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) { - border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25); box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05); - color: var(--main-color); text-shadow: 0 -1px 0 rgba(255,255,255,.25); - background-color: #222; } .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active, .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active { @@ -95,56 +106,9 @@ border-color: #333; border-top-color: #ccc; } -.btn .caret { - border-top-color: var(--main-color); -} - -#rl-popups > dialog, -.messageList, -.messageView, -.alert-info, -#V-PopupsCompose .b-attachment-place { - background-color: #333; - border-color: #555; - color: var(--main-color); -} - -.legend, -dialog header, dialog footer, -.table td, .table th { - border-color: #555 !important; -} - -.legend, -.messageView #messageItem { - color: var(--main-color); -} - -.rl-mobile .squire-toolbar, -#V-PopupsCompose .b-attachment-place.dragAndDropOver { - background-color: #222; -} - -.g-ui-link, -.messageView .messageItemHeader .informationShort a, -.messageView #messageItem .bodyText .b-text-part a { - color: #6AE; -} - -.messageView .messageItemHeader, -.messageView #messageItem .pgpEncrypted, -.messageView #messageItem .pgpSigned, -.messageView #messageItem .readReceipt, -.messageView #messageItem .showImages, -.messageView #messageItem .attachmentsPlace, -.messageView #messageItem .attachmentsControls { - background-color: #222; - border-bottom-color: #444; -} .messageListItem { border-left-color: #111; - color: #EEE; } .table-hover tbody tr:hover td, @@ -165,19 +129,10 @@ dialog header, dialog footer, background: linear-gradient(#555 0%, #000 100%); } -input, textarea, .select, select, .emailaddresses { - background-color: #222; - border-color: #aaa; - color: #fff; -} .select, select { background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+); } -hr { - border-color: #666; -} - #messageItem .b-text-part blockquote, .b-settings-general .editMainIdentity { border-color: #999; diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.css b/snappymail/v/0.0.0/themes/SquaresDark/styles.css index 5bab5c7cb..a570ee3d8 100644 --- a/snappymail/v/0.0.0/themes/SquaresDark/styles.css +++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.css @@ -6,7 +6,11 @@ --main-color: #fff; --main-bg-color: #3C454D; --main-bg-image: url("images/background.jpg"); + --link-color: #6AE; --border-color: #555; + --hr-color: #666; + + --panel-bg-clr: #000; /* LOADING */ --loading-color: #ddd; @@ -39,17 +43,26 @@ --folders-drop-bg-color: rgba(0,0,0,0.5); /* SETTINGS */ - --settings-bg-clr: #000; --settings-menu-color: #fff; --settings-menu-selected-color: #fff; --settings-menu-selected-bg-color: rgba(0,0,0,0.5); --settings-menu-hover-color: #fff; --settings-menu-hover-bg-color: rgba(0,0,0,0.5); - /* MESSAGE LIST */ + /* MESSAGES */ --message-list-toolbar-bg-color: #222; + --message-header-bg-clr: #222; + + /* DIALOGS */ + --dialog-clr: #fff; + --dialog-bg-clr: #000; + --dialog-border-clr: #555; /* FORMS */ + --btn-clr: #fff; + --btn-bg-clr: #000; + --btn-border-clr: rgba(255,255,255,.20); + --input-clr: #fff; --input-bg-clr: #000; --input-border-clr: #aaa; @@ -69,16 +82,11 @@ .thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar { background-image: linear-gradient(to bottom,#444,#111) !important; - background-repeat: repeat-x !important; - color: var(--main-color); } .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) { - border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25); box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05); - color: var(--main-color); text-shadow: 0 -1px 0 rgba(255,255,255,.25); - background-color: #000; } .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active, .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active { @@ -88,45 +96,9 @@ border-color: #333; border-top-color: #ccc; } -.btn .caret { - border-top-color: var(--main-color); -} - -#rl-popups > dialog, -.messageList, -.messageView, -.alert-info, -#V-PopupsCompose .b-attachment-place { - background-color: #000; - border-color: #555; - color: var(--main-color); -} - -.legend, -.messageView #messageItem { - color: var(--main-color); -} - -.rl-mobile .squire-toolbar, -#V-PopupsCompose .b-attachment-place.dragAndDropOver { - background-color: #222; -} - -.g-ui-link, -.messageView .messageItemHeader .informationShort a, -.messageView #messageItem .bodyText .b-text-part a { - color: #6AE; -} - -.messageView .messageItemHeader, -.messageView #messageItem .bodySubHeader > * { - background-color: #222; - border-bottom-color: #444; -} .messageListItem { border-left-color: #111; - color: #EEE; } .table-hover tbody tr:hover td, @@ -151,10 +123,6 @@ background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+); } -hr { - border-color: #666; -} - #messageItem .b-text-part blockquote, .b-settings-general .editMainIdentity { border-color: #999; diff --git a/snappymail/v/0.0.0/themes/StripesDark/styles.css b/snappymail/v/0.0.0/themes/StripesDark/styles.css index 29e484ae7..e1ecf4126 100644 --- a/snappymail/v/0.0.0/themes/StripesDark/styles.css +++ b/snappymail/v/0.0.0/themes/StripesDark/styles.css @@ -6,6 +6,11 @@ --main-bg-color: #48525C; --main-bg-image: url("images/background.jpg"); --main-bg-size: cover; + --link-color: #6AE; + --border-color: #555; + --hr-color: #666; + + --panel-bg-clr: #333; /* LOADING */ --loading-color: #ddd; @@ -38,15 +43,29 @@ --folders-drop-bg-color: rgba(0,0,0,0.5); /* SETTINGS */ - --settings-bg-clr: #333; --settings-menu-color: #fff; --settings-menu-selected-color: #fff; --settings-menu-selected-bg-color: #444; --settings-menu-hover-color: #fff; --settings-menu-hover-bg-color: rgba(0,0,0,0.5); - /* MESSAGE LIST */ - --message-list-toolbar-bg-color: #eee; + /* MESSAGES */ + --message-list-toolbar-bg-color: #111; + --message-header-bg-clr: #222; + + /* DIALOGS */ + --dialog-clr: #fff; + --dialog-bg-clr: #333; + --dialog-border-clr: #555; + + /* FORMS */ + --btn-clr: #fff; + --btn-bg-clr: #222; + --btn-border-clr: rgba(255,255,255,.20); + + --input-clr: #fff; + --input-bg-clr: #222; + --input-border-clr: #aaa; } ::-webkit-scrollbar { @@ -74,17 +93,9 @@ color: #ccc; } -.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar { - background-color: #111 !important; - color: var(--main-color); -} - .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) { - border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25); box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05); - color: var(--main-color); text-shadow: 0 -1px 0 rgba(255,255,255,.25); - background-color: #222; } .btn:not(.btn-success):not(.btn-warning):not(.btn-danger).active, .btn:not(.btn-success):not(.btn-warning):not(.btn-danger):active { @@ -94,56 +105,9 @@ border-color: #333; border-top-color: #ccc; } -.btn .caret { - border-top-color: var(--main-color); -} - -#rl-popups > dialog, -.messageList, -.messageView, -.alert-info, -#V-PopupsCompose .b-attachment-place { - background-color: #333; - border-color: #555; - color: var(--main-color); -} - -.legend, -dialog header, dialog footer, -.table td, .table th { - border-color: #555 !important; -} - -.legend, -.messageView #messageItem { - color: var(--main-color); -} - -.rl-mobile .squire-toolbar, -#V-PopupsCompose .b-attachment-place.dragAndDropOver { - background-color: #222; -} - -.g-ui-link, -.messageView .messageItemHeader .informationShort a, -.messageView #messageItem .bodyText .b-text-part a { - color: #6AE; -} - -.messageView .messageItemHeader, -.messageView #messageItem .pgpEncrypted, -.messageView #messageItem .pgpSigned, -.messageView #messageItem .readReceipt, -.messageView #messageItem .showImages, -.messageView #messageItem .attachmentsPlace, -.messageView #messageItem .attachmentsControls { - background-color: #222; - border-bottom-color: #444; -} .messageListItem { border-left-color: #111; - color: #EEE; } .table-hover tbody tr:hover td, @@ -164,19 +128,10 @@ dialog header, dialog footer, background: linear-gradient(#555 0%, #000 100%); } -input, textarea, .select, select, .emailaddresses { - background-color: #222; - border-color: #aaa; - color: #fff; -} .select, select { background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+); } -hr { - border-color: #666; -} - #messageItem .b-text-part blockquote, .b-settings-general .editMainIdentity { border-color: #999; diff --git a/snappymail/v/0.0.0/themes/example.css b/snappymail/v/0.0.0/themes/example.css index f4983c334..1c1ebcaf3 100644 --- a/snappymail/v/0.0.0/themes/example.css +++ b/snappymail/v/0.0.0/themes/example.css @@ -14,6 +14,8 @@ --border-radius: 5px; --hr-color: #eee; + --panel-bg-clr: #fff; + --warning-clr: #c09853; --warning-bg-clr: #fcf8e3; --warning-border-clr: #fbeed5; @@ -62,18 +64,15 @@ --unread-count-bg-color: #333; /* SETTINGS */ - --settings-bg-clr: #fff; --settings-menu-color: #333; --settings-menu-selected-color: #eee; --settings-menu-selected-bg-color: #333; --settings-menu-hover-color: #eee; --settings-menu-hover-bg-color: #333; - /* MESSAGE LIST */ + /* MESSAGES */ --message-list-toolbar-bg-color: #eee; - - /* MESSAGE */ - --message-bg-color: #fff; + --message-header-bg-clr: #f8f8f8; /* DIALOGS */ --dialog-clr: #333; diff --git a/vendors/bootstrap/less/alerts.less b/vendors/bootstrap/less/alerts.less index dfd741cc9..124326743 100644 --- a/vendors/bootstrap/less/alerts.less +++ b/vendors/bootstrap/less/alerts.less @@ -33,10 +33,22 @@ .alert-error { background-color: var(--error-bg-clr, #f2dede); border-color: var(--error-border-clr, #eed3d7); - color: var(--error-clr, #b94a48); } .alert-info { background-color: var(--info-bg-clr, #d9edf7); border-color: var(--info-border-clr, #bce8f1); +} + +.alert a:not(.close) { + text-decoration: underline; +} + +.alert-info, +.alert.alert-info a:not(.close) { color: var(--info-clr, #3a87ad); } + +.alert-error, +.alert.alert-error a:not(.close) { + color: var(--error-clr, #b94a48); +} diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less index 5f208a925..8bc88fd67 100644 --- a/vendors/bootstrap/less/buttons.less +++ b/vendors/bootstrap/less/buttons.less @@ -16,8 +16,7 @@ text-align: center; vertical-align: middle; cursor: pointer; - border: 1px solid var(--btn-border-clr, #bbb); - border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); + border: 1px solid var(--btn-border-clr, rgba(0,0,0,.20)); box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); color: var(--btn-clr, #333); text-shadow: 0 -1px 0 rgba(0,0,0,.25);