From 05a3d588a4ddd199a52552556bce3b948a84ccbd Mon Sep 17 00:00:00 2001
From: "beng%bengoodger.com" <beng%bengoodger.com>
Date: Wed, 7 Nov 2007 05:12:07 +0000
Subject: [PATCH] 340897 - lots of rss bug fixes r=sspitzer

---
 .../gnomestripe/browser/feeds/feedIcon16.png  | Bin 0 -> 3554 bytes
 .../gnomestripe/browser/feeds/subscribe.css   |  49 ++++++++++++++++--
 browser/themes/gnomestripe/browser/jar.mn     |   2 +
 3 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100755 browser/themes/gnomestripe/browser/feeds/feedIcon16.png

diff --git a/browser/themes/gnomestripe/browser/feeds/feedIcon16.png b/browser/themes/gnomestripe/browser/feeds/feedIcon16.png
new file mode 100755
index 0000000000000000000000000000000000000000..f21e796414d5977b233f2ea83b8f1adf84330913
GIT binary patch
literal 3554
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

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/browser/feeds/subscribe.css b/browser/themes/gnomestripe/browser/feeds/subscribe.css
index f561a84e881..3438b170710 100644
--- a/browser/themes/gnomestripe/browser/feeds/subscribe.css
+++ b/browser/themes/gnomestripe/browser/feeds/subscribe.css
@@ -60,15 +60,20 @@ html {
 }
 
 #feedSubscribeHandleText {
-  -moz-padding-start: 18px;
-  background: url("chrome://browser/skin/places/livemarkItem.png") left 0 no-repeat;
+  -moz-padding-start: 20px;
+  background: url("chrome://browser/skin/feeds/feedIcon16.png") left 0 no-repeat;
 }
 
-#feedSubscribeLink {
-  background: url("chrome://browser/skin/places/livemarkItem.png") left 0 no-repeat;
-  -moz-padding-start: 18px;
+.feedSubscribeLink {
   font-weight: bold;
   -moz-margin-end: .4em;
+  padding: .2em .1em .2em .1em;
+}
+
+.feedSubscribeLinkBox {
+  background: url("chrome://browser/skin/feeds/feedIcon16.png") left 0 no-repeat;
+  -moz-padding-start: 19px;
+  -moz-margin-end: 0px;
 }
 
 #feedSubscribeOptionsGroup {
@@ -185,3 +190,37 @@ a[href] img {
 .plain:focus > .button-box {
   border: 1px dotted ThreeDDarkShadow;
 }
+
+#readerContainer {
+  -moz-appearance: listbox;
+}
+
+#readers {
+  -moz-appearance: none;
+  border: none;
+  margin: 0px;
+}
+
+#readers > listitem {
+  -moz-padding-start: 4px;
+}
+
+#chooseClientApp {
+  font-size: 80%;
+}
+
+#application {
+  border-bottom: 1px solid ThreeDShadow;
+}
+
+#readerGroup {
+  -moz-padding-end: 14px;
+}
+
+.feedSubscribeButton {
+  font-weight: bold;
+  list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
+}
+.feedSubscribeButton .button-icon {
+  -moz-margin-end: 3px;
+}
diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn
index 9d62b417ef0..344f3320875 100644
--- a/browser/themes/gnomestripe/browser/jar.mn
+++ b/browser/themes/gnomestripe/browser/jar.mn
@@ -23,7 +23,9 @@ classic.jar:
         skin/classic/browser/Toolbar-small.png
 #ifdef MOZ_FEEDS
         skin/classic/browser/feeds/feedIcon.png                 (feeds/feedIcon.png)
+        skin/classic/browser/feeds/feedIcon16.png               (feeds/feedIcon16.png)
         skin/classic/browser/feeds/subscribe.css                (feeds/subscribe.css)
+        skin/classic/browser/feeds/addFeedReader.css            (feeds/addFeedReader.css)
 #endif
 #ifdef MOZ_PLACES
         skin/classic/browser/places/places.css                  (places/places.css)