diff options
| author | tcit <tcit@tcit.fr> | 2014-10-31 18:54:08 +0100 |
|---|---|---|
| committer | tcit <tcit@tcit.fr> | 2014-10-31 18:54:08 +0100 |
| commit | a63cd1b06ff74edbb47b9f4dae16268e1737c13a (patch) | |
| tree | 6cd7efaae2395582422803e3678485f8b959aeb0 /themes/baggy | |
| parent | ccaefcf69a5e2e9404a40b7377fbdfe9627c0320 (diff) | |
| parent | 15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c (diff) | |
| download | wallabag-a63cd1b06ff74edbb47b9f4dae16268e1737c13a.tar.gz wallabag-a63cd1b06ff74edbb47b9f4dae16268e1737c13a.tar.zst wallabag-a63cd1b06ff74edbb47b9f4dae16268e1737c13a.zip | |
fix merge errors
Diffstat (limited to 'themes/baggy')
| -rw-r--r-- | themes/baggy/_search-form.twig | 4 | ||||
| -rwxr-xr-x | themes/baggy/css/main.css | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig index 77cd8461..4add9294 100644 --- a/themes/baggy/_search-form.twig +++ b/themes/baggy/_search-form.twig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <div id="search-form" class="messages info popup-form"> | 1 | <div id="search-form" class="messages info popup-form"> |
| 2 | <form method="get" action="index.php"> | 2 | <form method="get" action="index.php"> |
| 3 | <h2>{%trans "Search" %}</h2> | 3 | <h2>{%trans "Search" %}</h2> |
| 4 | <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">×</a> | 4 | <a href="javascript: void(null);" id="search-form-close" class="popup-close">×</a> |
| 5 | <input type="hidden" name="view" value="search"></input> | 5 | <input type="hidden" name="view" value="search"></input> |
| 6 | <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br> | 6 | <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br> |
| 7 | <input id="submit-search" type="submit" value="{% trans "Search" %}"></input> | 7 | <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 93294359..ce314860 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css | |||
| @@ -1016,7 +1016,7 @@ pre code { | |||
| 1016 | display: none; | 1016 | display: none; |
| 1017 | } | 1017 | } |
| 1018 | 1018 | ||
| 1019 | .popup-form { | 1019 | .popup-form, #bagit-form, #search-form { |
| 1020 | left: 0; | 1020 | left: 0; |
| 1021 | width: 100%; | 1021 | width: 100%; |
| 1022 | border-left: none; | 1022 | border-left: none; |