Back out 1662253c88f7 (bug 459563) for 10.6 m-oth bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 27 May 2015 20:17:40 -0700
changeset 265516 299a93ea3f842aadefb98a87b6e9c4996e7163d8
parent 265515 9e0263028c048f5741c1244b437864ebbf567808
child 265517 103c08c8fc61a82801bf5db85155dd08e55d5839
push id8157
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:36:23 +0000
treeherdermozilla-aurora@d480e05bd276 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs459563
milestone41.0a1
backs out1662253c88f7523e573aab4972157f2ab3764b88
Back out 1662253c88f7 (bug 459563) for 10.6 m-oth bustage CLOSED TREE
browser/base/content/urlbarBindings.xml
browser/themes/linux/browser.css
browser/themes/osx/browser.css
browser/themes/windows/browser.css
toolkit/themes/osx/global/global.css
toolkit/themes/osx/global/notification.css
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -2175,17 +2175,17 @@ file, You can obtain one at http://mozil
                   xbl:inherits="popupid">
                   &mixedContentBlocked2.message;
                 </xul:description>
                 <xul:description class="popup-notification-item-message"
                   xbl:inherits="popupid,mixedblockdisabled">
                   &mixedContentBlocked2.moreinfo;
                 </xul:description>
                 <xul:label anonid="mixedContent.helplink"
-                  class="text-link" href=""
+                  class="text-link plain" href=""
                   value="&mixedContentBlocked2.learnMore;"/>
               </xul:vbox>
               <xul:button
                 type="menu" label="&mixedContentBlocked2.options;"
                 sizetopopup="none">
                 <xul:menupopup>
                   <xul:menuitem anonid="mixedContentAction.unblock"
                     hidden="true" label="&mixedContentBlocked2.unblock.label;"
@@ -2213,17 +2213,17 @@ file, You can obtain one at http://mozil
                   xbl:inherits="popupid">
                   &trackingContentBlocked.message;
                 </xul:description>
                 <xul:description class="popup-notification-item-message"
                   xbl:inherits="popupid,trackingblockdisabled">
                   &trackingContentBlocked.moreinfo;
                 </xul:description>
                 <xul:label anonid="trackingContent.helplink"
-                  class="text-link" href=""
+                  class="text-link plain" href=""
                   value="&trackingContentBlocked.learnMore;"/>
               </xul:vbox>
               <xul:button
                 type="menu" label="&trackingContentBlocked.options;"
                 sizetopopup="none">
                 <xul:menupopup>
                   <xul:menuitem anonid="trackingContentAction.unblock"
                     hidden="true" label="&trackingContentBlocked.unblock2.label;"
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1914,16 +1914,20 @@ toolbarbutton.chevron > .toolbarbutton-i
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
   -moz-margin-end: 2px;
 }
 
 /* Social toolbar item */
 
+#social-undoactivation-button {
+  -moz-margin-start: 0; /* override default label margin to match description margin */
+}
+
 .social-activation-icon {
   width: auto;
   height: auto;
   max-height: 64px;
   max-width: 64px;
 }
 
 #social-activation-message {
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3426,18 +3426,30 @@ notification[value="loop-sharing-notific
 }
 
 .popup-notification-body[popupid="addon-progress"],
 .popup-notification-body[popupid="addon-install-confirmation"] {
   width: 28em;
   max-width: 28em;
 }
 
+#addon-progress-notification-progresstext,
+#addon-progress-notification-progressmeter {
+  /* override default label margin to match description margin */
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+}
+
 .addon-install-confirmation-name {
   font-weight: bold;
+  -moz-margin-start: 0 !important; /* override default label margin to match description margin */
+}
+
+#pointerLock-cancel {
+  margin: 0px;
 }
 
 /* Popup Buttons */
 #identity-popup-more-info-button {
   @hudButton@
   margin: 10px 0 0;
   min-height: 0px;
 }
@@ -3651,16 +3663,20 @@ notification[value="loop-sharing-notific
 #developer-toolbar-toolbox-button[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
 }
 
+#social-undoactivation-button {
+  -moz-margin-start: 0; /* override default label margin to match description margin */
+}
+
 .social-activation-icon {
   width: auto;
   height: auto;
   max-height: 64px;
   max-width: 64px;
 }
 
 #social-activation-message {
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2561,16 +2561,20 @@ notification[value="loop-sharing-notific
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
   -moz-margin-end: 5px;
 }
 
 /* Social toolbar item */
 
+#social-undoactivation-button {
+  -moz-margin-start: 0; /* override default label margin to match description margin */
+}
+
 #socialActivatedNotification .popup-notification-button-container {
   margin-left: 6px;
 }
 
 .social-activation-icon {
   width: auto;
   height: auto;
   max-height: 64px;
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -171,35 +171,36 @@ separator.groove[orient="vertical"] {
   margin: 0 !important;
   border: none;
   padding: 0;
 }
 
 description,
 label {
   cursor: default;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 5px;
 }
 
-description {
-  margin-bottom: 4px;
+label {
+  margin: 2px 6px;
 }
 
 label[disabled="true"] {
   color: GrayText;
 }
 
 .tooltip-label {
   margin: 0;
 }
 
+description {
+  margin-bottom: 4px;
+}
+
 .header {
+  margin-bottom: 6px;
   font-weight: bold;
 }
 
 .monospace {
   font-family: monospace;
 }
 
 .indent {
--- a/toolkit/themes/osx/global/notification.css
+++ b/toolkit/themes/osx/global/notification.css
@@ -107,20 +107,22 @@ notification[type="info"]:not([value="tr
 
 .popup-notification-origin:not([value]),
 .popup-notification-learnmore-link:not([href]) {
   display: none;
 }
 
 .popup-notification-origin {
   margin-bottom: .3em !important;
+  -moz-margin-start: 0 !important; /* override default label margin to match description margin */
 }
 
 .popup-notification-learnmore-link {
   margin-top: .5em !important;
+  -moz-margin-start: 0 !important; /* override default label margin to match description margin */
 }
 
 .popup-notification-button-container {
   margin-top: 17px;
 }
 
 .popup-notification-menubutton {
   -moz-appearance: none;