From c478985097081f35e9ddb85d53f74bcb59dd749a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Sun, 17 Sep 2017 14:45:57 +0200
Subject: [PATCH] Improvements in forms (spacing, alignment, pretty checkboxes)

---
 skins/elastic/styles/widgets/forms.less | 2 ++
 skins/elastic/ui.js                     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index ecd4df7d8..ee6e0eab1 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -153,6 +153,8 @@ html.ms .propform {
 
 td.editfield { width: 99%;  /* TODO */ }
 
+.form-group { margin-bottom: .5rem; /* overwrites Bootstrap style */ }
+
 
 /*** Forms in popups ***/
 
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 0041732d2..b19a59025 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -262,7 +262,7 @@ function rcube_elastic_ui()
         $('[data-list]').each(function() {
             $('input[type="checkbox"]', this).each(function() { pretty_checkbox(this); });
         });
-        $('[type=checkbox]', $('table.propform')).each(function() { pretty_checkbox(this); });
+        $('table.propform input[type=checkbox], .form-check > input').each(function() { pretty_checkbox(this); });
 
         // Assign .formcontainer class to the iframe body, when it
         // contains .formcontent and .formbuttons.
@@ -450,7 +450,7 @@ function rcube_elastic_ui()
                 last = cells.last();
 
                 $('label', first).addClass('col-form-label');
-                first.addClass('col-sm-4 col-form-label');
+                first.addClass('col-sm-4');
                 last.addClass('col-sm-8');
 
                 if (last.find('[type=checkbox]').length) {