Permalink
Browse files

Merge branch 'master' of https://github.com/mlharvest/chosen into mlh…

…arvest-master

Conflicts:
	chosen/chosen.css
  • Loading branch information...
2 parents dcbac1a + bd2cc54 commit add519f2ad23839e5855fb30a0cf762a275b09aa @pfiller pfiller committed Jan 19, 2012
Showing with 81 additions and 62 deletions.
  1. BIN chosen/chosen-sprite.png
  2. +81 −62 chosen/chosen.css
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -23,29 +23,32 @@
/* @group Single Chosen */
.chzn-container-single .chzn-single {
- background-color: #fff;
- background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
- background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
- background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
- background-image: -o-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
- background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
+ background-color: #ffffff;
+ background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f4f4f4), color-stop(0.48, #eeeeee), color-stop(0.5, #f6f6f6), color-stop(0.8, #ffffff));
+ background-image: -webkit-linear-gradient(center bottom, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
+ background-image: -moz-linear-gradient(center bottom, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
+ background-image: -o-linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
+ background-image: -ms-linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
- background-image: linear-gradient(top, #eeeeee 0%,#ffffff 50%);
- -webkit-border-radius: 4px;
- -moz-border-radius : 4px;
- border-radius : 4px;
+ background-image: linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
+ -webkit-border-radius: 5px;
+ -moz-border-radius : 5px;
+ border-radius : 5px;
-moz-background-clip : padding;
-webkit-background-clip: padding-box;
background-clip : padding-box;
- border: 1px solid #aaa;
+ border: 1px solid #aaaaaa;
+ -webkit-box-shadow: 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
+ -moz-box-shadow : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
+ box-shadow : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
display: block;
overflow: hidden;
white-space: nowrap;
position: relative;
- height: 26px;
- line-height: 26px;
+ height: 23px;
+ line-height: 23px;
padding: 0 0 0 8px;
- color: #444;
+ color: #444444;
text-decoration: none;
}
.chzn-container-single .chzn-single span {
@@ -61,7 +64,7 @@
display: block;
position: absolute;
right: 26px;
- top: 8px;
+ top: 6px;
width: 12px;
height: 13px;
font-size: 1px;
@@ -71,21 +74,6 @@
background-position: right -11px;
}
.chzn-container-single .chzn-single div {
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius : 0 4px 4px 0;
- border-radius : 0 4px 4px 0;
- -moz-background-clip : padding;
- -webkit-background-clip: padding-box;
- background-clip : padding-box;
- background: #ccc;
- background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
- background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
- background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
- background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
- background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%);
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 );
- background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%);
- border-left: 1px solid #aaa;
position: absolute;
right: 0;
top: 0;
@@ -94,7 +82,7 @@
width: 18px;
}
.chzn-container-single .chzn-single div b {
- background: url('chosen-sprite.png') no-repeat 0 1px;
+ background: url('chosen-sprite.png') no-repeat 0 0;
display: block;
width: 100%;
height: 100%;
@@ -143,9 +131,9 @@
background-image: -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
background-image: -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
background-image: -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
- background-image: -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+ background-image: -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
- background-image: linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+ background-image: linear-gradient(top, #ffffff 85%, #eeeeee 99%);
border: 1px solid #aaa;
margin: 0;
padding: 0;
@@ -168,6 +156,9 @@
color: #666;
background: transparent !important;
border: 0 !important;
+ font-family: sans-serif;
+ font-size: 100%;
+ height: 15px;
padding: 5px;
margin: 1px 0;
outline: 0;
@@ -187,17 +178,20 @@
-webkit-background-clip: padding-box;
background-clip : padding-box;
background-color: #e4e4e4;
- background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #e4e4e4), color-stop(0.7, #eeeeee));
- background-image: -webkit-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
- background-image: -moz-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
- background-image: -o-linear-gradient(bottom, #e4e4e4 0%, #eeeeee 70%);
- background-image: -ms-linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4e4e4', endColorstr='#eeeeee',GradientType=0 );
- background-image: linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
+ background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.48, #e8e8e8), color-stop(0.5, #f0f0f0), color-stop(0.8, #f4f4f4));
+ background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+ background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+ background-image: -o-linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+ background-image: -ms-linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#f4f4f4',GradientType=0 );
+ background-image: linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+ -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+ -moz-box-shadow : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+ box-shadow : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
color: #333;
- border: 1px solid #b4b4b4;
+ border: 1px solid #aaaaaa;
line-height: 13px;
- padding: 3px 19px 3px 6px;
+ padding: 3px 20px 3px 5px;
margin: 3px 0 3px 5px;
position: relative;
}
@@ -228,7 +222,7 @@
/* @group Results */
.chzn-container .chzn-results {
margin: 0 4px 4px 0;
- max-height: 190px;
+ max-height: 240px;
padding: 0 0 0 4px;
position: relative;
overflow-x: hidden;
@@ -240,8 +234,8 @@
}
.chzn-container .chzn-results li {
display: none;
- line-height: 80%;
- padding: 7px 7px 8px;
+ line-height: 15px;
+ padding: 5px 6px;
margin: 0;
list-style: none;
}
@@ -250,7 +244,14 @@
display: list-item;
}
.chzn-container .chzn-results .highlighted {
- background: #3875d7;
+ background-color: #3875d7;
+ background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.1, #2a62bc), color-stop(0.8, #3875d7));
+ background-image: -webkit-linear-gradient(center bottom, #2a62bc 10%, #3875d7 80%);
+ background-image: -moz-linear-gradient(center bottom, #2a62bc 10%, #3875d7 80%);
+ background-image: -o-linear-gradient(bottom, #2a62bc 10%, #3875d7 80%);
+ background-image: -ms-linear-gradient(top, #2a62bc 10%, #3875d7 80%);
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2a62bc', endColorstr='#3875d7',GradientType=0 );
+ background-image: linear-gradient(top, #2a62bc 10%, #3875d7 80%);
color: #fff;
}
.chzn-container .chzn-results li em {
@@ -270,11 +271,34 @@
font-weight: bold;
}
.chzn-container .chzn-results .group-option {
- padding-left: 20px;
+ padding-left: 15px;
}
.chzn-container-multi .chzn-drop .result-selected {
display: none;
}
+.chzn-container .chzn-results-scroll {
+ background: white;
+ margin: 0px 4px;
+ position: absolute;
+ text-align: center;
+ width: 321px; /* This should by dynamic with js */
+ z-index: 1;
+}
+.chzn-container .chzn-results-scroll span {
+ display: inline-block;
+ height: 17px;
+ text-indent: -5000px;
+ width: 9px;
+}
+.chzn-container .chzn-results-scroll-down {
+ bottom: 0;
+}
+.chzn-container .chzn-results-scroll-down span {
+ background: url('chosen-sprite.png') no-repeat -4px -3px;
+}
+.chzn-container .chzn-results-scroll-up span {
+ background: url('chosen-sprite.png') no-repeat -22px -3px;
+}
/* @end */
/* @group Active */
@@ -292,13 +316,13 @@
-o-box-shadow : 0 1px 0 #fff inset;
box-shadow : 0 1px 0 #fff inset;
background-color: #eee;
- background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
- background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
- background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
- background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
- background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+ background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.2, white), color-stop(0.8, #eeeeee));
+ background-image: -webkit-linear-gradient(center bottom, white 20%, #eeeeee 80%);
+ background-image: -moz-linear-gradient(center bottom, white 20%, #eeeeee 80%);
+ background-image: -o-linear-gradient(bottom, white 20%, #eeeeee 80%);
+ background-image: -ms-linear-gradient(top, #ffffff 20%,#eeeeee 80%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
- background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+ background-image: linear-gradient(top, #ffffff 20%,#eeeeee 80%);
-webkit-border-bottom-left-radius : 0;
-webkit-border-bottom-right-radius: 0;
-moz-border-radius-bottomleft : 0;
@@ -341,20 +365,15 @@
.chzn-rtl { direction:rtl;text-align: right; }
.chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
.chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; }
-.chzn-rtl .chzn-single div {
- left: 0; right: auto;
- border-left: none; border-right: 1px solid #aaaaaa;
- -webkit-border-radius: 4px 0 0 4px;
- -moz-border-radius : 4px 0 0 4px;
- border-radius : 4px 0 0 4px;
-}
+
+.chzn-rtl .chzn-single div { left: 3px; right: auto; }
.chzn-rtl .chzn-single abbr {
left: 26px;
right: auto;
}
.chzn-rtl .chzn-choices li { float: right; }
-.chzn-rtl .chzn-choices .search-choice { padding: 3px 6px 3px 19px; margin: 3px 5px 3px 0; }
-.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 5px; right: auto; background-position: right top;}
+.chzn-rtl .chzn-choices .search-choice { padding: 3px 5px 3px 19px; margin: 3px 5px 3px 0; }
+.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 4px; right: auto; background-position: right top;}
.chzn-rtl.chzn-container-single .chzn-results { margin-left: 4px; margin-right: 0; padding-left: 0; padding-right: 4px; }
.chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
.chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }

0 comments on commit add519f

Please sign in to comment.