Skip to content

Merge upstream #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrickXu merged 7 commits into from
Nov 25, 2014
Merged

Merge upstream #1

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
790a651
Fixed database update instructions
LuRsT Nov 24, 2014
918b9cc
Added missing import in tutorial snippet
LuRsT Nov 24, 2014
eb77de4
Merge pull request #2117 from LuRsT/patch-6
xordoquy Nov 24, 2014
3371131
Merge pull request #2116 from LuRsT/patch-5
lovelydinosaur Nov 24, 2014
bdacb66
Lowercase HTML label tag. Refs #2121.
lovelydinosaur Nov 25, 2014
735d225
Merge branch 'master' of https://github.com/tomchristie/django-rest-f…
lovelydinosaur Nov 25, 2014
ecc26f6
Style tweaks to login template.
lovelydinosaur Nov 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Style tweaks to login template.
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Nov 25, 2014
commit ecc26f6cb1e8b1f1a4cd72cf980b750aeed65cf7
5 changes: 3 additions & 2 deletions rest_framework/templates/rest_framework/login_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
</div>
</div>
<div id="div_id_password"
class="clearfix control-group {% if form.password.errors %}error{% endif %}">
class="clearfix control-group {% if form.password.errors %}error{% endif %}"
style="margin-top: 10px">
<div class="controls">
<label class="span4">Password:</label>
<input style="height: 25px" type="password" name="password" maxlength="100"
Expand All @@ -55,7 +56,7 @@
<div class="well well-small text-error" style="border: none">{{ error }}</div>
{% endfor %}
{% endif %}
<div class="form-actions-no-box">
<div class="form-actions-no-box" style="margin-top: 20px">
<input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit">
</div>
</form>
Expand Down