Partial Fix #5681 - fix bootstrap4 detection

[roojs1] / scss / roojs-bootstrap / combobox.scss

diff --git a/scss/roojs-bootstrap/combobox.scss b/scss/roojs-bootstrap/combobox.scss
index cf3b723..595a103 100644 (file)
--- a/scss/roojs-bootstrap/combobox.scss
+++ b/scss/roojs-bootstrap/combobox.scss
@@ -195,6 +195,7 @@
 .roo-select2-container .x-combo-noedit {
    cursor: pointer;
    background-color: $body-bg;
+   display: table-cell;
 
 }
 .roo-select2-container .x-combo-noedit[disabled] {
@@ -220,7 +221,7 @@
 .dropdown-menu .checkbox label {
     width: 100%;
 }
-
+ 
 .roo-select2-container-multi .dropdown-menu .roo-select2-result .checkbox {
     margin-top: 0px;
     margin-bottom: 0px;
@@ -229,11 +230,20 @@
     margin-top: 3px;
     margin-bottom: 3px;
 }
-
+ 
 .roo-select2-container .input-group-addon {
-    padding: 6px 12px;
+    padding: 6px 4px;
     border: 1px solid $input-border;
     border-left: 0px;
+    display: table-cell;
+}
+/*  padding on navbars is different? */
+.navbar .roo-select2-container .input-group-addon {
+    padding: 6px 10px;
+}
+
+.roo-select2-container .dropdown-toggle::after {
+  margin-left: 0;
 }
 
 .roo-select2-container .roo-removable {
@@ -253,34 +263,15 @@
     z-index: 2;
     top: 5px;
 }
-
-/*
-.roo-select2-container .roo-removable.has-feedback .roo-combo-removable-btn {
-    position: absolute;
-    right: 40px;
-    z-index: 2;
-    top: 5px;
-}
-
-.roo-select2-container .roo-removable.has-feedback.input-group .roo-combo-removable-btn {
-    position: absolute;
-    right: 70px;
-    z-index: 2;
-    top: 5px;
-}
-
-
-.roo-select2-container.input-group .has-feedback .roo-combo-removable-btn {
-    position: absolute;
-    right: 35px;
-    z-index: 2;
-    top: 5px;
-}*/
-
+ 
 .has-warning .roo-select2-container-multi {
     border: 1px solid $brand-warning; //#8a6d3b;
 }
 
 .roo-ios-select {
     width: 100%;
-}
\ No newline at end of file
+}
+
+.roo-select2-container.input-group > .form-control {
+   width: 100%;
+}