aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2014-10-31 18:44:42 +0100
committerThomas Citharel <tcit@tcit.fr>2014-10-31 18:44:42 +0100
commit224528f1debb06b40524fd84ed9a324c0b6131e2 (patch)
tree0230f937d5f598aeaebf23a85dfade665d67d2f9 /themes
parent87e37e82fdcc133a0ab1666241b68c39220067d1 (diff)
parentad2b61db80afed1cc052befad6ff9456530938b1 (diff)
downloadwallabag-224528f1debb06b40524fd84ed9a324c0b6131e2.tar.gz
wallabag-224528f1debb06b40524fd84ed9a324c0b6131e2.tar.zst
wallabag-224528f1debb06b40524fd84ed9a324c0b6131e2.zip
Merge pull request #909 from jsit/closebutton
Standardizing class names and styles for close buttons
Diffstat (limited to 'themes')
-rwxr-xr-xthemes/baggy/_pocheit-form.twig2
-rw-r--r--themes/baggy/_search-form.twig2
-rwxr-xr-xthemes/baggy/css/main.css44
3 files changed, 26 insertions, 22 deletions
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index 409707f0..2068cd31 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -1,7 +1,7 @@
1<div id="bagit-form" class="messages info"> 1<div id="bagit-form" class="messages info">
2 <form method="get" action="index.php" target="_blank" id="bagit-form-form"> 2 <form method="get" action="index.php" target="_blank" id="bagit-form-form">
3 <h2>{% trans "Save a link" %}</h2> 3 <h2>{% trans "Save a link" %}</h2>
4 <a href="javascript: void(null);" id="bagit-form-close" class="popup-close">&times;</a> 4 <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
5 <input type="hidden" name="autoclose" value="1" /> 5 <input type="hidden" name="autoclose" value="1" />
6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> 6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
7 <span id="add-link-result"></span> 7 <span id="add-link-result"></span>
diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 35f3a994..aec902ff 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,6 +1,6 @@
1<div id="search-form" class="messages info"> 1<div id="search-form" class="messages info">
2<form method="get" action="index.php"> 2<form method="get" action="index.php">
3 <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a> 3 <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
4 <input type="hidden" name="view" value="search"></input> 4 <input type="hidden" name="view" value="search"></input>
5 <label>{% trans "Search" %}:</label><input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" /> 5 <label>{% trans "Search" %}:</label><input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
6 <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input> 6 <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 873d1799..4e3404c1 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -572,24 +572,32 @@ footer a {
572 margin-left: 0; 572 margin-left: 0;
573} 573}
574 574
575.popup-close { 575.closeMessage,
576.close-button {
576 background: #000; 577 background: #000;
577 color: #FFF; 578 color: #FFF;
578 font-size: 1.4em; 579 font-size: 1.2em;
579 line-height: 1.6em; 580 line-height: 1.6;
580 width: 1.6em; 581 width: 1.6em;
581 height: 1.6em; 582 height: 1.6em;
582 text-align: center; 583 text-align: center;
583 text-decoration: none; 584 text-decoration: none;
585}
586 .closeMessage:hover,
587 .closeMessage:focus,
588 .close-button:hover,
589 .close-button:focus {
590 background: #999;
591 color: #000;
592 }
593
594.close-button--popup {
584 display: inline-block; 595 display: inline-block;
585 position: absolute; 596 position: absolute;
586 top: 0; 597 top: 0;
587 right: 0; 598 right: 0;
599 font-size: 1.4em;
588} 600}
589 .popup-close:hover {
590 background: #999;
591 color: #000;
592 }
593 601
594.active-current { 602.active-current {
595 background-color: #999; 603 background-color: #999;
@@ -787,18 +795,6 @@ margin-top:1em;
787 795
788.messages > * { display: inline-block;} 796.messages > * { display: inline-block;}
789 797
790.closeMessage {
791 background: #000;
792 color: #FFF;
793 padding: 0.2em 0.5em;
794 text-decoration: none;
795}
796
797 .closeMessage:hover, .closeMessage:focus {
798 background: #FFF;
799 color: #000;
800 }
801
802.warning { 798.warning {
803 /* font-size: 3em; 799 /* font-size: 3em;
804 color: #999; 800 color: #999;
@@ -1057,8 +1053,16 @@ pre code {
1057 display: none; 1053 display: none;
1058 } 1054 }
1059 1055
1060 #bagit-form, #search-form { 1056 .popup-form, #bagit-form, #search-form {
1061 left: 0; 1057 left: 0;
1058 width: 100%;
1059 border-left: none;
1060 }
1061
1062 .popup-form form,
1063 #bagit-form form,
1064 #search-form form {
1065 width: 100%;
1062 } 1066 }
1063} 1067}
1064 1068