Skip to content

Commit f987407

Browse files
committed
Merged in [10533] from lars@netapp.com:
Missed an update to select2. - Legacy-Id: 10559 Note: SVN reference [10533] has been migrated to Git commit d3088fa
2 parents 3d1c821 + d3088fa commit f987407

3 files changed

Lines changed: 8 additions & 20 deletions

File tree

ietf/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"font-awesome": "4.5.0",
99
"jquery": "1.11.3",
1010
"jquery.cookie": "1.4.1",
11-
"select2": "3.5.2",
11+
"select2": "3.5.4",
1212
"select2-bootstrap-css": "1.4.6"
1313
},
1414
"devDependencies": {},

ietf/externals/static/select2/select2.css

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
/*
2-
Version: 3.5.2 Timestamp: Sat Nov 1 14:43:36 EDT 2014
2+
Version: 3.5.4 Timestamp: Sun Aug 30 13:30:32 EDT 2015
33
*/
44
.select2-container {
55
margin: 0;
66
position: relative;
77
display: inline-block;
8-
/* inline-block for ie7 */
9-
zoom: 1;
10-
*display: inline;
118
vertical-align: middle;
129
}
1310

@@ -180,10 +177,6 @@ html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
180177
width: auto;
181178
}
182179

183-
.select2-drop-auto-width .select2-search {
184-
padding-top: 4px;
185-
}
186-
187180
.select2-container .select2-choice .select2-arrow {
188181
display: inline-block;
189182
width: 18px;
@@ -230,8 +223,7 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
230223
width: 100%;
231224
min-height: 26px;
232225
margin: 0;
233-
padding-left: 4px;
234-
padding-right: 4px;
226+
padding: 4px 4px 0 4px;
235227

236228
position: relative;
237229
z-index: 10000;
@@ -273,10 +265,6 @@ html[dir="rtl"] .select2-search input {
273265
background: url('select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
274266
}
275267

276-
.select2-drop.select2-drop-above .select2-search input {
277-
margin-top: 4px;
278-
}
279-
280268
.select2-search input.select2-active {
281269
background: #fff url('select2-spinner.gif') no-repeat 100%;
282270
background: url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));

0 commit comments

Comments
 (0)