diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-12 01:29:09 +0100 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-12 01:29:09 +0100 |
commit | 5fa3d41316a583c4d436b327a0d2044093dffa12 (patch) | |
tree | 0807f959aee0c33251782487e44868b7b8b27c48 | |
parent | 8ac2aa3748ece701949b68d447fad35cbeec47f9 (diff) |
brought back unread and starred feeds
-rw-r--r-- | css/feeds.css | 17 | ||||
-rw-r--r-- | css/owncloud.css | 4 | ||||
-rw-r--r-- | templates/part.feed.starred.php | 17 | ||||
-rw-r--r-- | templates/part.feed.unread.php | 11 |
4 files changed, 26 insertions, 23 deletions
diff --git a/css/feeds.css b/css/feeds.css index 7efaeab01..a5a2d59ea 100644 --- a/css/feeds.css +++ b/css/feeds.css @@ -26,14 +26,15 @@ } #left-content .utils button { - margin: 0 5px 0 0; + margin: 0; background-position: center; background-repeat: no-repeat; background-color: transparent; border: 0; box-shadow: none; display: none; - padding: 8px; + height: 32px; + width: 32px; } #left-content li:hover .utils button { @@ -68,10 +69,18 @@ button.action:hover { } +#left-content li:hover > a { + padding-right: 98px; +} + #left-content li:hover > .utils { display: block; } +#left-content li:hover > .utils .unread-counter { + padding-right: 0; +} + .delete-icon { background-position: center 10px !important; background-image: url('%webroot%/core/img/actions/delete.svg'); @@ -84,3 +93,7 @@ button.action:hover { .mark-read-icon { background-image: url('%appswebroot%/news/img/mark_read.svg'); } + +.rss-icon { + background-image: url('%appswebroot%/news/img/rss.svg'); +} diff --git a/css/owncloud.css b/css/owncloud.css index ea6b33ea0..98ea6673c 100644 --- a/css/owncloud.css +++ b/css/owncloud.css @@ -61,7 +61,7 @@ } #left-content li.active { - background-color: #d0d0d0; + background-color: #ccc; text-shadow: 0 1px 0 rgba(255,255,255,.7); } @@ -101,7 +101,7 @@ border-top: 1px solid #ccc; } -#left-content li > a:hover { +#left-content li:hover > a { background-color: #ccc; } diff --git a/templates/part.feed.starred.php b/templates/part.feed.starred.php index 411c9469c..1d96d9fe8 100644 --- a/templates/part.feed.starred.php +++ b/templates/part.feed.starred.php @@ -1,17 +1,8 @@ -<li ng-class="{ - active: isFeedActive(feedType.Starred, 0), - all_read: getUnreadCount(feedType.Starred, 0)==0 - }" - class="starred-icon" +<li ng-class="{ active: isFeedActive(feedType.Starred, 0) }" ng-show="isShown(feedType.Starred, 0)"> - <a class="title" - href="#" - ng-click="loadFeed(feedType.Starred, 0)"> + <a class="starred-icon" + href="#" + ng-click="loadFeed(feedType.Starred, 0)"> <?php p($l->t('Starred')) ?> </a> - <span class="utils"> - <span class="unread_items_counter"> - {{ getUnreadCount(feedType.Starred, 0) }} - </span> - </span> </li>
\ No newline at end of file diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php index 795ef3c2d..559a96a90 100644 --- a/templates/part.feed.unread.php +++ b/templates/part.feed.unread.php @@ -1,20 +1,19 @@ <li ng-class="{ active: isFeedActive(feedType.Subscriptions, 0), - all_read: getUnreadCount(feedType.Subscriptions, 0)==0 + unread: getUnreadCount(feedType.Subscriptions, 0)!=0 }" - class="subscriptions" ng-show="isShown(feedType.Subscriptions, 0)"> - <a class="title" + <a class="rss-icon" href="#" ng-click="loadFeed(feedType.Subscriptions, 0)"> <?php p($l->t('New articles'))?> </a> <span class="utils"> - <span class="unread-counter"> - {{ getUnreadCount(feedType.Starred, 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 class="unread-counter"> + {{ getUnreadCount(feedType.Subscriptions, 0) }} + </span> </span> </li>
\ No newline at end of file |