From 593c7fb4454b14c1ef8f37c3a1f98da637e4970f Mon Sep 17 00:00:00 2001 From: "dolske%mozilla.com" Date: Tue, 29 Apr 2008 21:31:00 +0000 Subject: [PATCH] Bug 431275 - Give notification bars default icons via CSS. r=enn, ui-r=beltzner, a1.9=beltzner git-svn-id: svn://10.0.0.236/trunk@250959 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/content/widgets/notification.xml | 3 ++- .../themes/gnomestripe/global/notification.css | 14 ++++++++++++++ .../themes/pinstripe/global/notification.css | 14 ++++++++++++++ .../themes/winstripe/global/notification.css | 14 ++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/mozilla/toolkit/content/widgets/notification.xml b/mozilla/toolkit/content/widgets/notification.xml index 622e4ef69c1..a88327978a2 100644 --- a/mozilla/toolkit/content/widgets/notification.xml +++ b/mozilla/toolkit/content/widgets/notification.xml @@ -91,7 +91,8 @@ var newitem = document.createElementNS(XULNS, "notification"); newitem.setAttribute("label", aLabel); newitem.setAttribute("value", aValue); - newitem.setAttribute("image", aImage); + if (aImage) + newitem.setAttribute("image", aImage); if (!insertPos) { newitem.style.position = "fixed"; newitem.style.top = "100%"; diff --git a/mozilla/toolkit/themes/gnomestripe/global/notification.css b/mozilla/toolkit/themes/gnomestripe/global/notification.css index b8ed5d92e11..13a79adc2bb 100644 --- a/mozilla/toolkit/themes/gnomestripe/global/notification.css +++ b/mozilla/toolkit/themes/gnomestripe/global/notification.css @@ -21,6 +21,20 @@ notification[type="critical"] { margin: 0px 1px 0px 6px; } +/* Default icons for notifications */ + +notification[type="info"] .messageImage { + list-style-image: url("chrome://global/skin/icons/information-16.png"); +} + +notification[type="warning"] .messageImage { + list-style-image: url("chrome://global/skin/icons/warning-16.png"); +} + +notification[type="critical"] .messageImage { + list-style-image: url("chrome://global/skin/icons/error-16.png"); +} + .messageText { -moz-margin-start: 5px; } diff --git a/mozilla/toolkit/themes/pinstripe/global/notification.css b/mozilla/toolkit/themes/pinstripe/global/notification.css index 0b4a2bbe575..7bc8bcf215b 100644 --- a/mozilla/toolkit/themes/pinstripe/global/notification.css +++ b/mozilla/toolkit/themes/pinstripe/global/notification.css @@ -31,6 +31,20 @@ notification[type="critical"] { margin: 0px 1px 0px 6px; } +/* Default icons for notifications */ + +notification[type="info"] .messageImage { + list-style-image: url("chrome://global/skin/icons/information-16.png"); +} + +notification[type="warning"] .messageImage { + list-style-image: url("chrome://global/skin/icons/warning-16.png"); +} + +notification[type="critical"] .messageImage { + list-style-image: url("chrome://global/skin/icons/error-16.png"); +} + .messageText { margin-top: 2px; font-weight: bold; diff --git a/mozilla/toolkit/themes/winstripe/global/notification.css b/mozilla/toolkit/themes/winstripe/global/notification.css index 6e087b4ba9c..ea78a6b88db 100644 --- a/mozilla/toolkit/themes/winstripe/global/notification.css +++ b/mozilla/toolkit/themes/winstripe/global/notification.css @@ -21,6 +21,20 @@ notification[type="critical"] { margin: 0px 1px 0px 6px; } +/* Default icons for notifications */ + +notification[type="info"] .messageImage { + list-style-image: url("chrome://global/skin/icons/information-16.png"); +} + +notification[type="warning"] .messageImage { + list-style-image: url("chrome://global/skin/icons/warning-16.png"); +} + +notification[type="critical"] .messageImage { + list-style-image: url("chrome://global/skin/icons/error-16.png"); +} + .messageText { -moz-margin-start: 5px; }