From 044f4542baccc00ea6db4ec38cb0f65928242f61 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 9 Oct 2013 21:05:09 +0200 Subject: Mise à jour design (dropdown) + fichier fallback supprimé MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Suppression des boutons de fermeture pour les dropdowns : la fermeture se fait maintenant en cliquant n'importe où sur l'écran * Suppression fichier fallback.css pour le thème par défaut. Déplacement dans freshrss.css en fin de fichier pour bien le séparer du reste (#166) --- public/themes/flat-design/freshrss.css | 13 +++++++++++ public/themes/flat-design/global.css | 41 ++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 19 deletions(-) (limited to 'public/themes/flat-design') diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index bea574e37..49533f017 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -67,6 +67,9 @@ body { .aside.aside_feed .nav-form .dropdown .dropdown-menu { right: -20px; } + .aside.aside_feed .nav-form .dropdown .dropdown-menu:after { + right: 33px; + } .nav-login { display: none; @@ -138,6 +141,9 @@ body { .categories .feeds .dropdown .dropdown-menu { left: 0; } + .categories .feeds .dropdown .dropdown-menu:after { + left: 2px; + } .categories .feeds .item .dropdown-toggle i { background-image: none; } @@ -739,3 +745,10 @@ body { right: 10px; } } + +/*** FALLBACK ***/ +.dropdown .dropdown-menu:after { + -moz-transform: rotate(45deg); + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); +} diff --git a/public/themes/flat-design/global.css b/public/themes/flat-design/global.css index 5f645602b..0824d1bb3 100644 --- a/public/themes/flat-design/global.css +++ b/public/themes/flat-design/global.css @@ -203,13 +203,12 @@ input, select, textarea { min-height: 25px; line-height: 25px; } - .btn:hover { - background: #2980b9; - text-decoration: none; - } .btn.active, - .btn:active { + .btn:active, + .btn:hover, + .dropdown-target:target ~ .btn.dropdown-toggle { background: #2980b9; + text-decoration: none; } .btn.btn-important { @@ -351,6 +350,19 @@ input, select, textarea { border: 1px solid #95a5a6; border-radius: 3px; text-align: left; + } + .dropdown .dropdown-menu:after { + content: ""; + position: absolute; + top: -6px; + right: 13px; + width: 10px; + height: 10px; + background: #fff; + border-top: 1px solid #95a5a6; + border-left: 1px solid #95a5a6; + z-index: -10; + transform: rotate(45deg); } .dropdown .dropdown-menu .dropdown-header { display: block; @@ -412,23 +424,14 @@ input, select, textarea { z-index: 10; } .dropdown .dropdown-close { - display: inline-block; - position: absolute; - top: -10px; right: -10px; - width: 26px; - height: 26px; - background: #95a5a6; - line-height: 24px; - text-align: center; - border-radius: 3px; + display: inline; } .dropdown .dropdown-close a { + position: fixed; + top: 0; bottom: 0; + left: 0; right: 0; display: block; - width: 100%; - height: 100%; - } - .dropdown .dropdown-close:hover { - background: #7f8c8d; + z-index: -10; } /* ALERTS */ -- cgit v1.2.3