From: tcit <tcit@tcit.fr>
Date: Fri, 31 Oct 2014 17:47:54 +0000 (+0100)
Subject: merge
X-Git-Tag: 1.8.1^2~9^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ccaefcf69a5e2e9404a40b7377fbdfe9627c0320;p=github%2Fwallabag%2Fwallabag.git

merge
---

ccaefcf69a5e2e9404a40b7377fbdfe9627c0320
diff --cc themes/baggy/_pocheit-form.twig
index 2068cd31,88d32757..bf2ae903
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@@ -1,7 -1,7 +1,7 @@@
- <div id="bagit-form" class="messages info">
+ <div id="bagit-form" class="messages info popup-form">
      <form method="get" action="index.php" target="_blank" id="bagit-form-form">
          <h2>{% trans "Save a link" %}</h2>
 -        <a href="javascript: void(null);" id="bagit-form-close" class="popup-close">&times;</a>
 +        <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
          <input type="hidden" name="autoclose" value="1" />
          <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
          <span id="add-link-result"></span>
diff --cc themes/baggy/_search-form.twig
index aec902ff,b1e17dd8..77cd8461
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@@ -1,8 -1,9 +1,9 @@@
- <div id="search-form" class="messages info">
+ <div id="search-form" class="messages info popup-form">
  <form method="get" action="index.php">
-         <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>
++        <h2>{%trans "Search" %}</h2>
++	<a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
          <input type="hidden" name="view" value="search"></input>
-         <label>{% trans "Search" %}:</label><input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
-         <input id="submit-search" type="submit" value="{% trans "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>
  </form>
  </div>
diff --cc themes/baggy/css/main.css
index 4e3404c1,2f3af95e..93294359
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@@ -1053,16 -1020,8 +1016,16 @@@ pre code 
      display: none;
    }
  
-   .popup-form, #bagit-form, #search-form {
+   .popup-form {
      left: 0;
 +    width: 100%;
 +    border-left: none;
 +  }
 +
 +  .popup-form form,
 +  #bagit-form form,
 +  #search-form form {
 +    width: 100%;
    }
  }