diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-08-27 12:00:48 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-08-27 12:00:48 +0200 |
commit | e24e0a32c7bd167d1b3ca57686638d45eeb23ed5 (patch) | |
tree | bd501833411b6c4f23f86e80b9b859ff7badaaf9 | |
parent | 78fba05e7ea0128bbe2fef6955874620277e0881 (diff) |
styles for navigation entries
-rw-r--r-- | css/navigation.css | 6 | ||||
-rw-r--r-- | templates/part.feed.starred.php | 16 | ||||
-rw-r--r-- | templates/part.feed.unread.php | 33 | ||||
-rw-r--r-- | templates/part.listfeed.php | 3 |
4 files changed, 32 insertions, 26 deletions
diff --git a/css/navigation.css b/css/navigation.css index ac15fc4b9..de0b39c9f 100644 --- a/css/navigation.css +++ b/css/navigation.css @@ -34,7 +34,7 @@ /* actual form content */ #app-navigation .add-new-popup { - /*display: none;*/ + display: none; padding: 10px; box-shadow: inset 0px 0px 10px #dedede; border-top: 1px solid #dedede; @@ -88,11 +88,11 @@ } /* navigation */ -#app-navigation .starred-icon { +#app-navigation .icon-starred { background-image: url('../img/starred.png'); } -#app-navigation .subscriptions-icon { +#app-navigation .icon-rss { background-image: url('../img/rss.svg'); } diff --git a/templates/part.feed.starred.php b/templates/part.feed.starred.php index 2cae5ced8..56c0b394b 100644 --- a/templates/part.feed.starred.php +++ b/templates/part.feed.starred.php @@ -3,12 +3,16 @@ unread: Navigation.getStarredCount() > 0 }" class="starred"> - <a class="starred-icon" ng-href="#/items/starred/"> + <a class="icon-starred" ng-href="#/items/starred/"> <?php p($l->t('Starred')) ?> </a> - <span class="utils"> - <span class="unread-counter"> - {{ Navigation.getStarredCount() | unreadCountFormatter }} - </span> - </span> + + <div class="app-navigation-entry-utils"> + <ul> + <li class="app-navigation-entry-utils-counter" + ng-show="Navigation.getStarredCount() > 0"> + {{ Navigation.getStarredCount() | unreadCountFormatter }} + </li> + </ul> + </div> </li>
\ No newline at end of file diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php index 7381d68d7..f572f1d43 100644 --- a/templates/part.feed.unread.php +++ b/templates/part.feed.unread.php @@ -3,27 +3,28 @@ unread: Navigation.getUnreadCount() > 0 }"> - <a class="rss-icon" ng-href="#/items/" ng-if="!Navigation.isShowAll()"> + <a class="icon-rss" ng-href="#/items/" ng-if="!Navigation.isShowAll()"> <?php p($l->t('Unread articles'))?> </a> - <a class="rss-icon" ng-href="#/items/" ng-if="Navigation.isShowAll()"> + <a class="icon-rss" ng-href="#/items/" ng-if="Navigation.isShowAll()"> <?php p($l->t('All articles'))?> </a> - <div class="utils"> + <div class="app-navigation-entry-utils"> + <ul> + <li class="app-navigation-entry-utils-counter" + ng-show="Navigation.getUnreadCount() > 0"> + {{ Navigation.getUnreadCount() | unreadCountFormatter }} + </li> + <li class="app-navigation-entry-utils-menu-button"><button ng-click="optionsId = (optionsId == 'all' ? -1 : 'all')"></button></li> + </ul> + </div> + + <div class="app-navigation-entry-menu" ng-class="{'app-navigation-entry-menu-open': optionsId == 'all'}"> + <ul> + <li><button class="icon-checkmark" title="<?php p($l->t('Read all')); ?>" ng-click="Navigation.markRead()"></button></li> + </ul> + </div> - </div> - <span class="utils"> - <span class="unread-counter" ng-show="Navigation.getUnreadCount() > 0"> - {{ Navigation.getUnreadCount() | unreadCountFormatter }} - </span> - <!-- - <button class="svg action mark-read-icon" - ng-click="Navigation.markRead()" - title="<?php p($l->t('Mark read')) ?>" - ng-show="getTotalUnreadCount() > 0" - oc-tooltip data-placement="bottom"></button> - --> - </span> </li>
\ No newline at end of file diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 569e415eb..1c5cc3bc3 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -50,7 +50,7 @@ ng-show="feed.id && Navigation.getUnreadCount(feed.id) > 0 && !feed.error && !feed.editing"> {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }} </li> - <li><button class="app-navigation-entry-utils-menu-button" ng-click="optionsId = (optionsId == feed.id ? -1 : feed.id)"></button></li> + <li class="app-navigation-entry-utils-menu-button"><button ng-click="optionsId = (optionsId == feed.id ? -1 : feed.id)"></button></li> </ul> </div> @@ -58,6 +58,7 @@ <ul> <li><button class="icon-rename" title="<?php p($l->t('Rename feed')); ?>"></button></li> <li><button class="icon-delete" title="<?php p($l->t('Delete website')); ?>"></button></li> + <li><button class="icon-checkmark" title="<?php p($l->t('Read all')); ?>"></button></li> </ul> </div> |