aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/baggy
diff options
context:
space:
mode:
authortcit <tcit@tcit.fr>2014-09-28 17:31:02 +0200
committertcit <tcit@tcit.fr>2014-09-28 17:31:02 +0200
commitffcd442989d743e6e0c8e27a24ce9fdeefb277fc (patch)
treef8ff66aba36c3d6dcc570f75e7f08ce783d4709b /themes/baggy
parenta0822259e76fb5a52d268ba1671d13e0e512af94 (diff)
parent2e8625c25fa603d0d870bf2f90821e900be27fd0 (diff)
downloadwallabag-ffcd442989d743e6e0c8e27a24ce9fdeefb277fc.tar.gz
wallabag-ffcd442989d743e6e0c8e27a24ce9fdeefb277fc.tar.zst
wallabag-ffcd442989d743e6e0c8e27a24ce9fdeefb277fc.zip
get up to date for merge
Diffstat (limited to 'themes/baggy')
-rwxr-xr-xthemes/baggy/config.twig10
-rwxr-xr-xthemes/baggy/css/main.css2
2 files changed, 8 insertions, 4 deletions
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 7bd229cb..3523cd08 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -136,11 +136,15 @@
136 <fieldset class="w500p"> 136 <fieldset class="w500p">
137 <div class="row"> 137 <div class="row">
138 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label> 138 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
139 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}"> 139 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
140 </div> 140 </div>
141 <div class="row"> 141 <div class="row">
142 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> 142 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
143 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> 143 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
144 </div>
145 <div class="row">
146 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
147 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
144 </div> 148 </div>
145 <div class="row mts txtcenter"> 149 <div class="row mts txtcenter">
146 <button type="submit">{% trans "Send" %}</button> 150 <button type="submit">{% trans "Send" %}</button>
@@ -161,5 +165,5 @@
161 </div> 165 </div>
162 </form> 166 </form>
163 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 167 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
164 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %} 168 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
165{% endblock %} 169{% endblock %}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 9c50786b..b775a291 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -89,7 +89,7 @@ form fieldset {
89 margin: 0; 89 margin: 0;
90} 90}
91 91
92form input[type="text"], select, form input[type="password"], form input[type="url"] { 92form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
93 border: 1px solid #999; 93 border: 1px solid #999;
94 padding: 0.5em 1em; 94 padding: 0.5em 1em;
95 min-width: 12em; 95 min-width: 12em;