diff --git a/dev/Common/Links.js b/dev/Common/Links.js index de9468206..d2a197cb3 100644 --- a/dev/Common/Links.js +++ b/dev/Common/Links.js @@ -23,18 +23,13 @@ export function root(startupUrl = '') { return HASH_PREFIX + pString(startupUrl); } -/** - * @returns {string} - */ -export function rootAdmin() { - return Settings.app('adminHostUse') ? ROOT : SERVER_PREFIX + (Settings.app('adminPath') || 'admin'); -} - /** * @returns {string} */ export function logoutLink() { - return rl.adminArea() ? rootAdmin() : ROOT; + return (rl.adminArea() && !Settings.app('adminHostUse')) + ? SERVER_PREFIX + (Settings.app('adminPath') || 'admin') + : ROOT; } /** diff --git a/dev/Styles/SquireUI.less b/dev/Styles/SquireUI.less index 6088d037b..94d58d584 100644 --- a/dev/Styles/SquireUI.less +++ b/dev/Styles/SquireUI.less @@ -10,7 +10,7 @@ .squire-toolbar select { font-size: 12px; - padding-left: 0; + padding: 4px 1.5em 4px 6px; text-align: left; vertical-align: middle; width: 7em; @@ -18,6 +18,9 @@ .squire-toolbar select[data-action="fontSize"] { width: 5em; } +.squire-toolbar button { + font-family: snappymail, var(--fontSans) +} .squire-toolbar button[data-action="bold"] { font-weight: bold; } diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index 548582e44..943cedf59 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -20,7 +20,6 @@ import { decorateKoCommands, showScreenPopup } from 'Knoin/Knoin'; import { AbstractViewCenter } from 'Knoin/AbstractViews'; import { Settings } from 'Common/Globals'; -import { rootAdmin } from 'Common/Links'; import { LanguagesPopupView } from 'View/Popup/Languages'; @@ -161,8 +160,6 @@ class LoginUserView extends AbstractViewCenter { this.submitRequest(false); setTimeout(() => this.querySelector('.inputAdditionalCode').focus(), 100); - } else if (oData.Admin) { - setTimeout(() => location.href = rootAdmin(), 100); } else { rl.route.reload(); } diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html index 30f07f0f3..21b07a0a8 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html @@ -64,14 +64,12 @@ -