diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-08 10:56:09 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-08 10:56:09 +0200 |
| commit | b0809fcf5eec9d19f335bbed57102beadefba276 (patch) | |
| tree | 675e5c11c5bd5a637e0d3940c9825022966b8c69 | |
| parent | d9a658858076aa6dc392f38d3d8dcf5838af23b8 (diff) | |
Améliore affichage flux vides (voir ticket #169)
Les couleurs sont mieux gérées selon l'action
| -rw-r--r-- | app/layout/aside_feed.phtml | 3 | ||||
| -rw-r--r-- | public/themes/default/freshrss.css | 6 | ||||
| -rw-r--r-- | public/themes/default/global.css | 7 | ||||
| -rw-r--r-- | public/themes/flat-design/global.css | 9 |
4 files changed, 24 insertions, 1 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index cab6944e2..f9503e940 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -44,7 +44,8 @@ <?php if (!empty ($this->feeds)) { ?> <?php foreach ($this->feeds as $feed) { ?> - <li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?>"> + <?php $nbEntries = $feed->nbEntries (); ?> + <li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>"> <a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>"> <img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" /> <?php echo $feed->name (); ?> diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index f43fa3c3f..6e996cb4d 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -125,6 +125,12 @@ .categories .feeds .item.empty .feed { color: #e67e22; } + .categories .feeds .item.empty.active { + background: #e67e22; + } + .categories .feeds .item.empty.active .feed { + color: #fff; + } .categories .feeds .item.error .feed { color: #BD362F; } diff --git a/public/themes/default/global.css b/public/themes/default/global.css index 37192cb22..c11032f23 100644 --- a/public/themes/default/global.css +++ b/public/themes/default/global.css @@ -289,6 +289,13 @@ input, select, textarea { color: #fff; background: #BD362F; } + .nav.nav-list .item.empty a { + color: #f39c12; + } + .nav.nav-list .item.active.empty a { + color: #fff; + background: #f39c12; + } .nav.nav-list .nav-header { padding: 0 10px; diff --git a/public/themes/flat-design/global.css b/public/themes/flat-design/global.css index e4db6c59f..56e881f26 100644 --- a/public/themes/flat-design/global.css +++ b/public/themes/flat-design/global.css @@ -275,10 +275,19 @@ input, select, textarea { .nav.nav-list .item.error a { color: #BD362F; } + .nav.nav-list .item:hover.error a, .nav.nav-list .item.active.error a { color: #fff; background: #BD362F; } + .nav.nav-list .item.empty a { + color: #f39c12; + } + .nav.nav-list .item:hover.empty a, + .nav.nav-list .item.active.empty a { + color: #fff; + background: #f39c12; + } .nav.nav-list .nav-header { padding: 0 10px; |