Skip to content

Commit

Permalink
Chosen upgrade. Fixes #11779
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit 48051c7
Author: Brian Teeman <brian@teeman.net>
Date:   Thu Aug 25 14:31:04 2016 +0100

    css change only

commit 90a89fd
Author: Brian Teeman <brian@teeman.net>
Date:   Thu Aug 25 14:28:58 2016 +0100

    Revert "css fix thanks @C-Lodder"

    This reverts commit f7320cf.

commit f7320cf
Author: Brian Teeman <brian@teeman.net>
Date:   Thu Aug 25 14:09:03 2016 +0100

    css fix thanks @C-Lodder

commit 42c9de3
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 18:10:33 2016 +0100

    fix permissions

commit b8fdd34
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 18:07:53 2016 +0100

    add minified version of js

commit 0ef056d
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:59:55 2016 +0100

    add documented js hacks

commit c68c275
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:48:01 2016 +0100

    add comment block

commit 983dbf5
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:08:47 2016 +0100

    rename liszt: chosen:

commit 8caad73
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:07:47 2016 +0100

    Revert "rename liszt: chosen: and add JUI hacks"

    This reverts commit 8611671.

commit 8611671
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 17:06:21 2016 +0100

    rename liszt: chosen: and add JUI hacks

commit 535bea0
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:45:14 2016 +0100

    replace chosen: with liszt:

commit 2686df5
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:43:35 2016 +0100

    replace _chosen with _chzn

commit 691be65
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:42:49 2016 +0100

    replace chosen- with chzn-

commit 863b5f9
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:37:20 2016 +0100

    update js with original version

commit 537735c
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:36:19 2016 +0100

    remove min js

commit e739562
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:35:21 2016 +0100

    replace chosen- with chzn-

commit db82431
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:33:46 2016 +0100

    update css file with original version

commit 24a955b
Author: Brian Teeman <brian@teeman.net>
Date:   Wed Aug 24 16:29:34 2016 +0100

    update sprites

commit 4856d5e
Merge: 4ddd833 f10ab35
Author: Brian Teeman <brian@teeman.net>
Date:   Tue Aug 23 16:23:34 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 4ddd833
Merge: b5ffa27 8258906
Author: Brian Teeman <brian@teeman.net>
Date:   Mon Aug 22 10:30:58 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit b5ffa27
Merge: 24e6c45 e80e319
Author: Brian Teeman <brian@teeman.net>
Date:   Sun Aug 21 17:45:45 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 24e6c45
Merge: 962b424 c1b0295
Author: Brian Teeman <brian@teeman.net>
Date:   Fri Aug 19 21:08:30 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 962b424
Merge: 14f5b1c 4c539c4
Author: Brian Teeman <brian@teeman.net>
Date:   Thu Aug 18 12:06:49 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 14f5b1c
Merge: 2baa00b edb70c2
Author: Brian Teeman <brian@teeman.net>
Date:   Mon Aug 15 10:06:07 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 2baa00b
Merge: 97d1fb7 f827dfc
Author: Brian Teeman <brian@teeman.net>
Date:   Sun Aug 14 22:38:02 2016 +0100

    Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

commit 97d1fb7
Author: Brian Teeman <brian@teeman.net>
Date:   Sun Aug 14 16:28:13 2016 +0100

    Revert "toolbar"

    This reverts commit 8f995f1.

commit 8f995f1
Author: Brian Teeman <brian@teeman.net>
Date:   Sun Aug 14 16:27:57 2016 +0100

    toolbar
  • Loading branch information
@wilsonge
wilsonge committed Aug 31, 2016
1 parent a145880 commit 08f116c
Show file tree
Hide file tree
Showing 5 changed files with 267 additions and 158 deletions.
Binary file modified media/jui/css/chosen-sprite.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified media/jui/css/chosen-sprite@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
114 changes: 63 additions & 51 deletions media/jui/css/chosen.css
View file
@@ -1,23 +1,35 @@
/*!
Chosen, a Select Box Enhancer for jQuery and Prototype
by Patrick Filler for Harvest, http://getharvest.com
Version 1.6.2
Full source at https://github.com/harvesthq/chosen
Copyright (c) 2011-2016 Harvest http://getharvest.com
MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
This file is generated by `grunt build`, do not edit it by hand.
*/

