From b6d8fa5b3fdbd28d6a1fcdef30c013280925e020 Mon Sep 17 00:00:00 2001 From: djmaze Date: Thu, 18 Feb 2021 21:06:19 +0100 Subject: [PATCH] Split admin css from app.css Cleanup normalize and bootstrap css Removed almost all css float Removed CKEditor from app.css --- README.md | 13 +- dev/Styles/@Admin.less | 44 ++++++ dev/Styles/@Boot.css | 8 +- dev/Styles/@Main.less | 29 ++-- dev/Styles/AdminAbout.less | 11 +- dev/Styles/AdminDomain.less | 1 + dev/Styles/AdminPlugins.less | 2 + dev/Styles/AdvancedSearch.less | 8 +- dev/Styles/Animations.less | 144 ++++-------------- dev/Styles/AnimationsUser.less | 83 ++++++++++ dev/Styles/Compose.less | 4 +- dev/Styles/Contacts.less | 41 ++--- dev/Styles/Identity.less | 10 +- dev/Styles/Login.less | 8 +- dev/Styles/Main.less | 4 - dev/Styles/MessageList.less | 2 +- dev/Styles/MessageView.less | 14 +- dev/Styles/OpenPgpKey.less | 8 +- dev/Styles/SettingsFilters.less | 2 +- dev/Styles/SystemDropDown.less | 6 +- dev/Styles/Ui.less | 4 - dev/Styles/_BootstrapFix.less | 44 +----- dev/Styles/_CkeFix.less | 8 +- dev/Styles/_FontasticToBoot.less | 2 +- release.php | 2 + .../0.0.0/app/libraries/RainLoop/Service.php | 2 +- .../v/0.0.0/app/localization/admin/nl_NL.yml | 2 +- .../0.0.0/app/localization/webmail/nl_NL.yml | 2 +- .../app/templates/Views/Admin/AdminLogin.html | 2 +- .../app/templates/Views/Admin/AdminMenu.html | 4 +- .../Views/Admin/AdminSettingsAbout.html | 4 +- .../Views/Admin/AdminSettingsContacts.html | 4 +- .../Views/Admin/AdminSettingsGeneral.html | 4 +- .../templates/Views/Admin/PopupsDomain.html | 4 +- .../Views/Common/PopupsLanguages.html | 4 +- .../0.0.0/app/templates/Views/User/Login.html | 10 +- .../templates/Views/User/MailMessageList.html | 2 +- .../templates/Views/User/MailMessageView.html | 24 +-- .../templates/Views/User/PopupsAccount.html | 4 +- .../Views/User/PopupsAddOpenPgpKey.html | 4 +- .../Views/User/PopupsAdvancedSearch.html | 5 +- .../templates/Views/User/PopupsCompose.html | 12 +- .../Views/User/PopupsComposeOpenPgp.html | 74 ++++----- .../templates/Views/User/PopupsContacts.html | 30 ++-- .../templates/Views/User/PopupsFilter.html | 2 +- .../Views/User/PopupsFolderCreate.html | 4 +- .../Views/User/PopupsFolderSystem.html | 4 +- .../templates/Views/User/PopupsIdentity.html | 14 +- .../Views/User/PopupsMessageOpenPgp.html | 8 +- .../Views/User/PopupsNewOpenPgpKey.html | 12 +- .../Views/User/PopupsSieveScript.html | 2 +- .../templates/Views/User/PopupsTemplate.html | 2 +- .../User/PopupsTwoFactorConfiguration.html | 12 +- .../Views/User/PopupsTwoFactorTest.html | 4 +- .../Views/User/PopupsViewOpenPgpKey.html | 4 +- .../Views/User/SettingsChangePassword.html | 47 ------ .../templates/Views/User/SettingsGeneral.html | 4 +- .../templates/Views/User/SettingsMenu.html | 4 +- .../templates/Views/User/SettingsPane.html | 2 +- .../Views/User/SettingsSecurity.html | 2 +- .../templates/Views/User/SystemDropDown.html | 4 +- tasks/css.js | 36 ++++- vendors/bootstrap/js/bootstrap.native.js | 26 ++-- vendors/bootstrap/less/code.less | 4 +- vendors/bootstrap/less/dropdowns.less | 14 +- vendors/bootstrap/less/forms.less | 91 +++-------- vendors/bootstrap/less/grid.less | 4 - vendors/bootstrap/less/mixins.less | 109 +------------ vendors/bootstrap/less/navs.less | 80 +--------- vendors/bootstrap/less/tables.less | 46 +----- vendors/bootstrap/less/type.less | 85 ++--------- vendors/bootstrap/less/variables.less | 11 -- vendors/normalize.css/normalize.css | 109 ------------- vendors/routes/crossroads.js | 24 ++- 74 files changed, 455 insertions(+), 1014 deletions(-) create mode 100644 dev/Styles/@Admin.less create mode 100644 dev/Styles/AnimationsUser.less delete mode 100644 snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html diff --git a/README.md b/README.md index 24d25a1ac..f36bd2208 100644 --- a/README.md +++ b/README.md @@ -137,11 +137,12 @@ For a user its around 65% smaller and faster than traditional RainLoop. ### CSS changes * Solve jQuery removed "features" with native css code -* Cleanup unused css * Themes work in mobile mode * Bugfix invalid/conflicting css rules * Use flexbox +* Split app.css to have seperate admin.css * Remove oldschool 'float' +* Remove unused css * Removed html.no-css * Removed dev/Styles/Cmd.less * Removed dev/Styles/Scroll.less @@ -163,10 +164,12 @@ For a user its around 65% smaller and faster than traditional RainLoop. |css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli | |------------ |-------: |-------: |------: |------: |--------: | -|app.css | 340.334 | 139.393 | 46,959 | 23.019 | 19.624 | -|app.min.css | 274.791 | 114.661 | 39.618 | 20.495 | 17.899 | -|boot.css | | 1.836 | | 795 | 630 | -|boot.min.css | | 1.492 | | 707 | 555 | +|app.css | 340.334 | 115.927 | 46,959 | 19.501 | 16.699 | +|app.min.css | 274.791 | 96.071 | 39.618 | 17.475 | 15.295 | +|boot.css | | 2.066 | | 795 | 630 | +|boot.min.css | | 1.696 | | 707 | 555 | +|admin.css | | 53.966 | | 10.376 | 9.070 | +|admin.min.css | | 43.137 | | 9.126 | 8.133 | ### Squire vs CKEditor diff --git a/dev/Styles/@Admin.less b/dev/Styles/@Admin.less new file mode 100644 index 000000000..25edfce86 --- /dev/null +++ b/dev/Styles/@Admin.less @@ -0,0 +1,44 @@ + +@import "../../vendors/bootstrap/less/variables.less"; +@import "../../vendors/bootstrap/less/mixins.less"; + +@import "_Values.less"; + +@import "../../vendors/bootstrap/less/grid.less"; +@import "../../vendors/bootstrap/less/type.less"; +@import "../../vendors/bootstrap/less/code.less"; +@import "../../vendors/bootstrap/less/forms.less"; +@import "../../vendors/bootstrap/less/tables.less"; +@import "../../vendors/bootstrap/less/dropdowns.less"; +@import "../../vendors/bootstrap/less/close.less"; +@import "../../vendors/bootstrap/less/buttons.less"; +@import "../../vendors/bootstrap/less/button-groups.less"; +@import "../../vendors/bootstrap/less/alerts.less"; +@import "../../vendors/bootstrap/less/modals.less"; +@import "../../vendors/bootstrap/less/utilities.less"; +@import "../../vendors/bootstrap/less/wells.less"; + +@import "_FontasticToBoot.less"; +@import "_BootstrapFix.less"; + +@import "Ui.less"; +@import "Main.less"; +@import "Layout.less"; +@import "Components.less"; +@import "Login.less"; +@import "Ask.less"; +@import "Languages.less"; + +@import "Admin.less"; +@import "AdminGeneral.less"; +@import "AdminBranding.less"; +@import "AdminDomains.less"; +@import "AdminDomain.less"; +@import "AdminPackages.less"; +@import "AdminPlugins.less"; +@import "AdminPlugin.less"; +@import "AdminAbout.less"; + +@import "Animations.less"; + +@import "_End.less"; diff --git a/dev/Styles/@Boot.css b/dev/Styles/@Boot.css index 9fb8fa512..d5a9aaf1c 100644 --- a/dev/Styles/@Boot.css +++ b/dev/Styles/@Boot.css @@ -1,5 +1,11 @@ +:root { + --fontSans: "DejaVu Sans", Verdana, Geneva, "Bitstream Vera Sans", "DejaVu LGC Sans", Arial, sans-serif; + --fontSerif: "Nimbus Roman No9 L", "Times New Roman", Times, FreeSerif, serif; + --fontMono: "Liberation Mono", Monaco, Menlo, Consolas, "Courier New", FreeMono, Courier, monospace; +} + html, body { - font-family: "DejaVu Sans", Verdana, Geneva, "Bitstream Vera Sans", "DejaVu LGC Sans", sans-serif; + font-family: var(--fontSans); margin: 0; padding: 0; } diff --git a/dev/Styles/@Main.less b/dev/Styles/@Main.less index c2e316051..9620cc81c 100644 --- a/dev/Styles/@Main.less +++ b/dev/Styles/@Main.less @@ -10,27 +10,27 @@ @import "../../vendors/bootstrap/less/forms.less"; @import "../../vendors/bootstrap/less/tables.less"; @import "../../vendors/bootstrap/less/dropdowns.less"; -@import "../../vendors/bootstrap/less/wells.less"; @import "../../vendors/bootstrap/less/close.less"; @import "../../vendors/bootstrap/less/buttons.less"; @import "../../vendors/bootstrap/less/button-groups.less"; @import "../../vendors/bootstrap/less/alerts.less"; -@import "../../vendors/bootstrap/less/navs.less"; @import "../../vendors/bootstrap/less/modals.less"; -@import "../../vendors/bootstrap/less/labels-badges.less"; @import "../../vendors/bootstrap/less/utilities.less"; +@import "../../vendors/bootstrap/less/navs.less"; +@import "../../vendors/bootstrap/less/labels-badges.less"; @import "_FontasticToBoot.less"; @import "_BootstrapFix.less"; -@import "_CkeFix.less"; @import "Ui.less"; @import "Main.less"; @import "Layout.less"; @import "Components.less"; -@import "SystemDropDown.less"; @import "Login.less"; @import "Ask.less"; +@import "Languages.less"; + +@import "SystemDropDown.less"; @import "Shortcuts.less"; @import "FolderList.less"; /* @@ -40,7 +40,6 @@ @import "Account.less"; */ @import "Filter.less"; -@import "Languages.less"; @import "Template.less"; @import "OpenPgpKey.less"; @import "TwoFactor.less"; @@ -53,16 +52,6 @@ @import "Compose.less"; @import "EmailAddresses.less"; -@import "Admin.less"; -@import "AdminGeneral.less"; -@import "AdminBranding.less"; -@import "AdminDomains.less"; -@import "AdminDomain.less"; -@import "AdminPackages.less"; -@import "AdminPlugins.less"; -@import "AdminPlugin.less"; -@import "AdminAbout.less"; - @import "Settings.less"; @import "SettingsGeneral.less"; @import "SettingsAccounts.less"; @@ -72,8 +61,12 @@ @import "SettingsThemes.less"; @import "SettingsFilters.less"; -@import "Animations.less"; - @import "SquireUI.less"; +@import "AnimationsUser.less"; +@import "Animations.less"; + @import "_End.less"; +/* +@import "_CkeFix.less"; +*/ diff --git a/dev/Styles/AdminAbout.less b/dev/Styles/AdminAbout.less index c9440afc4..2b2fb7a8a 100644 --- a/dev/Styles/AdminAbout.less +++ b/dev/Styles/AdminAbout.less @@ -3,14 +3,7 @@ .rl-logo { display: inline-block; width: 250px; - height: 250px; - margin-top: -10px; - margin-bottom: -10px; - background-image: url("images/snappymail-logo.png"); - } - .rl-desc { - margin-top: 20px; - margin-left: -20px; + height: 200px; + background: url("images/snappymail-logo.png") -30px -30px; } } - diff --git a/dev/Styles/AdminDomain.less b/dev/Styles/AdminDomain.less index 46231f3f3..a93c1ef9e 100644 --- a/dev/Styles/AdminDomain.less +++ b/dev/Styles/AdminDomain.less @@ -20,6 +20,7 @@ width: 1600px; height: 400px; left: 0; + transition: left 500ms ease; } &.domain-edit .modal-body { diff --git a/dev/Styles/AdminPlugins.less b/dev/Styles/AdminPlugins.less index 73e11f9f9..5bd4f2206 100644 --- a/dev/Styles/AdminPlugins.less +++ b/dev/Styles/AdminPlugins.less @@ -25,6 +25,8 @@ .b-admin-plugin-property { .help-block { + color: lighten(@textColor, 15%); // lighten the text some for contrast + display: block; // account for any element using help-block margin-bottom: 5px; } } diff --git a/dev/Styles/AdvancedSearch.less b/dev/Styles/AdvancedSearch.less index d1f4c9456..aa5de0071 100644 --- a/dev/Styles/AdvancedSearch.less +++ b/dev/Styles/AdvancedSearch.less @@ -1,12 +1,12 @@ #rl-popups { .b-advanced-search-content { &.modal { - width: 750px; + width: 780px; .control-label { - width: 100px; + width: 110px; } - .controls { - margin-left: 110px; + .span4 { + width: 360px; } } } diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less index 48548903c..20f28ce0f 100644 --- a/dev/Styles/Animations.less +++ b/dev/Styles/Animations.less @@ -1,22 +1,4 @@ -.rl-strip-animation(@rgba, @stripOpacity) { - background-image: linear-gradient(135deg, rgba(@rgba, @rgba, @rgba, @stripOpacity) 25%, transparent 25%, - transparent 50%, rgba(@rgba, @rgba, @rgba, @stripOpacity) 50%, rgba(@rgba, @rgba, @rgba, @stripOpacity) 75%, - transparent 75%, transparent); -} - -@keyframes highlight-folder-row { - 0% { transform: scale(1); } 50% { transform: scale(1.1); } 100% { transform: scale(1); } -} - -@keyframes textLoadingAnimationKeyFrame { - 0% { opacity: 1; } 33% { opacity: 0; } 100% { opacity: 1; } -} - -@keyframes animate-stripes { - 0% {background-position: 0 0;} 100% {background-position: 60px 0;} -} - @keyframes login-form-shake { 0% {transform: translateX(0);} 12.5% {transform: translateX(-6px) rotateY(-5deg)} @@ -41,14 +23,6 @@ html.rl-started-delay { } } -html { - .e-strip-animation { - background-size: 60px 60px; - .rl-strip-animation(0, 0.1); - animation: animate-stripes 2s linear infinite; - } -} - @media screen and (min-width: 1000px) { html.rl-started-trigger .b-login-content .loginFormWrapper { @@ -57,90 +31,38 @@ html { opacity: 0.5; } - html { - .b-login-content { - .alertError { - display: block; - opacity: 1; - transition: opacity 0.5s linear; - } - .alertError[hidden] { - opacity: 0; - } - } + .b-login-content .errorAnimated { + animation: login-form-shake 400ms ease-in-out; + } - .b-login-content .errorAnimated { - animation: login-form-shake 400ms ease-in-out; - } + .b-login-content .errorAnimated .buttonLogin { + color: #b94a48; + font-weight: bold; + } - .b-login-content .errorAnimated .buttonLogin { - color: #b94a48; - font-weight: bold; - } + .b-login-content .afterLoginHide { + opacity: 0; + } - .b-login-content .afterLoginHide { - opacity: 0; - } + .b-login-content .loginFormWrapper { + transition: all 0.3s ease-out; + } - .b-login-content .loginFormWrapper { - transition: all 0.3s ease-out; - } + .button-delete-transitions { + transition: all 0.2s linear; + } - & .button-delete-transitions { - transition: all 0.2s linear; - } - - & .b-folders .e-item .anim-action-class { - animation: highlight-folder-row 0.5s linear; - } - - & .b-folders .btn.buttonContacts { - transition: margin 0.3s linear; - } - - & .b-folders .b-content.opacity-on-panel-disabled { - transition: opacity 0.3s linear; - } - - & .messageList { - .messageListItem { - transition: max-height 400ms ease; - } - .listDragOver { - transition: all 400ms ease; - } - } - - & .b-list-content { - .e-contact-item { - transition: max-height 400ms ease; - } - } - - & .modal.b-domain-content { - .modal-body { - transition: left 500ms ease; - } - } - - #rl-popups > .rl-view-model .modal { - transition: all .2s ease-out; - } - #rl-popups > .rl-view-model:not(.show) .modal { - top: -25%; - } - #rl-popups > .rl-view-model .modal.fade { - opacity: 1; - } - #rl-popups > .rl-view-model:not(.show) .modal.fade { - opacity: 0; - } - - & .b-compose.loading .b-header-toolbar { - background-size: 60px 60px; - .rl-strip-animation(255, 0.2); - animation: animate-stripes 2s linear infinite; - } + #rl-popups > .rl-view-model .modal { + transition: all .2s ease-out; + } + #rl-popups > .rl-view-model:not(.show) .modal { + top: -25%; + } + #rl-popups > .rl-view-model .modal.fade { + opacity: 1; + } + #rl-popups > .rl-view-model:not(.show) .modal.fade { + opacity: 0; } } @@ -150,15 +72,3 @@ html { #rl-popups > .rl-view-model:not(.show) { background-color: rgba(0,0,0,0); } - -.textLoadingAnimationD1, .textLoadingAnimationD2, .textLoadingAnimationD3 { - animation: textLoadingAnimationKeyFrame 1s linear infinite 0s; -} - -.textLoadingAnimationD2 { - animation-delay: 0.3s; -} - -.textLoadingAnimationD3 { - animation-delay: 0.6s; -} diff --git a/dev/Styles/AnimationsUser.less b/dev/Styles/AnimationsUser.less new file mode 100644 index 000000000..af80476bf --- /dev/null +++ b/dev/Styles/AnimationsUser.less @@ -0,0 +1,83 @@ + +.rl-strip-animation(@rgba, @stripOpacity) { + background-image: linear-gradient(135deg, rgba(@rgba, @rgba, @rgba, @stripOpacity) 25%, transparent 25%, + transparent 50%, rgba(@rgba, @rgba, @rgba, @stripOpacity) 50%, rgba(@rgba, @rgba, @rgba, @stripOpacity) 75%, + transparent 75%, transparent); +} + +@keyframes highlight-folder-row { + 0% { transform: scale(1); } + 50% { transform: scale(1.1); } + 100% { transform: scale(1); } +} + +@keyframes textLoadingAnimationKeyFrame { + 0% { opacity: 1; } + 33% { opacity: 0; } + 100% { opacity: 1; } +} + +@keyframes animate-stripes { + 0% {background-position: 0 0;} + 100% {background-position: 60px 0;} +} + +html { + .e-strip-animation { + background-size: 60px 60px; + .rl-strip-animation(0, 0.1); + animation: animate-stripes 2s linear infinite; + } +} + +@media screen and (min-width: 1000px) { + + .button-delete-transitions { + transition: all 0.2s linear; + } + + .b-folders .e-item .anim-action-class { + animation: highlight-folder-row 0.5s linear; + } + + .b-folders .btn.buttonContacts { + transition: margin 0.3s linear; + } + + .b-folders .b-content.opacity-on-panel-disabled { + transition: opacity 0.3s linear; + } + + .messageList { + .messageListItem { + transition: max-height 400ms ease; + } + .listDragOver { + transition: all 400ms ease; + } + } + + .b-list-content { + .e-contact-item { + transition: max-height 400ms ease; + } + } + + .b-compose.loading .b-header-toolbar { + background-size: 60px 60px; + .rl-strip-animation(255, 0.2); + animation: animate-stripes 2s linear infinite; + } +} + +.textLoadingAnimationD1, .textLoadingAnimationD2, .textLoadingAnimationD3 { + animation: textLoadingAnimationKeyFrame 1s linear infinite 0s; +} + +.textLoadingAnimationD2 { + animation-delay: 0.3s; +} + +.textLoadingAnimationD3 { + animation-delay: 0.6s; +} diff --git a/dev/Styles/Compose.less b/dev/Styles/Compose.less index ccbbad3c9..5c3ebe33c 100644 --- a/dev/Styles/Compose.less +++ b/dev/Styles/Compose.less @@ -45,7 +45,7 @@ height: 40px; color: #fff; - background-color: rgba(0,0,0,0.8) !important; + background-color: rgba(0,0,0,0.8); .close, .minimize-custom { opacity: 1; @@ -123,7 +123,7 @@ padding: 2px 0; textarea, input[type="text"] { - width: 98%; + width: 100%; } textarea { height: 40px; diff --git a/dev/Styles/Contacts.less b/dev/Styles/Contacts.less index 6db6fd56e..3fd3b1811 100644 --- a/dev/Styles/Contacts.less +++ b/dev/Styles/Contacts.less @@ -4,10 +4,11 @@ .b-contacts-content { .control-group { - .control-label.fix-width { + .control-label { + padding-top: 0; width: 50px; } - .controls.fix-width { + .controls { margin-left: 70px; } } @@ -32,11 +33,9 @@ .b-header-toolbar { - height: 40px; - + background-color: rgba(0,0,0,0.8); color: #fff; - - background-color: rgba(0,0,0,0.8) !important; + height: 40px; .close { color: #fff; @@ -119,8 +118,7 @@ // } .e-contact-item { - position: relative; - height: 45px; + display: flex; max-height: 45px; line-height: 45px; overflow: hidden; @@ -129,7 +127,6 @@ margin: 0; border: 0; border-left: 6px solid #eee; - z-index: 100; border-bottom: 1px solid #ddd; &.focused { @@ -142,39 +139,21 @@ } .checkboxItem { - display: inline-block; - float: left; - padding: 0 8px 0 6px; line-height: 45px; + padding: 0 8px 0 6px; } .nameParent { - display: block; - overflow: hidden; - text-overflow: ellipsis; color: #333; font-size: 16px; - } - - .nameParent, .emailParent { - white-space: nowrap; - } - - .displayName, .displayEmail { overflow: hidden; text-overflow: ellipsis; - } - - .displayImg { - display: inline-block; - float: right; - position: relative; - margin: 0 5px; + white-space: nowrap; + width: 100%; } &.checked { border-left-color: #69A8F5; - z-index: 101; &.focused { border-left-color: darken(#69A8F5, 5%); @@ -185,7 +164,6 @@ background-color: #fff; border-left-color: #398CF2; - z-index: 102; &.focused { border-left-color: darken(#398CF2, 5%); @@ -365,7 +343,6 @@ margin: 0; border: 0; - z-index: 100; border-bottom: 1px solid #ddd; } } diff --git a/dev/Styles/Identity.less b/dev/Styles/Identity.less index ef06d4e06..456911fb5 100644 --- a/dev/Styles/Identity.less +++ b/dev/Styles/Identity.less @@ -2,21 +2,13 @@ .b-identity-content { &.modal { - width: 800px; + width: 770px; } .modal-body { overflow: hidden; } - .control-label { - width: 100px; - } - - .controls { - margin-left: 120px; - } - .e-signature-place { border: 1px solid #ccc; border-radius: 3px; diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less index 3c8078689..610e147af 100644 --- a/dev/Styles/Login.less +++ b/dev/Styles/Login.less @@ -61,7 +61,7 @@ padding-left: 12px; padding-right: 12px; } - .inputEmail, .inputPassword { + .inputEmail, .inputLogin, .inputPassword { padding-right: 35px; } @@ -145,6 +145,12 @@ left: 0; right: 0; z-index: 1; + display: block; + opacity: 1; + transition: opacity 0.5s linear; + } + .alert[hidden] { + opacity: 0; } .flag-selector { diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less index bcdc35598..62ba75249 100644 --- a/dev/Styles/Main.less +++ b/dev/Styles/Main.less @@ -46,10 +46,6 @@ option:disabled { -webkit-tap-highlight-color: rgba(0,0,0,0); } -input[type="search"]{ - box-sizing: content-box; -} - .button-confirm-delete { margin-right: 15px; opacity: 0; diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less index 42c9c14e7..74298578d 100644 --- a/dev/Styles/MessageList.less +++ b/dev/Styles/MessageList.less @@ -100,7 +100,7 @@ html.rl-no-preview-pane { } .inputSearch { - width: calc(100% - 14px); + width: 100%; } } } diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less index 57318b9ff..a0aa32218 100644 --- a/dev/Styles/MessageView.less +++ b/dev/Styles/MessageView.less @@ -1,4 +1,8 @@ +.g-ui-min-height-300 { + min-height: 300px; +} + .messageView { z-index: 100; @@ -344,7 +348,6 @@ .bodyText { color: #000; - font-family: Arial, Verdana, Geneva, sans-serif; .b-text-part { @@ -404,7 +407,7 @@ } img[data-x-src]:not([src]):hover::after { content: attr(data-x-src); - font-family: sans-serif; + font-family: var(--fontSans); height: auto; transform: translate(-25%,0); width: auto; @@ -420,7 +423,7 @@ background: #fff; border: none; border-radius: 0; - font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; + font-family: var(--fontMono); display: block; word-break: normal; word-wrap: break-word; @@ -447,14 +450,14 @@ padding: 15px; /*white-space: pre-wrap;*/ - font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; + font-family: var(--fontMono); pre { margin: 0; padding: 0; background: #fff; border: none; - font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; + font-family: var(--fontMono); display: block; word-break: normal; } @@ -497,7 +500,6 @@ display: inline-block; cursor: pointer; color: #777; - /*float: left;*/ &:hover { color: #111; diff --git a/dev/Styles/OpenPgpKey.less b/dev/Styles/OpenPgpKey.less index 7b152eeb3..ff3e4ae22 100644 --- a/dev/Styles/OpenPgpKey.less +++ b/dev/Styles/OpenPgpKey.less @@ -6,7 +6,7 @@ } .inputKey { - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + font-family: var(--fontMono); } .key-viewer { @@ -25,8 +25,6 @@ background-color: #f9f9f9; border-radius: 5px; padding: 10px 15px; - margin-top: 10px; - min-height: 40px; &-wrp { @@ -51,6 +49,7 @@ color: #333; white-space: nowrap; padding-bottom: 4px; + display: flex; &:last-child { padding-bottom: 0; @@ -66,6 +65,7 @@ &-names { color: #333; + width: 80%; &.empty { color: red; @@ -79,10 +79,12 @@ &-error { color: red; + width: 80%; } &-hash { color: #aaa; + width: 20%; } } } diff --git a/dev/Styles/SettingsFilters.less b/dev/Styles/SettingsFilters.less index 9597896fd..afca4b2c3 100644 --- a/dev/Styles/SettingsFilters.less +++ b/dev/Styles/SettingsFilters.less @@ -33,5 +33,5 @@ .b-filter-script textarea { height: 300px; - font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; + font-family: var(--fontMono); } diff --git a/dev/Styles/SystemDropDown.less b/dev/Styles/SystemDropDown.less index bb4e31e61..3d17e9692 100644 --- a/dev/Styles/SystemDropDown.less +++ b/dev/Styles/SystemDropDown.less @@ -1,5 +1,6 @@ #top-system-dropdown-id { + overflow: hidden; padding-left: 10px; padding-right: 10px; } @@ -20,11 +21,6 @@ z-index: 103; } - .dropdown-menu { - right: 0; - left: auto; - } - .email-title { display: inline-block; max-width: 200px; diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less index c2fe005c3..1402999e2 100644 --- a/dev/Styles/Ui.less +++ b/dev/Styles/Ui.less @@ -19,10 +19,6 @@ } } -.g-ui-min-height-300 { - min-height: 300px; -} - .g-ui-menu { max-height: 400px; max-width: 300px; diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index ff525f591..8c0fa37c9 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -19,18 +19,14 @@ label.inline, span.inline { border-bottom: 1px solid #e5e5e5; small { - font-size: @baseLineHeight * .75; - color: @grayLight; + font-size: @baseLineHeight * .75; + color: @grayLight; } } .legend + .control-group { - margin-top: @baseLineHeight; - -webkit-margin-top-collapse: separate; -} - -.input-append input, .input-append select { - border-radius: 3px; + margin-top: @baseLineHeight; + -webkit-margin-top-collapse: separate; } .btn-small.btn-small-small { @@ -46,12 +42,6 @@ label.inline, span.inline { padding: 4px 7px; } -.btn.btn-ellipsis { - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; -} - .btn.btn-transparent { background: none !important; border-color: transparent !important; @@ -102,20 +92,8 @@ label.inline, span.inline { } } -input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) { - height: @baseLineHeight - (@rlInputBorderSize - 1) * 2; - line-height: @baseLineHeight - (@rlInputBorderSize - 1) * 2; -} - .alert a { text-decoration: underline; -} - -.alert.alert-null-left-margin { - margin-left: 0; -} - -.alert a { color: #c09853; } @@ -127,21 +105,10 @@ input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) { color: #b94a48; } -.nav-tabs > li > a { - color: #555; -} - .form-horizontal.long-label .control-group { .control-label { width: 160px; } - .controls { - margin-left: 180px; - } -} - -.control-label.remove-padding-top { - padding-top: 0; } /* mobile and tablet */ @@ -160,10 +127,9 @@ input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) { .control-group { .control-label { text-align: left; - float: none; } .controls { - margin-left: 0; + margin-left: 10px; } } } diff --git a/dev/Styles/_CkeFix.less b/dev/Styles/_CkeFix.less index e7ff0b545..3a1349013 100644 --- a/dev/Styles/_CkeFix.less +++ b/dev/Styles/_CkeFix.less @@ -64,7 +64,7 @@ } .cke_source { - font-family: Monaco, Menlo, Consolas, 'Courier New', monospace !important; + font-family: var(--fontMono) !important; padding: 10px !important; padding-right: 0 !important; box-shadow: none !important; @@ -82,7 +82,7 @@ padding: 10px; padding-right: 0; white-space: pre-wrap; - font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; + font-family: var(--fontMono), monospace; font-size: 13px; line-height: 16px; color: #333; @@ -107,7 +107,7 @@ .cke_wysiwyg_div { padding: 10px !important; - font-family: arial, sans-serif; + font-family: var(--fontSans); font-size: 13px; line-height: 16px; color: #333; @@ -132,7 +132,7 @@ background: #fff; border: none; border-radius: 0; - font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; + font-family: var(--fontMono); display: block; word-break: normal; word-wrap: break-word; diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less index cfa38be41..3b7c98b83 100644 --- a/dev/Styles/_FontasticToBoot.less +++ b/dev/Styles/_FontasticToBoot.less @@ -97,6 +97,6 @@ } .fontastic.icon-spinner { - text-indent: -1em; + text-indent: -5em; overflow: hidden; } diff --git a/release.php b/release.php index 8fbc9223f..bda705637 100755 --- a/release.php +++ b/release.php @@ -99,6 +99,7 @@ if ($gzip = trim(`which gzip`)) { echo "\x1b[33;1m === Gzip *.js and *.css === \x1b[0m\n"; passthru("{$gzip} -k --best {$cmddir}/js/*.js"); passthru("{$gzip} -k --best {$cmddir}/js/min/*.js"); + passthru("{$gzip} -k --best {$cmddir}/css/admin*.css"); passthru("{$gzip} -k --best {$cmddir}/css/app*.css"); unlink(__DIR__ . '/snappymail/v/0.0.0/static/js/boot.js.gz'); unlink(__DIR__ . '/snappymail/v/0.0.0/static/js/min/boot.min.js.gz'); @@ -108,6 +109,7 @@ if ($brotli = trim(`which brotli`)) { echo "\x1b[33;1m === Brotli *.js and *.css === \x1b[0m\n"; passthru("{$brotli} -k --best {$cmddir}/js/*.js"); passthru("{$brotli} -k --best {$cmddir}/js/min/*.js"); + passthru("{$brotli} -k --best {$cmddir}/css/admin*.css"); passthru("{$brotli} -k --best {$cmddir}/css/app*.css"); unlink(__DIR__ . '/snappymail/v/0.0.0/static/js/boot.js.br'); unlink(__DIR__ . '/snappymail/v/0.0.0/static/js/min/boot.min.js.br'); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php index c50776076..622af6070 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php @@ -230,7 +230,7 @@ class Service '{{BaseAppBodyScript}}' => '', '{{BaseAppFaviconPngLinkTag}}' => $sFaviconPngLink ? '' : '', '{{BaseAppFaviconTouchLinkTag}}' => $sAppleTouchLink ? '' : '', - '{{BaseAppMainCssLink}}' => $this->staticPath('css/app'.($bAppCssDebug ? '' : '.min').'.css'), + '{{BaseAppMainCssLink}}' => $this->staticPath('css/'.($bAdmin ? 'admin' : 'app').($bAppCssDebug ? '' : '.min').'.css'), '{{BaseAppThemeCssLink}}' => $this->oActions->ThemeLink($sTheme, $bAdmin), '{{BaseAppPolyfillsScriptLink}}' => '', '{{BaseAppBootScriptLink}}' => $this->staticPath('js/'.($bAppJsDebug ? '' : 'min/').'boot'.($bAppJsDebug ? '' : '.min').'.js'), diff --git a/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml b/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml index 1be52136c..7bcbe88fa 100644 --- a/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml +++ b/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml @@ -103,7 +103,7 @@ nl_NL: TAB_ABOUT: LEGEND_ABOUT: "Over" LABEL_TAG_HINT: "Simpel, modern en snelle web-based e-mail client" - LABEL_ALL_RIGHTS_RESERVED: "Alle rechten gereserveerd." + LABEL_ALL_RIGHTS_RESERVED: "Alle rechten voorbehouden." POPUPS_DOMAIN_ALIAS: TITLE_ADD_DOMAIN_ALIAS: "Voeg alias toe" LABEL_ALIAS: "Alias" diff --git a/snappymail/v/0.0.0/app/localization/webmail/nl_NL.yml b/snappymail/v/0.0.0/app/localization/webmail/nl_NL.yml index 208f3fbf0..b232b8bb8 100644 --- a/snappymail/v/0.0.0/app/localization/webmail/nl_NL.yml +++ b/snappymail/v/0.0.0/app/localization/webmail/nl_NL.yml @@ -192,7 +192,7 @@ nl_NL: ATTACHMENTS_UPLOAD_ERROR_DESC: "Toevoegen van bijlage(n) is nog niet gereed" BUTTON_REQUEST_READ_RECEIPT: "Leesbevestiging vragen" BUTTON_MARK_AS_IMPORTANT: "Markeer als belangrijk" - BUTTON_OPEN_PGP: "OpenPGP (allen bij Platte Tekst)" + BUTTON_OPEN_PGP: "OpenPGP (alleen bij Platte Tekst)" BUTTON_REQUEST_DSN: "Ontvangstbevestiging vragen" POPUPS_ASK: BUTTON_YES: "Ja" diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html index b0455dd94..b50304912 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html @@ -1,6 +1,6 @@
-
+
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html index 9318832e5..79bf048fb 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html @@ -10,12 +10,12 @@
- + - +
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html index 4d83c308b..398fa1c2c 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html @@ -4,13 +4,13 @@
- -
+

SnappyMail

An advanced fork of RainLoop

diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html index 6864777d8..507062b36 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html @@ -45,7 +45,7 @@
-
+

mysql:host=127.0.0.1;port=3306;dbname=rainloop
pgsql:host=127.0.0.1;port=5432;dbname=rainloop @@ -79,7 +79,7 @@ pgsql:host=127.0.0.1;port=5432;dbname=rainloop

-
+


diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html index bc9fb6539..973f7fb7f 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html @@ -17,7 +17,7 @@
-
+
@@ -99,7 +99,7 @@ }">
-
+
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html index 0bbd32a4d..d7e6e2157 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html @@ -215,8 +215,8 @@
-
- +
+
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html index 33a7ac233..b638fb3ed 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html +++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html @@ -1,9 +1,7 @@
-

- -

+

diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html index 145cf30fd..c76a3ed20 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html @@ -4,7 +4,7 @@ data-bind="visible: '' !== loadingDesc">
-