Merge pull request #39 from w33ble/border-width

Move more border rules to variables
alxlit · Oct 16, 2014 · 9111a75 · 9111a75
2 parents 3537817 + 20405fa
commit 9111a75
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/bootstrap-chosen-variables.less b/bootstrap-chosen-variables.less
@@ -8,14 +8,14 @@
 //
 
 @chosen-background: @input-bg;
-@chosen-border: @input-border;
+@chosen-border: 1px solid @input-border;
 @chosen-border-radius: @input-border-radius;
 @chosen-multi-border-radius: @chosen-border-radius;
 @chosen-box-shadow: ~"inset 0 1px 1px rgba(0, 0, 0, .075)";
 @chosen-drop-border: @input-border;
 @chosen-drop-box-shadow: ~"0 8px 8px rgba(0, 0, 0, .25)";
 @chosen-drop-zindex: 1060;
-@chosen-focus-border: @input-border-focus;
+@chosen-focus-border: 1px solid @input-border-focus;
 @chosen-focus-box-shadow: ~"0 1px 1px rgba(0, 0, 0, .075) inset, 0 0 8px rgba(82, 168, 236, .6)";
 @chosen-focus-transition: ~"border linear .2s, box-shadow linear .2s";
 @chosen-height: @input-height-base;

diff --git a/bootstrap-chosen-variables.scss b/bootstrap-chosen-variables.scss
@@ -1,13 +1,13 @@
 $chosen-background: $input-bg !default;
-$chosen-border: $input-border !default;
+$chosen-border: 1px solid $input-border !default;
 $chosen-border-color: $input-border-focus;
 $chosen-border-radius: $input-border-radius !default;
 $chosen-multi-border-radius: $chosen-border-radius !default;
 $chosen-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075) !default;
 $chosen-drop-border: $input-border !default;
 $chosen-drop-box-shadow: 0 8px 8px rgba(0, 0, 0, .25) !default;
 $chosen-drop-zindex: 1060 !default;
-$chosen-focus-border: $input-border-focus !default;
+$chosen-focus-border: 1px solid $input-border-focus !default;
 $chosen-focus-box-shadow: 0 1px 1px rgba(0, 0, 0, .075) inset, 0 0 8px $chosen-border-color !default;
 $chosen-focus-transition: border linear .2s, box-shadow linear .2s !default;
 $chosen-height: $input-height-base !default;

diff --git a/bootstrap-chosen.less b/bootstrap-chosen.less
@@ -132,7 +132,7 @@
     -webkit-background-clip: padding-box;
        -moz-background-clip: padding;
             background-clip: padding-box;
-    border: 1px solid @chosen-border;
+    border: @chosen-border;
     .border-top-radius(@chosen-border-radius);
     .border-bottom-radius(@chosen-border-radius);
     .box-shadow(@chosen-box-shadow);
@@ -201,7 +201,7 @@
 
     input[type="text"] {
       background: url("@{chosen-sprite-path}") no-repeat 100% -20px, @chosen-background;
-      border: 1px solid @chosen-border;
+      border: @chosen-border;
       .border-top-radius(@chosen-border-radius);
       .border-bottom-radius(@chosen-border-radius);
       .box-shadow(@chosen-box-shadow);
@@ -232,7 +232,7 @@
 .chosen-container-multi {
   .chosen-choices {
     background-color: @chosen-background;
-    border: 1px solid @chosen-border;
+    border: @chosen-border;
     .border-top-radius(@chosen-multi-border-radius);
     .border-bottom-radius(@chosen-multi-border-radius);
     .box-shadow(@chosen-box-shadow);
@@ -275,7 +275,7 @@
          -moz-background-clip: padding;
               background-clip: padding-box;
       background-color: @gray-lighter;
-      border: 1px solid @chosen-border;
+      border: @chosen-border;
       .border-top-radius(@chosen-border-radius);
       .border-bottom-radius(@chosen-border-radius);
       #gradient > .vertical(white, @gray-lighter);
@@ -327,14 +327,14 @@
 
 .chosen-container-active {
   .chosen-single {
-    border: 1px solid @chosen-focus-border;
+    border: @chosen-focus-border;
     .box-shadow(@chosen-focus-box-shadow);
     .transition(@chosen-focus-transition);
   }
 
   &.chosen-with-drop .chosen-single {
     background-color: @input-bg;
-    border: 1px solid @chosen-focus-border;
+    border: @chosen-focus-border;
     .border-bottom-radius(0);
     .box-shadow(@chosen-focus-box-shadow);
     .transition(@chosen-focus-transition);
@@ -350,7 +350,7 @@
   }
 
   .chosen-choices {
-    border: 1px solid @chosen-focus-border;
+    border: @chosen-focus-border;
     .border-bottom-radius(0);
     .box-shadow(@chosen-focus-box-shadow);
     .transition(@chosen-focus-transition);

diff --git a/bootstrap-chosen.scss b/bootstrap-chosen.scss
@@ -132,7 +132,7 @@
     -webkit-background-clip: padding-box;
        -moz-background-clip: padding;
             background-clip: padding-box;
-    border: 1px solid $chosen-border;
+    border: $chosen-border;
     @include border-top-radius($chosen-border-radius);
     @include border-bottom-radius($chosen-border-radius);
     @include box-shadow($chosen-box-shadow);
@@ -201,7 +201,7 @@
 
     input[type="text"] {
       background: url($chosen-sprite-path) no-repeat 100% -20px, $chosen-background;
-      border: 1px solid $chosen-border;
+      border: $chosen-border;
       @include border-top-radius($chosen-border-radius);
       @include border-bottom-radius($chosen-border-radius);
       @include box-shadow($chosen-box-shadow);
@@ -232,7 +232,7 @@
 .chosen-container-multi {
   .chosen-choices {
     background-color: $chosen-background;
-    border: 1px solid $chosen-border;
+    border: $chosen-border;
     @include border-top-radius($chosen-multi-border-radius);
     @include border-bottom-radius($chosen-multi-border-radius);
     @include box-shadow($chosen-box-shadow);
@@ -275,7 +275,7 @@
          -moz-background-clip: padding;
               background-clip: padding-box;
       background-color: $gray-lighter;
-      border: 1px solid $chosen-border;
+      border: $chosen-border;
       @include border-top-radius($chosen-border-radius);
       @include border-bottom-radius($chosen-border-radius);
       @include gradient-vertical(white, $gray-lighter);
@@ -327,14 +327,14 @@
 
 .chosen-container-active {
   .chosen-single {
-    border: 1px solid $chosen-focus-border;
+    border: $chosen-focus-border;
     @include box-shadow($chosen-focus-box-shadow);
     @include transition($chosen-focus-transition);
   }
 
   &.chosen-with-drop .chosen-single {
     background-color: $input-bg;
-    border: 1px solid $chosen-focus-border;
+    border: $chosen-focus-border;
     @include border-bottom-radius(0);
     @include box-shadow($chosen-focus-box-shadow);
     @include transition($chosen-focus-transition);
@@ -350,7 +350,7 @@
   }
 
   .chosen-choices {
-    border: 1px solid $chosen-focus-border;
+    border: $chosen-focus-border;
     @include border-bottom-radius(0);
     @include box-shadow($chosen-focus-box-shadow);
     @include transition($chosen-focus-transition);