Merge pull request #32529 from KevinGrandon/bug_1215371_email_menu_bu…

…ttons Bug 1215371 - [Email] Wrap last menu button in span to match building block changes
mozilla-b2g · Oct 20, 2015 · 3491a49 · 3491a49
2 parents 22c7651 + 41904e0
commit 3491a49
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/apps/email/js/cards/cmp/contact_menu.html b/apps/email/js/cards/cmp/contact_menu.html
@@ -1,11 +1,13 @@
 <form class="cmp-contact-menu" role="dialog" data-type="action">
   <header></header>
-   <menu>
-     <button class="cmp-contact-menu-edit" data-l10n-id="message-edit-menu-edit">
+  <menu>
+    <button class="cmp-contact-menu-edit" data-l10n-id="message-edit-menu-edit">
     </button>
-     <button class="cmp-contact-menu-delete" data-l10n-id="message-edit-menu-delete">
+    <button class="cmp-contact-menu-delete" data-l10n-id="message-edit-menu-delete">
     </button>
-     <button class="cmp-contact-menu-cancel" data-l10n-id="message-multiedit-cancel">
-    </button>
-  </menu>
+    <span class="last-button-container">
+      <button class="cmp-contact-menu-cancel" data-l10n-id="message-multiedit-cancel">
+      </button>
+    </span>
+  </menu>
 </form>
diff --git a/apps/email/js/cards/cmp/draft_menu.html b/apps/email/js/cards/cmp/draft_menu.html
@@ -2,6 +2,8 @@
   <menu>
     <button id="cmp-draft-save" data-l10n-id="compose-draft-save"></button>
     <button id="cmp-draft-discard" class="danger" data-l10n-id="compose-delete-confirm"></button>
-    <button id="cmp-draft-cancel" data-l10n-id="message-multiedit-cancel"></button>
+    <span class="last-button-container">
+      <button id="cmp-draft-cancel" data-l10n-id="message-multiedit-cancel"></button>
+    </span>
   </menu>
-</form>
+</form>
diff --git a/apps/email/js/cards/msg/contact_menu.html b/apps/email/js/cards/msg/contact_menu.html
@@ -11,7 +11,9 @@
     </button>
     <button class="msg-contact-menu-add-to-existing-contact collapsed" data-l10n-id="message-contact-menu-add-existing">
     </button>
-     <button class="msg-contact-menu-cancel" data-l10n-id="message-multiedit-cancel">
-    </button>
+    <span class="last-button-container">
+      <button class="msg-contact-menu-cancel" data-l10n-id="message-multiedit-cancel">
+      </button>
+    </span>
    </menu>
- </form>
+ </form>
diff --git a/apps/email/js/cards/msg/reply_menu.html b/apps/email/js/cards/msg/reply_menu.html
@@ -7,7 +7,9 @@
     </button>
     <button class="msg-reply-menu-forward" data-l10n-id="message-reply-menu-forward">
     </button>
-    <button class="msg-reply-menu-cancel" data-l10n-id="message-reply-menu-cancel">
-    </button>
+    <span class="last-button-container">
+      <button class="msg-reply-menu-cancel" data-l10n-id="message-reply-menu-cancel">
+      </button>
+    </span>
   </menu>
 </form>
diff --git a/apps/email/style/message_cards.css b/apps/email/style/message_cards.css
@@ -938,7 +938,7 @@ html:-moz-dir(rtl) .message-list-topbar[data-state="top"] {
   opacity: .95;
 }
 
-.msg-reply-menu button:before {
+.msg-reply-menu menu > button:before {
   content: "";
   display: block;
   float: left;
@@ -950,7 +950,7 @@ html:-moz-dir(rtl) .message-list-topbar[data-state="top"] {
   background-size: 3rem auto;
 }
 
-html:-moz-dir(rtl) .msg-reply-menu button:before {
+html:-moz-dir(rtl) .msg-reply-menu menu > button:before {
   float: right;
   margin: 0.5rem 0 0 1rem;
 }