refactor(selects): apply new flat design

qdrk · Feb 18, 2016 · 54e3193 · 54e3193
1 parent 4668d84
commit 54e3193
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js b/src/app/pages/form/inputs/widgets/select/selectpicker.directive.js
@@ -14,7 +14,7 @@
       restrict: 'A',
       link: function( $scope, elem) {
         $timeout(function() {
-          $(elem).selectpicker();
+          $(elem).selectpicker({dropupAuto: false});
         }, 0);
       }
     };

diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss
@@ -433,7 +433,6 @@ label.custom-input-danger {
     color: #555555;
     &:focus {
       background: #ffffff;
-      border: 1px solid $default;
       box-shadow: none;
       outline: 0 !important;
     }
@@ -444,25 +443,32 @@ label.custom-input-danger {
     }
   }
   &.open {
+    .btn-default + .dropdown-menu{
+      border-top: 1px solid $disabled;
+    }
     .btn-default.dropdown-toggle {
       box-shadow: none;
       background-color: #ffffff;
       border-color: $default;
     }
-    .btn-default + .dropdown-menu {
+    .dropdown-menu {
       border-left: 1px solid $default;
       border-right: 1px solid $default;
-      top: calc(100% + 1px);
-    }
-    .btn {
-      border-radius: 0;
+      border-bottom-color: $default;
+      border-bottom-left-radius: 5px;
+      border-bottom-right-radius: 5px;
+    }
+    > .btn.dropdown-toggle {
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+      border-color: transparent;
+      box-shadow: none;
     }
     .dropdown-menu {
       border-top: none;
     }
   }
   &.with-search.open .btn-default + .dropdown-menu {
-    top: calc(100% + 3px);
     .bs-searchbox .form-control{
         background-color: rgba(0,0,0,0.5);
     }