found prefix bug and fix for #226

Robdel12 · Jul 17, 2014 · 8ca8fc2 · 8ca8fc2
1 parent 9a2d049
commit 8ca8fc2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/css/dropkick.css b/css/dropkick.css
@@ -1,6 +1,6 @@
 .dk-select, .dk-select *, .dk-select *:before, .dk-select *:after, .dk-select-multi, .dk-select-multi *, .dk-select-multi *:before, .dk-select-multi *:after {
-  -prefix-box-sizing: border-box;
-  -prefix-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
   box-sizing: border-box; }
 
 .dk-select, .dk-select-multi {
@@ -20,7 +20,7 @@
   border: 1px solid #CCCCCC;
   border-radius: 0.4em;
   padding: 0 1.5em 0 0.5em;
-  -prefix-text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
   text-overflow: ellipsis; }
   .dk-selected:before, .dk-selected:after {
     content: '';
@@ -67,6 +67,7 @@
   border: 1px solid #CCCCCC;
   border-radius: 0.4em;
   overflow-x: hidden;
+  overflow-y: auto;
   max-height: 10.5em;
   list-style: none;
   padding: 0.25em 0;

diff --git a/css/dropkick.scss b/css/dropkick.scss
@@ -2,21 +2,17 @@
 
 @mixin dk-pre($property, $value, $prefixes) {
   @each $prefix in $prefixes {
-    @if $prefix != spec {
-      -#{prefix}-#{$property}: $value;
-    }
-    @else {
-      #{$property}: $value;
-    }
+    -#{$prefix}-#{$property}: $value;
   }
+  #{$property}: $value;
 }
 
 @mixin dk-bxsz($box) {
-  @include dk-pre(box-sizing, $box, webkit moz spec);
+  @include dk-pre(box-sizing, $box, webkit moz);
 }
 
 @mixin dk-txtflow($text) {
-  @include dk-pre(text-overflow, $text, o spec);
+  @include dk-pre(text-overflow, $text, o);
 }
 
 $dk-color-aux: #3297fd !default;
@@ -111,6 +107,7 @@ $dk-disabled-color: #BBBBBB !default;
   border: 1px solid $dk-border-color;
   border-radius: $dk-border-radius;
   overflow-x: hidden;
+  overflow-y: auto;
   max-height: 10.5em;
   list-style: none;
   padding: 0.25em 0;

diff --git a/production/css/dropkick.css b/production/css/dropkick.css
@@ -1,6 +1,6 @@
 .dk-select, .dk-select *, .dk-select *:before, .dk-select *:after, .dk-select-multi, .dk-select-multi *, .dk-select-multi *:before, .dk-select-multi *:after {
-  -prefix-box-sizing: border-box;
-  -prefix-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
   box-sizing: border-box; }
 
 .dk-select, .dk-select-multi {
@@ -20,7 +20,7 @@
   border: 1px solid #CCCCCC;
   border-radius: 0.4em;
   padding: 0 1.5em 0 0.5em;
-  -prefix-text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
   text-overflow: ellipsis; }
   .dk-selected:before, .dk-selected:after {
     content: '';
@@ -67,6 +67,7 @@
   border: 1px solid #CCCCCC;
   border-radius: 0.4em;
   overflow-x: hidden;
+  overflow-y: auto;
   max-height: 10.5em;
   list-style: none;
   padding: 0.25em 0;