Skip to content

Commit 9acb480

Browse files
committed
Convert label selector input/button and active filters to use flexbox for structure.
Bumping version to 1.0.0 - Include autoprefixer - Update to latest version of selectize - Add filter-active class to set focus
1 parent 40abab1 commit 9acb480

File tree

7 files changed

+431
-211
lines changed

7 files changed

+431
-211
lines changed

Gruntfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ module.exports = function(grunt) {
6767
'labelFilter.css': 'styles/labelFilter.less'
6868
},
6969
options: {
70+
plugins : [ new (require('less-plugin-autoprefix'))({browsers : [ "last 2 versions" ]}) ],
7071
cleancss: true,
7172
paths: ['styles']
7273
}
@@ -89,4 +90,4 @@ module.exports = function(grunt) {
8990

9091
grunt.registerTask('default', ['serve']);
9192

92-
};
93+
};

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": "0.0.18",
3+
"version": "1.0.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"
@@ -27,7 +27,7 @@
2727
],
2828
"dependencies": {
2929
"angular": "~1.3.8",
30-
"selectize": "~0.11.2",
30+
"selectize": "~0.12.1",
3131
"fontawesome": "~4.3.0"
3232
},
3333
"devDependencies": {

index.html

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
<!-- endbuild -->
2222
<style type="text/css">
2323

24-
2524
</style>
2625
</head>
2726
<body ng-app="exampleApp">
28-
<div class="filter" style="margin-top: 10px; margin-left: 10px;">
29-
<div class="navbar-filter-widget">
30-
</div>
31-
<div class="active-filters">
32-
</div>
27+
<div style="margin: 10px 10px 0; position:relative">
28+
<div class="filter">
29+
<div class="navbar-filter-widget"></div>
3330
</div>
31+
<div class="active-filters"></div>
32+
</div>
33+
3434
<!-- build:js(.) scripts/vendor.js -->
3535
<!-- bower:js -->
3636
<script src="bower_components/jquery/dist/jquery.js"></script>
@@ -60,15 +60,25 @@
6060
// type in their own labels/values)
6161
LabelFilter.setLabelSuggestions({
6262
label_1: [
63-
{value: "value_1_1"},
64-
{value: "value_1_2"},
65-
{value: "value_1_3"}
63+
{value: "value-1-1"},
64+
{value: "value-1-2"},
65+
{value: "value-1-3"}
6666
],
6767
label_2: [
68-
{value: "value_2_1"},
69-
{value: "value_2_2"},
70-
{value: "value_2_3"}
71-
]
68+
{value: "value-2-1"},
69+
{value: "value-2-2"},
70+
{value: "nonbreaking1212121212121212121212121212121212121212121212"}
71+
],
72+
label_3333333333333333333333333333333333333333333333: [
73+
{value: "value-3-1"},
74+
{value: "value-3-2"},
75+
{value: "value31212121212121212121212121212121212121212121212"}
76+
] ,
77+
label_4444444444_4444444444_4444444444_4444444444: [
78+
{value: "value-4-1"},
79+
{value: "value-4-2"},
80+
{value: "value-41212121212121-212121212121-21212121212-1212121212"}
81+
]
7282
});
7383

7484
// Do something when the active filters change

0 commit comments

Comments
 (0)