diff options
| -rw-r--r-- | controller/news.controller.php | 1 | ||||
| -rw-r--r-- | css/feeds.css | 2 | ||||
| -rw-r--r-- | templates/part.feed.unread.php | 6 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 18 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 18 |
5 files changed, 22 insertions, 23 deletions
diff --git a/controller/news.controller.php b/controller/news.controller.php index 6194c0b28..54d11119d 100644 --- a/controller/news.controller.php +++ b/controller/news.controller.php @@ -59,7 +59,6 @@ class NewsController extends Controller { $this->api->addScript('app'); $this->api->addScript('multiselect', 'core'); - $this->api->addStyle('owncloud'); $this->api->addStyle('addnew'); $this->api->addStyle('feeds'); $this->api->addStyle('items'); diff --git a/css/feeds.css b/css/feeds.css index 5a4149a13..d6fb212bd 100644 --- a/css/feeds.css +++ b/css/feeds.css @@ -78,7 +78,7 @@ button.action:hover { } #app-navigation li:hover > .utils .unread-counter { - padding-left: 0; + padding-right: 0; } .delete-icon { diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php index b2e4567e0..4c40848a1 100644 --- a/templates/part.feed.unread.php +++ b/templates/part.feed.unread.php @@ -19,8 +19,8 @@ <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> + <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 ab63822d5..dbeb1dbf0 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -1,9 +1,9 @@ <li ng-class="{active: isFeedActive(feedType.Feed, feed.id), unread: feed.unreadCount!=0}" - ng-repeat="feed in feeds|feedInFolder:<?php p($_['folderId']); ?>" - ng-show="feed.show" - data-id="{{feed.id}}" - class="feed" - draggable> + ng-repeat="feed in feeds|feedInFolder:<?php p($_['folderId']); ?>" + ng-show="feed.show" + data-id="{{feed.id}}" + class="feed" + draggable> <a ng-style="{backgroundImage: feed.icon}" href="#" class="title" @@ -20,10 +20,10 @@ {{ 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> + <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> diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index 8b9d37edb..5df8a2c30 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -12,7 +12,7 @@ title="<?php p($l->t('Collapse'));?>" ng-click="toggleFolder(folder.id)"></button> <a href="#" - class="title folder-icon" + class="title folder-icon" ng-click="loadFeed(feedType.Folder, folder.id)"> {{folder.name}} </a> @@ -23,18 +23,18 @@ class="svg action delete-icon" title="<?php p($l->t('Delete folder')); ?>"></button> - <span class="unread-counter"> - {{ getUnreadCount(feedType.Folder, folder.id) }} - </span> - + <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> - - <button class="svg action edit-icon" - ng-click="renameFolder(folder.id)" - title="<?php p($l->t('Rename folder')); ?>"></button> + + <button class="svg action edit-icon" + ng-click="renameFolder(folder.id)" + title="<?php p($l->t('Rename folder')); ?>"></button> </span> |