fixed styling of left content and reversed mark read buttons + unread count

5 files changed, 20 insertions, 18 deletions

diff --git a/coffee/package.json b/coffee/package.json
index 6b9764ae6..941999bca 100644
--- a/coffee/package.json
+++ b/coffee/package.json
@@ -15,7 +15,7 @@
     }
   ],
   "devDependencies": {
-    "grunt": "~0.4.0rc7",
+    "grunt": "~0.4.0rc8",
     "grunt-cli": "~0.1.6",
     "coffee-script": "~1.4.0",
     "grunt-contrib-coffee": "~0.4.0rc7",
diff --git a/css/feeds.css b/css/feeds.css
index d6fb212bd..5a4149a13 100644
--- a/css/feeds.css
+++ b/css/feeds.css
@@ -78,7 +78,7 @@ button.action:hover {
 }
 
 #app-navigation li:hover > .utils .unread-counter {
-	padding-right: 0;
+        padding-left: 0;
 }
 
 .delete-icon {
diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php
index a9ed104c6..b2e4567e0 100644
--- a/templates/part.feed.unread.php
+++ b/templates/part.feed.unread.php
@@ -16,11 +16,11 @@
 	   <?php p($l->t('All articles'))?>
 	</a>
 	<span class="utils">
-		<button class="svg action mark-read-icon" 
-			ng-click="markAllRead(feedType.Subscriptions, 0)"
-			title="<?php p($l->t('Mark all read')) ?>"></button>
 		<span class="unread-counter">
 			{{ getUnreadCount(feedType.Subscriptions, 0) }}
 		</span>
+                <button class="svg action mark-read-icon"
+                        ng-click="markAllRead(feedType.Subscriptions, 0)"
+                        title="<?php p($l->t('Mark all read')) ?>"></button>
 	</span>
 </li>
\ No newline at end of file
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index f6b4033ef..ab63822d5 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -16,15 +16,16 @@
 			class="svg action delete-icon" 
 			title="<?php p($l->t('Delete feed')); ?>"></button>
 
-		<button class="svg action mark-read-icon" 
-			ng-show="getUnreadCount(feedType.Feed, feed.id)>0"
-			ng-click="markAllRead(feedType.Feed, feed.id)"
-			title="<?php p($l->t('Mark all read')); ?>"></button>
-
 		<span class="unread-counter">
 			{{ getUnreadCount(feedType.Feed, feed.id) }}
 		</span>
 
+        <button class="svg action mark-read-icon"
+            ng-show="getUnreadCount(feedType.Feed, feed.id)>0"
+            ng-click="markAllRead(feedType.Feed, feed.id)"
+            title="<?php p($l->t('Mark all read')); ?>"></button>
+
+
 
 	</span>
 </li>
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index fe7051258..8b9d37edb 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -12,29 +12,30 @@
 			title="<?php p($l->t('Collapse'));?>"
 			ng-click="toggleFolder(folder.id)"></button>
 	<a href="#" 
-	   class="title"
-	   class="folder-icon"
+           class="title folder-icon"
 	   ng-click="loadFeed(feedType.Folder, folder.id)">
 	   {{folder.name}}
 	</a>
 
 	<span class="utils">
-		<button class="svg action edit-icon" 
-				ng-click="renameFolder(folder.id)"
-				title="<?php p($l->t('Rename folder')); ?>"></button>
 
 		<button ng-click="delete(feedType.Folder, folder.id)"
 				class="svg action delete-icon" 
 				title="<?php p($l->t('Delete folder')); ?>"></button>
 
+                <span class="unread-counter">
+                        {{ getUnreadCount(feedType.Folder, folder.id) }}
+                </span>
+
 		<button class="svg action mark-read-icon" 
 				ng-show="getUnreadCount(feedType.Feed, feed.id)>0"
 				ng-click="markAllRead(feedType.Folder, folder.id)"
 				title="<?php p($l->t('Mark all read')); ?>"></button>
 
-		<span class="unread-counter">
-			{{ getUnreadCount(feedType.Folder, folder.id) }}
-		</span>
+                <button class="svg action edit-icon"
+                                ng-click="renameFolder(folder.id)"
+                                title="<?php p($l->t('Rename folder')); ?>"></button>
+
 
 	</span>
 	<ul>