Browse Source

fix select boostrap - refs #2681

Alex Aragón 6 years ago
parent
commit
df80b5a954
2 changed files with 10 additions and 2 deletions
  1. 8 0
      assets/css/scss/_base.scss
  2. 2 2
      main/inc/lib/pear/HTML/QuickForm/select.php

+ 8 - 0
assets/css/scss/_base.scss

@@ -234,6 +234,7 @@ hr {
 
 /** SELECT */
 
+/*
 .btn-select{
   color: #495057;
   background-color: white;
@@ -241,6 +242,13 @@ hr {
   &.bs-placeholder{
     color: $select-color !important;
   }
+}*/
+.bootstrap-select{
+  .dropdown-toggle{
+    &:after{
+      display: none;
+    }
+  }
 }
 
 .select2-container--default{

+ 2 - 2
main/inc/lib/pear/HTML/QuickForm/select.php

@@ -80,8 +80,8 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
             if (empty($attributes)) {
                 $attributes = []; // Initialize variable to avoid warning in PHP 7.1
             }
-            $attributes['class'] = $oldClass . ' selectpicker show-tick form-control';
-            $attributes['data-style'] = 'btn-select';
+            $attributes['class'] = $oldClass . 'form-control selectpicker show-tick ';
+            $attributes['data-style'] = 'custom-select';
             $attributes['data-live-search'] = 'true';
 
             if (isset($attributes['disable_js']) && $attributes['disable_js']) {