From 7f36ee37bf15b821569fd3c961487e0a4a9f99a9 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 18 Sep 2017 11:14:26 +0100
Subject: [PATCH] Bug 1400810 - fix context menus looking squashed while
 retaining changes to shortcut and footer alignment, r=johannh

MozReview-Commit-ID: GPAEdE7eMxk

--HG--
extra : rebase_source : e835f5a12b2f8e0437f97ed304ae6494d33713ee
---
 browser/themes/shared/customizableui/panelUI.inc.css | 12 +++++++-----
 toolkit/themes/windows/global/menu.css               |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index 55fc4ad5c9af..d7f57c0bd438 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -232,10 +232,6 @@ panelview {
   -moz-box-flex: 1;
 }
 
-.cui-widget-panelview .subviewbutton.panel-subview-footer .menu-accel-container {
-  -moz-box-pack: end;
-}
-
 #appMenu-popup > arrowscrollbox > autorepeatbutton,
 #PanelUI-popup > arrowscrollbox > autorepeatbutton {
   display: none;
@@ -1260,6 +1256,7 @@ panelview .toolbarbutton-1,
 .subviewbutton.panel-subview-footer > .menu-text {
   -moz-appearance: none;
   padding-inline-end: 6px;
+  padding-inline-start: 0 !important; /* to override menu.css on Windows */
   -moz-box-flex: 0;
 }
 
@@ -1271,6 +1268,11 @@ panelview .toolbarbutton-1,
   padding-inline-start: 6px;
 }
 
+.subviewbutton > .menu-accel-container > .menu-iconic-accel,
+.subviewbutton > .menu-accel-container > .menu-accel {
+  margin-inline-end: 0 !important; /* to override menu.css on Windows */
+}
+
 #widget-overflow-fixed-list .toolbarbutton-1 > .toolbarbutton-text,
 #widget-overflow-list .toolbarbutton-1 > .toolbarbutton-text,
 .subviewbutton:not(.panel-subview-footer) > .toolbarbutton-text,
@@ -1513,7 +1515,7 @@ menuitem.panel-subview-footer@menuStateActive@,
 }
 
 .subviewbutton > .menu-accel-container {
-  -moz-box-pack: start;
+  -moz-box-pack: end;
   margin-inline-start: 10px;
   margin-inline-end: auto;
   color: GrayText;
diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css
index 9f8b3ea6f9cb..822682a6c694 100644
--- a/toolkit/themes/windows/global/menu.css
+++ b/toolkit/themes/windows/global/menu.css
@@ -58,6 +58,7 @@ menuitem.spell-suggestion {
 }
 
 .menu-text {
+  padding-inline-start: 1.45em !important;
   -moz-appearance: menuitemtext;
 }
 
@@ -84,6 +85,7 @@ menucaption > .menu-iconic-text {
 .menu-iconic-accel {
   color: inherit;
   margin-inline-start: 0.74em !important;
+  margin-inline-end: 1.35em !important;
 }
 
 .menu-iconic-left {