From 242746fd1769c9b6668d586e1f5ba2a141bf0000 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 31 Oct 2014 10:44:20 -0400 Subject: [PATCH 1/5] Changing close message button to use × instead of X --- inc/3rdparty/class.messages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/3rdparty/class.messages.php b/inc/3rdparty/class.messages.php index 27c28f4..fbca0df 100644 --- a/inc/3rdparty/class.messages.php +++ b/inc/3rdparty/class.messages.php @@ -44,7 +44,7 @@ class Messages { var $msgId; var $msgTypes = array( 'help', 'info', 'warning', 'success', 'error' ); var $msgClass = 'messages'; - var $msgWrapper = "
X\n%s
\n"; + var $msgWrapper = "
×\n%s
\n"; var $msgBefore = '

'; var $msgAfter = "

\n"; From 827bd1f8990e18e1978c95484680d51524ca19bf Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 31 Oct 2014 11:10:38 -0400 Subject: [PATCH 2/5] Standardizing class names and styles for close buttons --- themes/baggy/_pocheit-form.twig | 2 +- themes/baggy/_search-form.twig | 2 +- themes/baggy/css/main.css | 34 +++++++++++++++------------------ 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index 409707f..2068cd3 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -1,7 +1,7 @@

{% trans "Save a link" %}

- × + × diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig index 35f3a99..aec902f 100644 --- a/themes/baggy/_search-form.twig +++ b/themes/baggy/_search-form.twig @@ -1,6 +1,6 @@
- × + × diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 873d179..0170497 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -572,24 +572,32 @@ footer a { margin-left: 0; } -.popup-close { +.closeMessage, +.close-button { background: #000; color: #FFF; - font-size: 1.4em; - line-height: 1.6em; + font-size: 1.2em; + line-height: 1.6; width: 1.6em; height: 1.6em; text-align: center; text-decoration: none; +} + .closeMessage:hover, + .closeMessage:focus, + .close-button:hover, + .close-button:focus { + background: #999; + color: #000; + } + +.close-button--popup { display: inline-block; position: absolute; top: 0; right: 0; + font-size: 1.4em; } - .popup-close:hover { - background: #999; - color: #000; - } .active-current { background-color: #999; @@ -787,18 +795,6 @@ margin-top:1em; .messages > * { display: inline-block;} -.closeMessage { - background: #000; - color: #FFF; - padding: 0.2em 0.5em; - text-decoration: none; -} - - .closeMessage:hover, .closeMessage:focus { - background: #FFF; - color: #000; - } - .warning { /* font-size: 3em; color: #999; From 8519cc796f4815ab1a3da70e081b77599741f975 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 31 Oct 2014 12:31:13 -0400 Subject: [PATCH 3/5] Moving search-form style out of messages css and into style.css --- themes/default/css/messages.css | 5 ----- themes/default/css/style.css | 11 ++++++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/themes/default/css/messages.css b/themes/default/css/messages.css index 3ad4e34..46b5479 100644 --- a/themes/default/css/messages.css +++ b/themes/default/css/messages.css @@ -8,11 +8,6 @@ border-radius: 4px; } -/* Search form message needs a little more width, depending on translations */ -#search-form { - width: 420px; -} - .messages a.closeMessage { display: none; float: right; diff --git a/themes/default/css/style.css b/themes/default/css/style.css index e254d48..b25373d 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -417,6 +417,15 @@ a.add-to-wallabag-link-after:after { padding-left: 10px; } +/* ========================================================================== + "Search" popup div related styles + ========================================================================== */ + +/* Search form message needs a little more width, depending on translations */ +#search-form { + width: 420px; +} + .opacity03 { /*opacity: 0.3;*/ } @@ -435,4 +444,4 @@ pre code { font-family: "Courier New", Courier, monospace; border: 1px solid #ddd; font-size: 0.96em; -} \ No newline at end of file +} From 344c8f6b5c2636b74492956f53f3bc06dcb5c8d1 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 31 Oct 2014 13:28:39 -0400 Subject: [PATCH 4/5] Fixing popup form width issue on narrow width --- themes/baggy/css/main.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 0170497..2ef3542 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -1053,8 +1053,15 @@ pre code { display: none; } - #bagit-form, #search-form { + .popup-form, #bagit-form, #search-form { left: 0; + width: 100%; + } + + .popup-form form, + #bagit-form form, + #search-form form { + width: 100%; } } From ad2b61db80afed1cc052befad6ff9456530938b1 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 31 Oct 2014 13:32:34 -0400 Subject: [PATCH 5/5] Removing left border on popup forms on mobile widths --- themes/baggy/css/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 2ef3542..4e3404c 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -1056,6 +1056,7 @@ pre code { .popup-form, #bagit-form, #search-form { left: 0; width: 100%; + border-left: none; } .popup-form form,