/* @group Base */
.chzn-container {
position: relative;
display: inline-block;
vertical-align: middle;
font-size: 13px;
zoom: 1;
*display: inline;
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
}
.chzn-container * {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.chzn-container .chzn-drop {
position: absolute;
top: 100%;
left: -9999px;
z-index: 1010;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
width: 100%;
border: 1px solid #aaa;
border-top: 0;
Expand All @@ -30,6 +42,19 @@
.chzn-container a {
cursor: pointer;
}
.chzn-container .search-choice .group-name, .chzn-container .chzn-single .group-name {
margin-right: 4px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-weight: normal;
color: #999999;
}
.chzn-container .search-choice .group-name:after, .chzn-container .chzn-single .group-name:after {
content: ":";
padding-left: 2px;
vertical-align: top;
}

/* @end */
/* @group Single Chosen */
Expand All @@ -38,15 +63,15 @@
display: block;
overflow: hidden;
padding: 0 0 0 8px;
height: 23px;
height: 25px;
border: 1px solid #aaa;
border-radius: 5px;
background-color: #fff;
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
background: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background: -webkit-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background: -moz-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background: -o-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background: linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background-clip: padding-box;
box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
color: #444;
Expand Down Expand Up @@ -105,21 +130,14 @@
white-space: nowrap;
}
.chzn-container-single .chzn-search input[type="text"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
margin: 1px 0;
padding: 4px 20px 4px 5px;
width: 100%;
height: auto;
outline: 0;
border: 1px solid #aaa;
background: white url('chosen-sprite.png') no-repeat 100% -20px;
background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
background: url('chosen-sprite.png') no-repeat 100% -20px, -moz-linear-gradient(#eeeeee 1%, #ffffff 15%);
background: url('chosen-sprite.png') no-repeat 100% -20px, -o-linear-gradient(#eeeeee 1%, #ffffff 15%);
background: url('chosen-sprite.png') no-repeat 100% -20px, linear-gradient(#eeeeee 1%, #ffffff 15%);
background: url('chosen-sprite.png') no-repeat 100% -20px;
font-size: 1em;
font-family: sans-serif;
line-height: normal;
Expand All @@ -138,6 +156,7 @@
/* @end */
/* @group Results */
.chzn-container .chzn-results {
color: #444;
position: relative;
overflow-x: hidden;
overflow-y: auto;
Expand All @@ -152,6 +171,8 @@
padding: 5px 6px;
list-style: none;
line-height: 15px;
word-wrap: break-word;
-webkit-touch-callout: none;
}
.chzn-container .chzn-results li.active-result {
display: list-item;
Expand All @@ -172,6 +193,7 @@
color: #fff;
}
.chzn-container .chzn-results li.no-results {
color: #777;
display: list-item;
background: #f4f4f4;
}
Expand All @@ -193,14 +215,10 @@
.chzn-container-multi .chzn-choices {
position: relative;
overflow: hidden;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
margin: 0;
padding: 0;
padding: 0 5px;
width: 100%;
height: auto !important;
height: 1%;
height: auto;
border: 1px solid #aaa;
background-color: #fff;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
Expand All @@ -221,39 +239,42 @@
}
.chzn-container-multi .chzn-choices li.search-field input[type="text"] {
margin: 1px 0;
padding: 5px;
height: 15px;
padding: 0;
height: 25px;
outline: 0;
border: 0 !important;
background: transparent !important;
box-shadow: none;
color: #666;
color: #999;
font-size: 100%;
font-family: sans-serif;
line-height: normal;
border-radius: 0;
}
.chzn-container-multi .chzn-choices li.search-field .default {
color: #999;
}
.chzn-container-multi .chzn-choices li.search-choice {
position: relative;
margin: 3px 0 3px 5px;
margin: 3px 5px 3px 0;
padding: 3px 20px 3px 5px;
border: 1px solid #aaa;
max-width: 100%;
border-radius: 3px;
background-color: #e4e4e4;
background-color: #eeeeee;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-size: 100% 19px;
background-repeat: repeat-x;
background-clip: padding-box;
box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
color: #333;
line-height: 13px;
cursor: default;
}
.chzn-container-multi .chzn-choices li.search-choice span {
word-wrap: break-word;
}
.chzn-container-multi .chzn-choices li.search-choice .search-choice-close {
position: absolute;
top: 4px;
Expand All @@ -272,10 +293,10 @@
border: 1px solid #ccc;
background-color: #e4e4e4;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
color: #666;
}
.chzn-container-multi .chzn-choices li.search-choice-focus {
Expand Down Expand Up @@ -311,6 +332,8 @@
background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%);
background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%);
background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
/* JUI remove next line */
/* box-shadow: 0 1px 0 #fff inset; */
}
.chzn-container-active.chzn-with-drop .chzn-single div {
border-left: none;
Expand All @@ -324,7 +347,7 @@
box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
}
.chzn-container-active .chzn-choices li.search-field input[type="text"] {
color: #111 !important;
color: #222 !important;
}

/* @end */
Expand Down Expand Up @@ -379,6 +402,7 @@
right: auto;
left: 4px;
}
.chzn-rtl.chzn-container-single-nosearch .chzn-search,
.chzn-rtl .chzn-drop {
left: 9999px;
}
Expand All @@ -396,11 +420,7 @@
.chzn-rtl .chzn-search input[type="text"] {
padding: 4px 5px 4px 20px;
background: white url('chosen-sprite.png') no-repeat -30px -20px;
background: url('chosen-sprite.png') no-repeat -30px -20px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
background: url('chosen-sprite.png') no-repeat -30px -20px, -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
background: url('chosen-sprite.png') no-repeat -30px -20px, -moz-linear-gradient(#eeeeee 1%, #ffffff 15%);
background: url('chosen-sprite.png') no-repeat -30px -20px, -o-linear-gradient(#eeeeee 1%, #ffffff 15%);
background: url('chosen-sprite.png') no-repeat -30px -20px, linear-gradient(#eeeeee 1%, #ffffff 15%);
background: url('chosen-sprite.png') no-repeat -30px -20px;
direction: rtl;
}
.chzn-rtl.chzn-container-single .chzn-single div b {
Expand All @@ -409,18 +429,10 @@
.chzn-rtl.chzn-container-single.chzn-with-drop .chzn-single div b {
background-position: -12px 2px;
}
[dir="rtl"] .chzn-container .chzn-drop,
[dir="rtl"] .chzn-container-single.chzn-container-single-nosearch .chzn-search {
left: auto;
right: -9999px;
}
[dir="rtl"] .chzn-container.chzn-with-drop .chzn-drop {
right: 0;
}

/* @end */
/* @group Retina compatibility */
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) {
.chzn-rtl .chzn-search input[type="text"],
.chzn-container-single .chzn-single abbr,
.chzn-container-single .chzn-single div b,
Expand Down

0 comments on commit 08f116c

Please sign in to comment.