diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-02-14 18:31:57 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-02-14 18:31:57 +0100 |
| commit | c25eb9a7609a87c7fa51ac4a93aa95e29f4802fd (patch) | |
| tree | 3f4f51e386b53bc15cbe6e2da85e514463bc0895 | |
| parent | 43fe3a5c6f92ff65e444b3305e577779eee8302f (diff) | |
| download | Ishtar-c25eb9a7609a87c7fa51ac4a93aa95e29f4802fd.tar.bz2 Ishtar-c25eb9a7609a87c7fa51ac4a93aa95e29f4802fd.zip | |
CSS: improve checkbox fields, delete fields and fields with previous items
| -rw-r--r-- | ishtar_common/templates/blocks/bs_field_snippet.html | 2 | ||||
| -rw-r--r-- | scss/custom.scss | 13 | ||||
| -rw-r--r-- | version.py | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/ishtar_common/templates/blocks/bs_field_snippet.html b/ishtar_common/templates/blocks/bs_field_snippet.html index bbcc31597..43509eefc 100644 --- a/ishtar_common/templates/blocks/bs_field_snippet.html +++ b/ishtar_common/templates/blocks/bs_field_snippet.html @@ -1,5 +1,5 @@ {% load i18n %} - <div class="form-group {% if field.field.widget.attrs.cols or force_large_col %}col-lg-12{% else %}col-lg-6{% endif %}{% if field.errors %} is-invalid{% endif %}{% if field.field.required %} required{% endif %}" + <div class="form-group{% if not field.label %} no-label{% endif %} {% if field.field.widget.attrs.cols or force_large_col %}col-lg-12{% else %}col-lg-6{% endif %}{% if field.errors %} is-invalid{% endif %}{% if field.field.required %} required{% endif %}" data-alt-name="{{field.field.alt_name}}"> {% if field.label %}{{ field.label_tag }}{% endif %} {% if show_field_number or form.show_field_number %} diff --git a/scss/custom.scss b/scss/custom.scss index 6ee7fb3cd..5a237639c 100644 --- a/scss/custom.scss +++ b/scss/custom.scss @@ -41,12 +41,20 @@ label { display: block; } +.form-group.no-label{ + margin-top: 1.7rem; +} + .form-group li label { display: inline-block; + min-height: 1rem; + margin: 0; } + .form-group li .form-control { width: auto; + vertical-align: middle; } .form-group li input[type="radio"].form-control, @@ -252,8 +260,10 @@ div.dt-buttons{ } .previous-value{ - margin: 0.4em 0; display: block; + padding: 0.2em 0.4em; + background-color: $gray-200; + border: 1px solid $gray-400; } /* datatable - end */ @@ -554,6 +564,7 @@ div#foot a:hover { border-radius: .25rem; margin: 0; list-style: none; + height: auto; } ul.compact{ diff --git a/version.py b/version.py index 4623b70e0..78e85ce13 100644 --- a/version.py +++ b/version.py @@ -1,5 +1,5 @@ -# 2.1.dev.30 -VERSION = (2, 1, 'dev', 30) +# 2.1.dev.31 +VERSION = (2, 1, 'dev', 31) def get_version(): |