diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less index 709deecc6..3c8078689 100644 --- a/dev/Styles/Login.less +++ b/dev/Styles/Login.less @@ -39,7 +39,7 @@ margin: 0; } - .input-append .add-on i, + .input-append .add-on *, .loginForm, .legend, .e-checkbox-icon, .g-ui-link, .language-button { color: var(--login-color, @glass-m-color); text-shadow: none !important; @@ -99,7 +99,7 @@ } &.error { - .input-append .add-on i { + .input-append .add-on * { color: @glass-error-color; } @@ -123,20 +123,15 @@ border: 0; } - .input-append .add-on i { + .input-append .add-on * { font-size: 17px; line-height: 29px; outline: none !important; box-shadow: none !important; - - &.login-submit-icon{ - font-size: 24px; - padding-top: 2px; - cursor: pointer; - } } - .controls.error .add-on i, .control-group.error .add-on i { + .controls.error .add-on *, + .control-group.error .add-on * { color: #b94a48; } } @@ -181,19 +176,10 @@ .submitting-pane { position: relative; - &.submitting:before{ - content: ''; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: var(---spinner-bg, rgba(0,0,0,.3)); - border-radius: var(--login-border-radius, 7px); - z-index: 1051; - border-radius: 8px; + &.submitting > * { + opacity: 0.3; } - html &.submitting:after{ + html &.submitting::after{ content: ''; position: absolute; width: 60px; 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 ceebbb090..b0455dd94 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 @@ -26,9 +26,7 @@ data-bind="textInput: password, disable: submitRequest" /> 🔑 - + diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html index 171818c75..e67d3034a 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html @@ -1,11 +1,7 @@
- - - - - - + +

SnappyMail -

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 b7d7ff4d8..145cf30fd 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 @@ -39,9 +39,7 @@ 🔑 - +
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index 945f63f38..e3300a579 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -4,12 +4,8 @@
- - - - - - + + 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 4a9fe84fd..46284faa7 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 @@ -19,12 +19,8 @@ 🗑
- - - - - - + +
@@ -164,9 +160,7 @@
- - - + ! diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html index dfba86438..fe63f3c5b 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html @@ -1,15 +1,11 @@
-
- - - -
- - - + +
+
+
diff --git a/snappymail/v/0.0.0/themes/Clear/styles.less b/snappymail/v/0.0.0/themes/Clear/styles.less index cda017b32..9bdcc2f75 100644 --- a/snappymail/v/0.0.0/themes/Clear/styles.less +++ b/snappymail/v/0.0.0/themes/Clear/styles.less @@ -1,5 +1,4 @@ :root { - --spinner-background: rgba(255,255,255,.4); --spinner-color: #666; } diff --git a/snappymail/v/0.0.0/themes/Squares/styles.less b/snappymail/v/0.0.0/themes/Squares/styles.less index c71d24eee..3e360cef0 100644 --- a/snappymail/v/0.0.0/themes/Squares/styles.less +++ b/snappymail/v/0.0.0/themes/Squares/styles.less @@ -15,8 +15,6 @@ --login-border: none; --login-border-radius: 7px; - --spinner-background: rgba(0,0,0,.2); - // MENU --dropdown-menu-color: #333; --dropdown-menu-bg-color: #fff; diff --git a/snappymail/v/0.0.0/themes/Wood/styles.less b/snappymail/v/0.0.0/themes/Wood/styles.less index 0d3a18473..cbfe54eef 100644 --- a/snappymail/v/0.0.0/themes/Wood/styles.less +++ b/snappymail/v/0.0.0/themes/Wood/styles.less @@ -15,7 +15,6 @@ --login-border: none; --login-border-radius: 7px; - --spinner-background: rgba(255,255,255,.4); --spinner-color: #666; // MENU diff --git a/snappymail/v/0.0.0/themes/example.css b/snappymail/v/0.0.0/themes/example.css index 3e7471e08..97e580968 100644 --- a/snappymail/v/0.0.0/themes/example.css +++ b/snappymail/v/0.0.0/themes/example.css @@ -20,7 +20,6 @@ --login-gradient-start: none; // #f4f4f4 --login-gradient-end: none; // #dfdfdf - --spinner-background: rgba(0,0,0,.3); --spinner-color: #fff; // MENU diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff index 041869641..3838b104d 100644 Binary files a/vendors/fontastic/fonts/snappymail.woff and b/vendors/fontastic/fonts/snappymail.woff differ diff --git a/vendors/fontastic/fonts/snappymail.woff2 b/vendors/fontastic/fonts/snappymail.woff2 index 42460a702..5e10a4270 100644 Binary files a/vendors/fontastic/fonts/snappymail.woff2 and b/vendors/fontastic/fonts/snappymail.woff2 differ diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css index c9508a1d4..30390d3de 100644 --- a/vendors/fontastic/styles.css +++ b/vendors/fontastic/styles.css @@ -94,17 +94,11 @@ .icon-popup::before { content: "\e045"; } -.icon-left-middle::before { - content: "\e04b"; /* ❮ */ -} -.icon-right-middle::before { - content: "\e04c"; /* ❯ */ -} .icon-mail::before { content: "✉"; } .icon-archive::before { - content: "\e05f"; + content: "\e05f"; /* 🗃 🗄️ */ } .icon-filter::before { content: "\e061"; /* ⊆ */ @@ -130,146 +124,3 @@ .icon-check-mark-circle-two::before { content: "\e073"; } -/* -.icon-sync::before { - content: "⇆"; -} -.icon-radio-checked::before { - content: "⦿"; -} -.icon-radio-unchecked::before { - content: "○"; -} -.icon-address-book::before { - content: "📇"; -} -.icon-list::before { - content: "☰"; -} -.icon-telephone::before { - content: "📞"; -} -.icon-braille::before { - content: "⬍"; -} -.icon-checkbox-checked::before { - content: "☑"; -} -.icon-checkbox-unchecked::before { - content: "☐"; -} -.icon-checkbox-partial::before { - content: "▣"; -} -.icon-left::before { - content: "⬅"; -} -.icon-up::before { - content: "⬆"; -} -.icon-down::before { - content: "⬇"; -} -.icon-image::before { - content: "🖼"; -} -.icon-user::before { - content: "👤"; -} -.icon-fire::before { - content: "🔥"; -} -.icon-remove::before { - content: "✖"; -} -.icon-floppy::before { - content: "💾"; -} -.icon-right-dir::before { - content: "▶"; -} -.icon-play::before { - content: "▶️"; ⏵ ⏯ -} -.icon-key::before { - content: "🔑"; -} -.icon-world::before { - content: "🌍"; -} -.icon-eye::before { - content: "👁"; -} -.icon-power::before { - content: "⏻"; -} -.icon-wrench::before { - content: "🔧"; -} -.icon-print::before { - content: "🖨"; -} -.icon-cog::before { - content: "⚙"; -} -.icon-forward::before { - content: "→"; -} -.icon-search::before { - content: "🔎"; -} -.icon-reply::before { - content: "←"; -} -.icon-reply-all::before { - content: "↞"; -} -.icon-mobile::before { - content: "📱"; -} -.icon-pencil::before { - content: "🖉"; -} -.icon-trash::before { - content: "🗑"; -} -.icon-lock::before { - content: "🔒"; -} -.icon-users::before { - content: "👥"; -} -.icon-ellipsis-alt::before { - content: "⋮"; -} -.icon-pause::before { - content: "⏸︎"; -} -.icon-laptop::before { - content: "💻"; -} -.icon-at::before { - content: "@"; -} -.icon-warning::before { - content: "⚠"; -} -.icon-spinner::before { - content: "\e05e"; -} -.icon-folder::before { - content: "📁"; -} -.icon-plus::before { - content: "✚"; -} -.icon-star-empty::before { - content: "☆"; -} -.icon-star-half::before { - content: "⯪"; -} -.icon-star::before { - content: "★"; -} -*/