moparisthebest
/
wallabag
mirror of https://github.com/moparisthebest/wallabag
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #907 from jsit/login 

Some small design tweaks to the login page: Moving 'Stay signed in'...
This commit is contained in:
Thomas Citharel 2014-10-31 15:10:01 +01:00
parent 6fe9b616aa 1087b3cb4e
commit f23fd0ee5e
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
themes/baggy/_search-form.twig
View File

@ -2,7 +2,7 @@
<form method="get" action="index.php"> <form method="get" action="index.php">
<a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a> <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
<input type="hidden" name="view" value="search"></input> <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" /> <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 id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
</form> </form>
</div> </div>

11
themes/baggy/css/main.css
View File

@ -92,7 +92,6 @@ form fieldset {
form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] { form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
border: 1px solid #999; border: 1px solid #999;
padding: 0.5em 1em; padding: 0.5em 1em;
margin-left: 5px;
min-width: 12em; min-width: 12em;
color: #666; color: #666;
} }
@ -105,10 +104,6 @@ form input[type="text"], select, form input[type="password"], form input[type="u
} }
} }
fieldset label {
min-width: 12.5em;
}
.inline .row { .inline .row {
display: inline-block; display: inline-block;
margin-right: 0.5em; margin-right: 0.5em;
@ -120,10 +115,14 @@ fieldset label {
fieldset label { fieldset label {
display: inline-block; display: inline-block;
margin-right: 0.5em; min-width: 12.5em;
color: #666; color: #666;
} }
label {
margin-right: 0.5em;
}
form .row { form .row {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }

8
themes/baggy/login.twig
View File

@ -9,17 +9,17 @@
{% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %} {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
<div class="row"> <div class="row">
<label class="col w150p" for="login">{% trans "Username" %}</label> <label class="col w150p" for="login">{% trans "Username" %}</label>
<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} /> <input class="col" type="text" id="login" name="login" placeholder="{% trans "Username" %}" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
</div> </div>
<div class="row"> <div class="row">
<label class="col w150p" for="password">{% trans "Password" %}</label> <label class="col w150p" for="password">{% trans "Password" %}</label>
<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} /> <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
</div> </div>
<div class="row"> <div class="row">
<label class="col w150p" for="longlastingsession">{% trans "Stay signed in" %}</label>
<div class="col"> <div class="col">
<input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3"> <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
<small class="inbl">{% trans "(Do not check on public computers)" %}</small> <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
</div> </div>
</div> </div>