diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-24 12:05:28 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-11-24 12:05:28 +0100 |
| commit | 2e387749d55fe6a39e9c77c7272faf9c8d71591b (patch) | |
| tree | e5611363f7e06696758b81cfbce1e4e7d1c75792 | |
| parent | 4d60c911017e62b5c3810fdfa640a5176a05fc5c (diff) | |
Suite de icon()
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/284
| -rw-r--r-- | app/layout/nav_menu.phtml | 2 | ||||
| -rw-r--r-- | public/themes/default/freshrss.css | 13 | ||||
| -rw-r--r-- | public/themes/flat-design/freshrss.css | 13 |
3 files changed, 13 insertions, 15 deletions
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index affdaaa10..38a5a14a3 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -1,5 +1,5 @@ <div class="nav_menu"> - <a class="btn toggle_aside" href="#aside_flux"><?php echo icon('category-white'); ?></a> + <a class="btn toggle_aside" href="#aside_flux"><?php echo icon('category'); ?></a> <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?> <a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo icon('refresh'); ?></a> diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index 04b6c2e93..62dccc334 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -173,17 +173,16 @@ .categories .feeds .dropdown-menu:after { left: 2px; } - .categories .feeds .item .dropdown-toggle i { - background-image: none; + .categories .feeds .item .dropdown-toggle > .icon { + visibility: hidden; cursor: pointer; } - .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle i, - .categories .feeds .item:hover .dropdown-toggle i, - .categories .feeds .item.active .dropdown-toggle i { - background-image: url("../icons/configure.png"); - background-image: url("../icons/configure.svg"); + .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, + .categories .feeds .item:hover .dropdown-toggle > .icon, + .categories .feeds .item.active .dropdown-toggle > .icon { background-color: #fff; border-radius: 3px; + visibility: visible; } .post { diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index 4c15ca138..8c3205e76 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -162,17 +162,16 @@ body { .categories .feeds .dropdown-menu:after { left: 2px; } - .categories .feeds .item .dropdown-toggle i { - background-image: none; + .categories .feeds .item .dropdown-toggle > .icon { + visibility: hidden; cursor: pointer; } - .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle i, - .categories .feeds .item:hover .dropdown-toggle i, - .categories .feeds .item.active .dropdown-toggle i { - background-image: url("icons/configure.png"); - background-image: url("icons/configure.svg"); + .categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, + .categories .feeds .item:hover .dropdown-toggle > .icon, + .categories .feeds .item.active .dropdown-toggle > .icon { background-color: #95a5a6; border-radius: 3px; + visibility: visible; } .categories .btn:hover .notRead, .categories .btn.active .notRead { |