Back out 1662253c88f7 (bug 459563) for 10.6 m-oth bustage

CLOSED TREE

browser/base/content/urlbarBindings.xml

@@ -2180,7 +2180,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                   &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
@@ -2218,7 +2218,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                   &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

browser/themes/linux/browser.css

@@ -1919,6 +1919,10 @@ toolbarbutton.chevron > .toolbarbutton-icon {
 
 /* 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;

browser/themes/osx/browser.css

@@ -3431,8 +3431,20 @@ notification[value="loop-sharing-notification"] .messageImage {
   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 */
@@ -3656,6 +3668,10 @@ notification[value="loop-sharing-notification"] .messageImage {
   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;

browser/themes/windows/browser.css

@@ -2566,6 +2566,10 @@ notification[value="loop-sharing-notification"] .messageImage {
 
 /* 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;
 }

toolkit/themes/osx/global/global.css

@@ -176,14 +176,10 @@ separator.groove[orient="vertical"] {
 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"] {
@@ -194,7 +190,12 @@ label[disabled="true"] {
   margin: 0;
 }
 
+description {
+  margin-bottom: 4px;
+}
+
 .header {
+  margin-bottom: 6px;
   font-weight: bold;
 }
 

toolkit/themes/osx/global/notification.css

@@ -112,10 +112,12 @@ notification[type="info"]:not([value="translation"]) .close-icon:not(:hover) {
 
 .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 {