diff options
| author | Tom Christie | 2014-12-08 09:07:57 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-08 09:07:57 +0000 |
| commit | b440bd74be12f8676024ce0771c960ea37a4568b (patch) | |
| tree | 436abe4085db9b7de3658e6437bc6cc436ee8343 /rest_framework | |
| parent | 9879a5dcdc2e99dc2ebd23cd093a3e7ccec318fd (diff) | |
| parent | 0c0d65d23294d6976a3d7f9d47eb4b67440e908e (diff) | |
| download | django-rest-framework-b440bd74be12f8676024ce0771c960ea37a4568b.tar.bz2 | |
Merge pull request #2187 from loic/cosmetic_fixes
Cosmetic fixes in the API browser HTML.
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/static/rest_framework/js/default.js | 3 | ||||
| -rw-r--r-- | rest_framework/templates/rest_framework/login_base.html | 23 | ||||
| -rw-r--r-- | rest_framework/templates/rest_framework/raw_data_form.html | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js index bcb1964d..c8812132 100644 --- a/rest_framework/static/rest_framework/js/default.js +++ b/rest_framework/static/rest_framework/js/default.js @@ -24,7 +24,8 @@ prettyPrint(); // Bootstrap tooltips. $('.js-tooltip').tooltip({ - delay: 1000 + delay: 1000, + container: 'body' }); // Deal with rounded tab styling after tab clicks. diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index e050cbdc..8e6240a6 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -21,11 +21,11 @@ {% csrf_token %} <div id="div_id_username" class="clearfix control-group {% if form.username.errors %}error{% endif %}"> - <div class="controls"> - <label class="span4">Username:</label> - <input style="height: 25px" type="text" name="username" maxlength="100" + <div class="form-group"> + <label for="id_username">Username:</label> + <input type="text" name="username" maxlength="100" autocapitalize="off" - autocorrect="off" class="span12 textinput textInput" + autocorrect="off" class="form-control textinput textInput" id="id_username" required {% if form.username.value %}value="{{ form.username.value }}"{% endif %}> {% if form.username.errors %} @@ -36,12 +36,11 @@ </div> </div> <div id="div_id_password" - 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" - autocapitalize="off" autocorrect="off" class="span12 textinput textInput" + class="clearfix control-group {% if form.password.errors %}error{% endif %}"> + <div class="form-group"> + <label for="id_password">Password:</label> + <input type="password" name="password" maxlength="100" + autocapitalize="off" autocorrect="off" class="form-control textinput textInput" id="id_password" required> {% if form.password.errors %} <p class="text-error"> @@ -56,8 +55,8 @@ <div class="well well-small text-error" style="border: none">{{ error }}</div> {% endfor %} {% endif %} - <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 class="form-actions-no-box"> + <input type="submit" name="submit" value="Log in" class="btn btn-primary form-control" id="submit-id-submit"> </div> </form> </div> diff --git a/rest_framework/templates/rest_framework/raw_data_form.html b/rest_framework/templates/rest_framework/raw_data_form.html index 075279f7..b4c9f1a1 100644 --- a/rest_framework/templates/rest_framework/raw_data_form.html +++ b/rest_framework/templates/rest_framework/raw_data_form.html @@ -2,10 +2,10 @@ {% csrf_token %} {{ form.non_field_errors }} {% for field in form %} - <div class="control-group"> - {{ field.label_tag|add_class:"control-label" }} - <div class="controls"> - {{ field }} + <div class="form-group"> + {{ field.label_tag|add_class:"col-sm-2 control-label" }} + <div class="col-sm-10"> + {{ field|add_class:"form-control" }} <span class="help-block">{{ field.help_text }}</span> </div> </div> |