diff options
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53401 -> 53473 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 9 | ||||
| -rw-r--r-- | docs/base-css.html | 5 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 5 | ||||
| -rw-r--r-- | less/forms.less | 13 |
5 files changed, 29 insertions, 3 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 2dcd38c33..f4a9241da 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a74f461c2..1d12c816f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1001,9 +1001,18 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .form-search .checkbox, .form-inline .radio, .form-inline .checkbox { + padding-left: 0; margin-bottom: 0; vertical-align: middle; } +.form-search .radio input[type="radio"], +.form-search .checkbox input[type="checkbox"], +.form-inline .radio input[type="radio"], +.form-inline .checkbox input[type="checkbox"] { + float: left; + margin-left: 0; + margin-right: 3px; +} .control-group { margin-bottom: 9px; } diff --git a/docs/base-css.html b/docs/base-css.html index 5a2e12748..86ea85533 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -910,7 +910,7 @@ For example, <code>section</code> should be wrapped as inline. <input type="text" class="input-small" placeholder="Email"> <input type="password" class="input-small" placeholder="Password"> <label class="checkbox"> - <input type="checkbox"> Remember? + <input type="checkbox"> Remember me </label> <button type="submit" class="btn">Sign in</button> </form> @@ -918,6 +918,9 @@ For example, <code>section</code> should be wrapped as inline. <form class="well form-inline"> <input type="text" class="input-small" placeholder="Email"> <input type="password" class="input-small" placeholder="Password"> + <label class="checkbox"> + <input type="checkbox"> Remember me + </label> <button type="submit" class="btn">Go</button> </form> </pre> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 96036d6ee..519f07bfe 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -834,7 +834,7 @@ <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}"> <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}"> <label class="checkbox"> - <input type="checkbox"> {{_i}}Remember?{{/i}} + <input type="checkbox"> {{_i}}Remember me{{/i}} </label> <button type="submit" class="btn">{{_i}}Sign in{{/i}}</button> </form> @@ -842,6 +842,9 @@ <form class="well form-inline"> <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}"> <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}"> + <label class="checkbox"> + <input type="checkbox"> {{_i}}Remember me{{/i}} + </label> <button type="submit" class="btn">{{_i}}Go{{/i}}</button> </form> </pre> diff --git a/less/forms.less b/less/forms.less index 177625204..cb2ff8510 100644 --- a/less/forms.less +++ b/less/forms.less @@ -475,14 +475,25 @@ select:focus:required:invalid { .form-inline .input-prepend .add-on { vertical-align: middle; } -// Inline checkbox/radio labels +// Inline checkbox/radio labels (remove padding on left) .form-search .radio, .form-search .checkbox, .form-inline .radio, .form-inline .checkbox { + padding-left: 0; margin-bottom: 0; vertical-align: middle; } +// Remove float and margin, set to inline-block +.form-search .radio input[type="radio"], +.form-search .checkbox input[type="checkbox"], +.form-inline .radio input[type="radio"], +.form-inline .checkbox input[type="checkbox"] { + float: left; + margin-left: 0; + margin-right: 3px; +} + // Margin to space out fieldsets .control-group { |