Bug 615481 - Doorhanger (popup) notifications need a maximum width and the text needs to wrap if necessary [r=gavin, a=blocking-2.0:betaN+]

browser/base/content/urlbarBindings.xml

@@ -998,7 +998,7 @@
                  xbl:inherits="popupid"/>
       <xul:vbox>
         <xul:description class="popup-notification-description"
-                         xbl:inherits="value=label"/>
+                         xbl:inherits="xbl:text=label"/>
         <xul:spacer flex="1"/>
         <xul:hbox pack="end">
           <xul:label anonid="learnmore" class="text-link geolocation-text-link"/>

toolkit/content/widgets/notification.xml

@@ -424,7 +424,7 @@
                  xbl:inherits="popupid"/>
       <xul:vbox flex="1">
         <xul:description class="popup-notification-description"
-                         xbl:inherits="value=label"/>
+                         xbl:inherits="xbl:text=label"/>
         <xul:spacer flex="1"/>
         <xul:hbox pack="end">
           <xul:button anonid="button"

toolkit/themes/gnomestripe/global/notification.css

@@ -52,3 +52,9 @@ notification[type="critical"] .messageImage {
   margin-top: 0;
   margin-bottom: 0;
 }
+
+/* Popup notification */
+
+.popup-notification-description {
+  max-width: 248px;
+}

toolkit/themes/pinstripe/global/notification.css

@@ -89,8 +89,7 @@ notification[type="critical"] .messageImage {
 /* Popup notification */
 
 .popup-notification-description {
-  margin-bottom: 10px;
+  max-width: 248px;
-  -moz-margin-start: 5px;
 }
 
 .popup-notification-menubutton {

toolkit/themes/pinstripe/global/popup.css

@@ -71,7 +71,7 @@ panel[type="arrow"] {
   box-shadow: 0 0 0 1px rgba(255,255,255,.15) inset,
               0 1px 0 rgba(255,255,255,.05) inset,
               0 0 0 1px rgba(0,0,0,.25);
-  padding: 14px;
+  padding: 16px;
   margin: 1px;
 }
 

toolkit/themes/winstripe/global/notification.css

@@ -57,7 +57,11 @@ notification[type="critical"] .messageImage {
   -moz-margin-end: 5px;
 }
 
-/* Popup notification button */
+/* Popup notification */
+
+.popup-notification-description {
+  max-width: 248px;
+}
 
 .popup-notification-menubutton {
   margin-top: 17px;

toolkit/themes/winstripe/global/popup.css

@@ -82,7 +82,7 @@ panel[type="arrow"] {
               0 1px 3px 2px rgba(0,0,0,.65);
 %else
   background: -moz-linear-gradient(rgba(250,251,253,.95), rgba(250,251,253,.95) 20px, rgba(250,251,253,.95));
-  padding: 14px;
+  padding: 16px;
   margin: 3px;
   box-shadow: 0 0 5px 1px rgba(184,205,232,1) inset,
               0 0 0 1px rgba(0,0,0,.25),
@@ -101,7 +101,7 @@ panel[type="arrow"] {
   -moz-border-left-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
   -moz-border-bottom-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
   -moz-border-right-colors: rgba(255,255,255,.6) rgba(0,0,0,.7);
-  padding: 14px;
+  padding: 16px;
 }
 %endif