Skip to content

Commit aa272ee

Browse files
authored
Merge pull request #35 from jeff-phillips-18/update
Upgrade version of Patternfly and Bump Version to 2.1.0
2 parents 60e42cb + 7a4d50b commit aa272ee

File tree

6 files changed

+2341
-9
lines changed

6 files changed

+2341
-9
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
bower_components/*
2-
node_modules/*
2+
node_modules/*

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "kubernetes-label-selector",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "Provides a LabelSelector object that understand kubernetes labels and label selector syntax, and works directly with JSON API objects from kubernetes. Also provides a label filtering widget.",
55
"moduleType": [
66
"globals"
@@ -32,6 +32,6 @@
3232
"lodash": "~4.17.4"
3333
},
3434
"devDependencies": {
35-
"patternfly": "3.5.1"
35+
"patternfly": ">=3.5.1 <4.0"
3636
}
3737
}

index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<script src="bower_components/sifter/sifter.js"></script>
3939
<script src="bower_components/microplugin/src/microplugin.js"></script>
4040
<script src="bower_components/selectize/dist/js/selectize.js"></script>
41+
<script src="bower_components/lodash/lodash.js"></script>
4142
<!-- endbower -->
4243
<!-- endbuild -->
4344

labelFilter.css

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
font-size: 23px;
9191
}
9292
/**
93-
* selectize.default.css (v0.12.3) - Default Theme
93+
* selectize.default.css (v0.12.4) - Default Theme
9494
* Copyright (c) 2013–2015 Brian Reavis & contributors
9595
*
9696
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -256,6 +256,7 @@
256256
overflow-y: auto;
257257
overflow-x: hidden;
258258
max-height: 200px;
259+
-webkit-overflow-scrolling: touch;
259260
}
260261
.selectize-control.single .selectize-input,
261262
.selectize-control.single .selectize-input input {
@@ -436,10 +437,6 @@
436437
color: #999;
437438
font-style: italic;
438439
}
439-
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input::-moz-placeholder {
440-
color: #999;
441-
font-style: italic;
442-
}
443440
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input:-ms-input-placeholder {
444441
color: #999;
445442
font-style: italic;

0 commit comments

Comments
 (0)