Merge branch 'firefox-42-beta'42.2015110341.20151103

1 files changed, 8 insertions, 20 deletions

diff --git a/arc-firefox-theme/chrome/global/toolbarbutton.css b/arc-firefox-theme/chrome/global/toolbarbutton.css
index 4a11f72..a62e173 100644
--- a/arc-firefox-theme/chrome/global/toolbarbutton.css
+++ b/arc-firefox-theme/chrome/global/toolbarbutton.css
@@ -106,37 +106,25 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 }
 
 /* ::::: toolbarbutton badged ::::: */
+.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
+}
 
 .toolbarbutton-badge {
   background-color: #d90000;
-}
-
-.toolbarbutton-badge::after {
-  /* The |content| property is set in the content stylesheet. */
   font-size: 10px;
-  font-weight: bold;
-  padding: 1px 2px 2px;
+  padding: 0 2px 1px;
   color: #fff;
-  background-color: inherit;
   border-radius: 2px;
   box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset,
               0 -1px 0 hsla(0, 0%, 0%, .1) inset,
               0 1px 0 hsla(206, 50%, 10%, .2);
-  position: absolute;
-  top: -4px;
-  right: -2px;
-  min-width: 10px;
+  margin: -6px 0 0 !important;
+  -moz-margin-end: -8px !important;
+  min-width: 14px;
   line-height: 10px;
   text-align: center;
-}
-
-.toolbarbutton-badge:-moz-locale-dir(rtl)::after {
-  left: -2px;
-  right: auto;
-}
-
-.toolbarbutton-badge-container {
-  position: relative;
+  -moz-stack-sizing: ignore;
 }
 
 /* .......... dropmarker .......... */