From 3b9c134926a163c7d891ee8462bbf8aa5d4280a3 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 1 May 2013 20:28:23 +0530
Subject: [PATCH 1/4] [News] : Removes the large + button.

---
 css/addnew.css            |  4 +--
 css/feeds.css             |  4 ++-
 img/add.svg               | 71 ---------------------------------------
 templates/part.addnew.php |  5 +--
 4 files changed, 5 insertions(+), 79 deletions(-)
 delete mode 100644 img/add.svg

diff --git a/css/addnew.css b/css/addnew.css
index 5fd76ba5e..4737492b0 100644
--- a/css/addnew.css
+++ b/css/addnew.css
@@ -19,9 +19,7 @@
  *
  */
 
-.add-new > a {
-	background-image: url('%appswebroot%/news/img/add.svg');
-}
+
 
 .add-new:hover a.opened {
 	background-color: transparent !important;
diff --git a/css/feeds.css b/css/feeds.css
index 2f2462709..5a3898f9f 100644
--- a/css/feeds.css
+++ b/css/feeds.css
@@ -66,7 +66,9 @@
 	font-weight: bold;
 }
 
-
+#app-navigation .with-icon .list-title {
+	padding-left:10px;
+}
 
 #app-navigation .unread > a {
 	padding-right: 32px;
diff --git a/img/add.svg b/img/add.svg
deleted file mode 100644
index 282b7b92a..000000000
--- a/img/add.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg3024"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="add.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="7.5402568"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="729"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
-  <defs
-     id="defs3026" />
-  <metadata
-     id="metadata3029">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer">
-    <polygon
-       transform="matrix(0.1744186,0,0,0.17442063,-0.72093023,-0.0310001)"
-       points="58.244,5.911 41.757,5.911 41.757,40.667 7,40.667 7,57.154 41.757,57.154 41.757,91.91 58.244,91.91 58.244,57.154 93,57.154 93,40.667 58.244,40.667 "
-       id="polygon3-4"
-       style="fill:#ffffff" />
-  </g>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <polygon
-       transform="matrix(0.1744186,0,0,0.17442063,-0.7209302,-1.0310001)"
-       points="58.244,40.667 58.244,5.911 41.757,5.911 41.757,40.667 7,40.667 7,57.154 41.757,57.154 41.757,91.91 58.244,91.91 58.244,57.154 93,57.154 93,40.667 "
-       id="polygon3"
-       style="fill:#333333" />
-  </g>
-</svg>
diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index 0d171484c..44614d59a 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -8,10 +8,7 @@
 		href="#"
 		oc-click-focus="{
 			selector: '.add-new-popup input[ng-model=feedUrl]'
-		}">
-		<?php p($l->t('Add Website'))?>
-	</a>
-
+		}">+ </a>
 	<div class="add-new-popup">
 		<fieldset class="personalblock">
 			<p class="error">

From 57065ae48c34bc122d82975d2a8ba82fed8eba1d Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 1 May 2013 23:11:30 +0530
Subject: [PATCH 2/4] Adds Add Website span on hover and active.

---
 css/feeds.css             | 12 ++++++++++++
 templates/part.addnew.php |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/css/feeds.css b/css/feeds.css
index 5a3898f9f..e6b6853fb 100644
--- a/css/feeds.css
+++ b/css/feeds.css
@@ -70,6 +70,18 @@
 	padding-left:10px;
 }
 
+#app-navigation .with-icon .list-title span {
+	display:none;
+}
+
+#app-navigation .with-icon .list-title:hover span {
+	display:inline;
+}
+
+#app-navigation .with-icon .opened span {
+	display:inline;
+}
+
 #app-navigation .unread > a {
 	padding-right: 32px;
 }
diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index 44614d59a..f86fa9030 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -8,7 +8,7 @@
 		href="#"
 		oc-click-focus="{
 			selector: '.add-new-popup input[ng-model=feedUrl]'
-		}">+ </a>
+		}">+ <span><?php p($l->t('Add Website'))?></span></a>
 	<div class="add-new-popup">
 		<fieldset class="personalblock">
 			<p class="error">

From 1c90d308d0dbe825fca2ca47c0dd4d4c85b43d1c Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 2 May 2013 22:43:35 +0530
Subject: [PATCH 3/4] Aligns the + and Add Website as per remaining elements.

---
 css/feeds.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/css/feeds.css b/css/feeds.css
index e6b6853fb..f037382e6 100644
--- a/css/feeds.css
+++ b/css/feeds.css
@@ -67,11 +67,12 @@
 }
 
 #app-navigation .with-icon .list-title {
-	padding-left:10px;
+	padding-left:16px;
 }
 
 #app-navigation .with-icon .list-title span {
 	display:none;
+	margin-left:6px;
 }
 
 #app-navigation .with-icon .list-title:hover span {

From 7996e7fdedfc39a9532e24fccd08069768ab8a8d Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 2 May 2013 22:51:12 +0530
Subject: [PATCH 4/4] Adding the + image for input element.

---
 img/add.svg | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 img/add.svg

diff --git a/img/add.svg b/img/add.svg
new file mode 100644
index 000000000..282b7b92a
--- /dev/null
+++ b/img/add.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg3024"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="add.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="8"
+     inkscape:cy="7.5402568"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="729"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs3026" />
+  <metadata
+     id="metadata3029">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer">
+    <polygon
+       transform="matrix(0.1744186,0,0,0.17442063,-0.72093023,-0.0310001)"
+       points="58.244,5.911 41.757,5.911 41.757,40.667 7,40.667 7,57.154 41.757,57.154 41.757,91.91 58.244,91.91 58.244,57.154 93,57.154 93,40.667 58.244,40.667 "
+       id="polygon3-4"
+       style="fill:#ffffff" />
+  </g>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <polygon
+       transform="matrix(0.1744186,0,0,0.17442063,-0.7209302,-1.0310001)"
+       points="58.244,40.667 58.244,5.911 41.757,5.911 41.757,40.667 7,40.667 7,57.154 41.757,57.154 41.757,91.91 58.244,91.91 58.244,57.154 93,57.154 93,40.667 "
+       id="polygon3"
+       style="fill:#333333" />
+  </g>
+</svg>