diff options
| -rwxr-xr-x | css/mail.css | 4 | ||||
| -rw-r--r-- | js/templates/account.html | 42 | ||||
| -rw-r--r-- | js/tests/integration/app_start_spec.js | 4 | ||||
| -rw-r--r-- | templates/index.php | 4 |
4 files changed, 22 insertions, 32 deletions
diff --git a/css/mail.css b/css/mail.css index decbd5999..f5db43a9f 100755 --- a/css/mail.css +++ b/css/mail.css @@ -148,10 +148,8 @@ z-index: 1; } -#app-navigation > ul { +#app-navigation-accounts { height: calc(100% - 65px); -} -#app-navigation > ul { overflow-x: hidden; } diff --git a/js/templates/account.html b/js/templates/account.html index 7e3437d05..4c592cc6e 100644 --- a/js/templates/account.html +++ b/js/templates/account.html @@ -4,30 +4,26 @@ <h2 class="mail-account-email" title="{{emailAddress}}">{{emailAddress}}</h2> {{#if hasMenu}} -<div class="app-navigation-entry-utils"> - <ul> - <li class="app-navigation-entry-utils-menu-button svg"><button></button></li> - </ul> -</div> +<ul class="app-navigation-entry-utils"> + <li class="app-navigation-entry-utils-menu-button svg"><button></button></li> +</ul> -<div class="app-navigation-entry-menu popovermenu bubble menu"> - <ul> - <li> - <a href="#" class="menuitem action action-settings permanent" data-action="Settings"> - <span class="icon icon-rename"></span> - <span>{{ t 'Settings' }}</span> - </a> - </li> - {{#if isDeletable}} - <li> - <a href="#" class="menuitem action action-delete permanent" data-action="Delete"> - <span class="icon icon-delete"></span> - <span>{{ t 'Delete account' }}</span> - </a> - </li> - {{/if}} - </ul> -</div> +<ul class="app-navigation-entry-menu popovermenu bubble menu"> + <li> + <a href="#" class="menuitem action action-settings permanent" data-action="Settings"> + <span class="icon icon-rename"></span> + <span>{{ t 'Settings' }}</span> + </a> + </li> + {{#if isDeletable}} + <li> + <a href="#" class="menuitem action action-delete permanent" data-action="Delete"> + <span class="icon icon-delete"></span> + <span>{{ t 'Delete account' }}</span> + </a> + </li> + {{/if}} +</ul> {{/if}} <div class="folders with-icon"></div> diff --git a/js/tests/integration/app_start_spec.js b/js/tests/integration/app_start_spec.js index 51202b38d..840cf56bf 100644 --- a/js/tests/integration/app_start_spec.js +++ b/js/tests/integration/app_start_spec.js @@ -41,9 +41,7 @@ define([ + '<div id="app">' + ' <div id="app-navigation" class="icon-loading">' + ' <div id="mail-new-message-fixed"></div>' - + ' <ul>' - + ' <li id="app-navigation-accounts"></li>' - + ' </ul>' + + ' <div id="app-navigation-accounts"></div>' + ' <div id="app-settings">' + ' <div id="app-settings-header">' + ' <button class="settings-button" data-apps-slide-toggle="#app-settings-content"><?php p($l->t("Settings"));?></button>' diff --git a/templates/index.php b/templates/index.php index ac3354489..f0a75f736 100644 --- a/templates/index.php +++ b/templates/index.php @@ -40,9 +40,7 @@ script('mail', 'build/build'); <div id="app"> <div id="app-navigation" class="icon-loading"> <div id="mail-new-message-fixed"></div> - <ul> - <li id="app-navigation-accounts"></li> - </ul> + <div id="app-navigation-accounts"></div> <div id="app-settings"> <div id="app-settings-header"> <button class="settings-button" |