mirror of
https://github.com/moparisthebest/wallabag
synced 2024-11-23 09:32:15 -05:00
fix merge errors
This commit is contained in:
commit
a63cd1b06f
@ -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">×</a>
|
||||
<h2>{%trans "Search" %}</h2>
|
||||
<a href="javascript: void(null);" id="search-form-close" class="popup-close">×</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>
|
||||
|
@ -1016,7 +1016,7 @@ pre code {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.popup-form {
|
||||
.popup-form, #bagit-form, #search-form {
|
||||
left: 0;
|
||||
width: 100%;
|
||||
border-left: none;
|
||||
|
Loading…
Reference in New Issue
Block a user