From 57158bd55af8128c5e7dac19e81565086578d651 Mon Sep 17 00:00:00 2001 From: djmaze Date: Mon, 8 Feb 2021 21:19:58 +0100 Subject: [PATCH] Less float & less html is mobile view profit --- dev/Styles/Animations.less | 8 ---- dev/Styles/Contacts.less | 2 +- dev/Styles/FolderList.less | 19 ++------ dev/Styles/Languages.less | 18 +++++--- dev/Styles/SystemDropDown.less | 2 - dev/Styles/_BootstrapFix.less | 4 -- dev/View/User/AbstractSystemDropDown.js | 9 ++++ .../Views/Common/PopupsLanguages.html | 5 +-- .../Views/User/MailFolderListItem.html | 1 - .../Views/User/MailFolderListSystemItem.html | 1 - .../templates/Views/User/MailMessageList.html | 8 +--- .../templates/Views/User/MailMessageView.html | 45 ++++++++----------- .../templates/Views/User/PopupsContacts.html | 21 +++++---- .../templates/Views/User/SystemDropDown.html | 11 +++-- vendors/bootstrap/less/button-groups.less | 2 +- vendors/bootstrap/less/dropdowns.less | 2 +- vendors/bootstrap/less/navs.less | 4 +- 17 files changed, 71 insertions(+), 91 deletions(-) diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less index 8d82d37b6..a19d87b4b 100644 --- a/dev/Styles/Animations.less +++ b/dev/Styles/Animations.less @@ -9,10 +9,6 @@ 0% { transform: scale(1); } 50% { transform: scale(1.1); } 100% { transform: scale(1); } } -@keyframes bounce-me { - 0% { transform: scale(1); } 50% { transform: scale(1.2); } 100% { transform: scale(1); } -} - @keyframes textLoadingAnimationKeyFrame { 0% { opacity: 1; } 33% { opacity: 0; } 100% { opacity: 1; } } @@ -93,10 +89,6 @@ html.no-mobile { opacity: 0; } - .btn-group.dropdown.colored-toggle.open .animate-this-icon-on-open { - animation: bounce-me .5s linear; - } - .b-login-content .loginFormWrapper { transition: all 0.3s ease-out; } diff --git a/dev/Styles/Contacts.less b/dev/Styles/Contacts.less index be257cd00..0098c4dff 100644 --- a/dev/Styles/Contacts.less +++ b/dev/Styles/Contacts.less @@ -230,7 +230,7 @@ right: 0; left: @contacts-popup-left-width; height: 31px; - text-align: center; + text-align: right; box-shadow: inset 0 -1px 0 #ccc; .button-save-contact { diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less index 62cd8063c..6ebd5b4a6 100644 --- a/dev/Styles/FolderList.less +++ b/dev/Styles/FolderList.less @@ -1,5 +1,5 @@ -@folderItemPadding: 10px; +@folderItemPadding: 7px; @subPadding: 15px; .b-folders { @@ -86,17 +86,7 @@ color: var(--folders-disabled-color, #666); cursor: not-allowed; font-size: 14px; - - .focused-poiner { - float: left; - display: inline-block; - background-color: transparent; - height: 100%; - width: 3px; - position: absolute; - top: 0; - left: 0; - } + border-left: 3px solid transparent; .inbox-star-icon { display: none; @@ -157,10 +147,7 @@ &.focused { background-color: #888; - - .focused-poiner { - background-color: #fff; - } + border-left-color: #fff; } &.system { diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less index e1b15214f..e85af4007 100644 --- a/dev/Styles/Languages.less +++ b/dev/Styles/Languages.less @@ -21,15 +21,23 @@ background-color: #fff; text-align: left; border: 1px solid transparent; - border-radius: 2px; + border-radius: 3px; + position: relative; &.user { - background-color: #fffddd; - border-color: #fff555; + background-color: #ffd; + border-color: #ff5; } &.selected { - background-color: #f5f5f5; - border-color: #ccc; + background-color: #efe; + border-color: #9c9; + } + &.selected::after { + content: "✔"; + color: #080; + position: absolute; + right: 4px; + font-family: snappymail; } &:hover { background-color: #eee; diff --git a/dev/Styles/SystemDropDown.less b/dev/Styles/SystemDropDown.less index 8df3d1344..bb4e31e61 100644 --- a/dev/Styles/SystemDropDown.less +++ b/dev/Styles/SystemDropDown.less @@ -7,8 +7,6 @@ .rl-left-panel-disabled #more-list-dropdown-id + .dropdown-menu { position: fixed; top: 40px; - right: auto; - left: 0; } .b-system-drop-down { diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 847e9edc5..165480193 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -81,10 +81,6 @@ label.inline, span.inline { } } -.btn-group.btn-group-custom-margin > .btn + .btn { - margin-left: 0; -} - .btn { // &:active { // .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.3), 0 0 0 rgba(0,0,0,.1)"); diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js index 44db97f6e..ea53432d3 100644 --- a/dev/View/User/AbstractSystemDropDown.js +++ b/dev/View/User/AbstractSystemDropDown.js @@ -10,6 +10,7 @@ import { AbstractViewRight } from 'Knoin/AbstractViews'; import { KeyboardShortcutsHelpPopupView } from 'View/Popup/KeyboardShortcutsHelp'; import { AccountPopupView } from 'View/Popup/Account'; +import { ContactsPopupView } from 'View/Popup/Contacts'; import { Settings } from 'Common/Globals'; @@ -35,6 +36,8 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight { capaAdditionalAccounts: Settings.capa(Capa.AdditionalAccounts) }); + this.allowContacts = !!AppStore.contactsIsAllowed(); + this.addAccountClick = this.addAccountClick.bind(this); addEventListener('audio.stop', () => AppStore.currentAudio('')); @@ -76,6 +79,12 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight { } } + contactsClick() { + if (this.allowContacts) { + showScreenPopup(ContactsPopupView); + } + } + logoutClick() { rl.app.logout(); } 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 33e45534b..537be61b0 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 @@ -8,9 +8,8 @@
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html index 25d2b72ef..53a07d0c6 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html @@ -3,7 +3,6 @@ css: { 'i-am-inbox': isInbox, 'selected': selected() && !isSystemFolder(), 'selectable': canBeSelected, 'hidden' : hidden, 'print-count': hasUnreadMessages, 'unread-sub': hasSubscribedUnreadMessagesSubfolders, 'system': isSystemFolder, 'anim-action-class': actionBlink }"> -
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html index a7055b613..eb5d70f4f 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html @@ -2,7 +2,6 @@   - 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 28118d083..d43a9fdc9 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 @@ -14,20 +14,17 @@ -
 
-
 
-
 
@@ -50,7 +47,6 @@
-
 
@@ -72,9 +68,9 @@
- + -
-
 
-
- -
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 c19a90f76..775ca8a48 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 @@ -41,15 +41,20 @@ - - - +