mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-15 21:41:06 +00:00
Code Issues Projects Releases Wiki Activity

fix merge errors

Browse source
This commit is contained in:
tcit 2014-10-31 18:54:08 +01:00
commit a63cd1b06f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
themes/baggy/_search-form.twig
View file

@ -1,7 +1,7 @@
<div id="search-form" class="messages info popup-form">
<form method="get" action="index.php">
<h2>{%trans "Search" %}</h2>
<a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
<h2>{%trans "Search" %}</h2>
<a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
<input type="hidden" name="view" value="search"></input>
<input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br>
<input id="submit-search" type="submit" value="{% trans "Search" %}"></input>

2
themes/baggy/css/main.css
View file

@ -1016,7 +1016,7 @@ pre code {
display: none;
}
.popup-form {
.popup-form, #bagit-form, #search-form {
left: 0;
width: 100%;
border-left: none;