Merge branch 'master' into aziz-master

Conflicts:
	chosen/chosen.css
This commit is contained in:
Patrick Filler 2011-07-29 11:20:26 -04:00
commit fc5965ec70

View file

@ -126,13 +126,13 @@ div.chzn-container div.chzn-search {
white-space: nowrap;
}
div.chzn-container div.chzn-search input {
background: url('chosen-sprite.png') no-repeat 100% -20px, #ffffff;
background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
background: url('chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
background: url('chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
background: url('chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
background: url('chosen-sprite.png') no-repeat 100% -20px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
background: linear-gradient(top, #ffffff 85%,#eeeeee 99%)
background: url('chosen-sprite.png') no-repeat 97% -35px, #ffffff;
background: url('chosen-sprite.png') no-repeat 97% -35px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
background: url('chosen-sprite.png') no-repeat 97% -35px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
background: url('chosen-sprite.png') no-repeat 97% -35px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
background: url('chosen-sprite.png') no-repeat 97% -35px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
background: url('chosen-sprite.png') no-repeat 97% -35px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
background: linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
-o-border-radius: 0px;