From cd271fc485975e3089a85902f28e674065c5783d Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 30 Oct 2014 16:00:18 -0400 Subject: Making the close button more visually consistent on the menu popup forms --- themes/baggy/_pocheit-form.twig | 4 ++-- themes/baggy/_search-form.twig | 5 +++-- themes/baggy/css/main.css | 45 ++++++++++++++++++----------------------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index 57a928c0..409707f0 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -1,7 +1,7 @@
-

X - {% trans "Save a link" %}

+

{% trans "Save a link" %}

+ × diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig index 7b2c7082..45660b75 100644 --- a/themes/baggy/_search-form.twig +++ b/themes/baggy/_search-form.twig @@ -1,7 +1,8 @@
+ × - : + : -
\ No newline at end of file +
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 558fb208..6b5a1f4c 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -192,7 +192,7 @@ h2:after { padding-bottom: 1em; } - #links a { + #links > li > a { display: block; padding: 0.5em 2em 0.5em 1em; color: #FFF; @@ -208,7 +208,7 @@ h2:after { transition: all 0.5s ease; } - #links a:hover, #links a:focus { + #links > li > a:hover, #links > li > a:focus { background: #999; color: #000; } @@ -569,19 +569,28 @@ footer a { padding: 2em; } -a#bagit-form-close, a#search-form-close { +#bagit-form-form .addurl { + margin-left: 0; +} + +.popup-close { background: #000; color: #FFF; - padding: 0.2em 0.5em; + font-size: 1.4em; + line-height: 1.6em; + width: 1.6em; + height: 1.6em; + text-align: center; text-decoration: none; - display: inline-block; - float: right; - font-size: 0.6em; -} -a#bagit-form-close:hover, a#search-form-close:hover { - background: #999; - color: #000; + display: inline-block; + position: absolute; + top: 0; + right: 0; } + .popup-close:hover { + background: #999; + color: #000; + } .active-current { background-color: #999; @@ -665,20 +674,6 @@ a.add-to-wallabag-link-after:after { padding: 2em; } -a#search-form-close { - background: #000; - color: #FFF; - padding: 0.2em 0.5em; - text-decoration: none; - display: inline-block; - float: right; - font-size: 1.2em; -} -a#search-form-close:hover { - background: #999; - color: #000; -} - #submit-search{ margin-left: 4em; margin-top:1em; -- cgit v1.2.3