summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-02-12 21:50:13 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-02-12 21:51:46 +0100
commitbbfeb3146f0e00bfcca69b97f353d06894e85fd5 (patch)
treea2205fe3da6b9a96ea3a379892f5cb8f60272036
parentd7d6e01e494d773ee345b11a2eb8d7b9e769438a (diff)
downloadIshtar-bbfeb3146f0e00bfcca69b97f353d06894e85fd5.tar.bz2
Ishtar-bbfeb3146f0e00bfcca69b97f353d06894e85fd5.zip
CSS: improve display of criteria filter
-rw-r--r--ishtar_common/templates/blocks/bs_form_snippet.html2
-rw-r--r--scss/custom.scss7
-rw-r--r--version.py4
3 files changed, 9 insertions, 4 deletions
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index f0f729e2c..c5f9e2848 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -51,7 +51,7 @@
</button>
<div class="form-group col-12" id="advanced-search-info"></div>
<div class="row col-12 justify-content-center">
- <div class="form-row col-md-8">
+ <div class="form-row col-md-8 pb-3">
<div class="input-group search-widget">
<span class="input-group-prepend">
<span class="input-group-text" title="{% trans 'Filter...' %}">
diff --git a/scss/custom.scss b/scss/custom.scss
index b877a1255..6ee7fb3cd 100644
--- a/scss/custom.scss
+++ b/scss/custom.scss
@@ -106,6 +106,11 @@ pre {
padding-bottom: 0;
}
+#advanced-search-info {
+ margin-bottom: 0;
+}
+
+.search-widget
#advanced-search-info .alert{
margin-bottom: 0.6rem;
}
@@ -125,7 +130,7 @@ pre {
}
.modal-body.body-scroll{
- max-height: calc(100vh - 300px);
+ max-height: calc(100vh - 270px);
overflow-y: auto;
}
diff --git a/version.py b/version.py
index 3f23079ff..4623b70e0 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
-# 2.1.dev.29
-VERSION = (2, 1, 'dev', 29)
+# 2.1.dev.30
+VERSION = (2, 1, 'dev', 30)
def get_version():