Bug 1403157 - Unify appMenu webext new permissions notification appearance with browser update notification. r?mstriemer draft
authorIan Moody <moz-ian@perix.co.uk>
Wed, 27 Sep 2017 22:24:23 +0100
changeset 673145 37c22b5582a3e7981a95b2e656571c5f892aead0
parent 671801 76a26ef7c493311c170ae83eb0c1d6592a21396d
child 734015 2faf9e1c738b5e4dc2c1bfbe65e8c7be110e2d4c
push id82475
push usermoz-ian@perix.co.uk
push dateSun, 01 Oct 2017 21:03:37 +0000
reviewersmstriemer
bugs1403157
milestone58.0a1
Bug 1403157 - Unify appMenu webext new permissions notification appearance with browser update notification. r?mstriemer MozReview-Commit-ID: Eu64q8zHWkm
browser/themes/osx/customizableui/panelUI.css
browser/themes/shared/customizableui/panelUI.inc.css
--- a/browser/themes/osx/customizableui/panelUI.css
+++ b/browser/themes/osx/customizableui/panelUI.css
@@ -15,16 +15,17 @@
 .subviewbutton {
   padding-inline-start: 18px;
 }
 
 photonpanelmultiview .toolbaritem-combined-buttons > label {
   padding-inline-start: 42px; /* 18px toolbarbutton padding + 16px icon + 8px label padding start */
 }
 
+#appMenu-addon-banners > .addon-banner-item,
 #appMenu-mainView > .panel-subview-body > .panel-banner-item {
   padding-inline-start: 18px;
 }
 
 #appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-label {
   /* 18px space before the avatar, then 16px for the avatar */
   padding-inline-start: 34px;
   margin-inline-start: -34px;
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -708,18 +708,18 @@ toolbaritem[cui-areatype="menu-panel"][s
   background-color: var(--appmenu-yellow-warning-hover-color);
 }
 
 .addon-banner-item:active {
   background-color: var(--appmenu-yellow-warning-active-color);
 }
 
 .addon-banner-item > .toolbarbutton-icon {
-  width: 14px;
-  height: 14px;
+  width: 16px;
+  height: 16px;
 }
 
 .addon-banner-item::after {
   background: #FFBF00 url(chrome://browser/skin/update-badge-failed.svg) no-repeat center;
 }
 
 #PanelUI-fxa-status {
   display: flex;
@@ -779,16 +779,20 @@ toolbaritem[cui-areatype="menu-panel"][s
 /* in Photon, we have a bottom border as well. Reconcile with the above rule
  * after photon launch. */
 #appMenu-mainView > .panel-subview-body > .panel-banner-item {
   border-bottom: 1px solid var(--panel-separator-color);
   margin-bottom: 3px;
   padding-inline-start: 12px;
 }
 
+#appMenu-addon-banners > .addon-banner-item {
+  padding-inline-start: 12px;
+}
+
 .panel-banner-item > .toolbarbutton-text {
   width: 0; /* Fancy cropping solution for flexbox. */
 }
 
 /* FxAccount indicator bits. */
 
 /* Add the .toolbaritem-combined-buttons class to increase the specificity so as
  * to override the end margin for .toolbaritem-combined-buttons items further down. */
@@ -883,16 +887,17 @@ toolbaritem[cui-areatype="menu-panel"][s
 }
 
 #PanelUI-help > .toolbarbutton-text,
 #PanelUI-quit > .toolbarbutton-text,
 #PanelUI-fxa-avatar > .toolbarbutton-text {
   display: none;
 }
 
+.addon-banner-item > .toolbarbutton-icon,
 .panel-banner-item > .toolbarbutton-icon,
 #PanelUI-fxa-label > .toolbarbutton-icon,
 #PanelUI-fxa-icon > .toolbarbutton-icon,
 #PanelUI-customize > .toolbarbutton-icon,
 #PanelUI-help > .toolbarbutton-icon,
 #PanelUI-quit > .toolbarbutton-icon {
   margin-inline-end: 0;
 }
@@ -1221,16 +1226,17 @@ panelview .toolbarbutton-1,
 .subviewbutton > .menu-right,
 .subviewbutton > .menu-accel-container > .menu-iconic-accel,
 .subviewbutton > .menu-iconic-left,
 .subviewbutton > .menu-iconic-text {
   padding-bottom: 0;
   padding-top: 0;
 }
 
+.addon-banner-item > .toolbarbutton-text,
 .subviewbutton-iconic > .toolbarbutton-text,
 .cui-withicon > .toolbarbutton-text,
 .subviewbutton[image] > .toolbarbutton-text,
 .subviewbutton[targetURI] > .toolbarbutton-text,
 .subviewbutton.restoreallitem > .toolbarbutton-text,
 .subviewbutton.bookmark-item > .toolbarbutton-text,
 .subviewbutton[checked="true"] > .toolbarbutton-text {
   padding-inline-start: 8px; /* See '.subviewbutton-iconic > .toolbarbutton-text' rule above. */
@@ -1275,16 +1281,17 @@ panelview .toolbarbutton-1,
 .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,
+.addon-banner-item > .toolbarbutton-text,
 /* Bookmark items need a more specific selector. */
 .PanelUI-subView .subviewbutton:not(.panel-subview-footer) > .menu-text,
 .PanelUI-subView .subviewbutton:not(.panel-subview-footer) > .menu-iconic-text {
   font: menu;
 }
 
 .subviewbutton[shortcut]::after {
   content: attr(shortcut);
@@ -1404,16 +1411,17 @@ photonpanelmultiview .PanelUI-subView .t
   padding: 1px 8px;
 }
 
 photonpanelmultiview .toolbaritem-combined-buttons > .subviewbutton:not(.subviewbutton-iconic) > .toolbarbutton-text {
   font-size: 1em;
   padding-inline-start: 0;
 }
 
+photonpanelmultiview .addon-banner-item::after,
 photonpanelmultiview .panel-banner-item::after {
   margin-inline-end: 12px;
   margin-inline-start: 10px;
 }
 
 photonpanelmultiview .subview-subheader {
   color: GrayText;
 }