From 49ace2413132a2c091a2a51de62843bd7d5a238f Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Mon, 24 Apr 2017 16:50:55 +0200 Subject: [PATCH] proper select2 defaults, manual top 5 countries --- _src/_assets/javascripts/bigchain/forms.js | 10 +++++----- .../bigchain/_select2-bigchaindb/layout.scss | 20 +++++++++---------- _src/_includes/form-enterprise.html | 13 +++++++++++- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/_src/_assets/javascripts/bigchain/forms.js b/_src/_assets/javascripts/bigchain/forms.js index 4165f2b..077c656 100644 --- a/_src/_assets/javascripts/bigchain/forms.js +++ b/_src/_assets/javascripts/bigchain/forms.js @@ -47,11 +47,11 @@ var Forms = (function(w, d, $) { } }, initSelect: function(el) { - _config.form.find('select').select2({ - minimumResultsForSearch: 15, - theme: 'bigchaindb', - placeholder: '\xa0' // that's   - }); + $.fn.select2.defaults.set('minimumResultsForSearch', '15') + $.fn.select2.defaults.set('theme', 'bigchaindb') + $.fn.select2.defaults.set('placeholder', '\xa0') // that's   + + _config.form.find('select').select2(); } } diff --git a/_src/_assets/styles/bigchain/_select2-bigchaindb/layout.scss b/_src/_assets/styles/bigchain/_select2-bigchaindb/layout.scss index 034d403..d27e6fc 100644 --- a/_src/_assets/styles/bigchain/_select2-bigchaindb/layout.scss +++ b/_src/_assets/styles/bigchain/_select2-bigchaindb/layout.scss @@ -79,6 +79,7 @@ &[role=group] { padding: 0; + border-bottom: 2px dashed $gray; } &[aria-disabled=true] { @@ -89,13 +90,18 @@ background-color: transparent; } + .select2-results__group { + padding: 6px; + padding-bottom: 0; + cursor: default; + display: block; + + &:empty { display: none; } + } + .select2-results__option { padding-left: $spacer; - .select2-results__group { - padding-left: 0; - } - .select2-results__option { margin-left: -$spacer; padding-left: $spacer * 2; @@ -127,10 +133,4 @@ background-color: $component-active-bg; color: $component-active-color; } - - .select2-results__group { - cursor: default; - display: block; - padding: 6px; - } } diff --git a/_src/_includes/form-enterprise.html b/_src/_includes/form-enterprise.html index 1e483e2..7249926 100644 --- a/_src/_includes/form-enterprise.html +++ b/_src/_includes/form-enterprise.html @@ -29,8 +29,19 @@