Skip to content

Commit d8bbfc4

Browse files
jwforresjwforres
authored
Merge pull request #26 from rhamilto/simplifying-layout
Simplifying CSS and fixing visual defects
2 parents 5271bb1 + 3edd5ed commit d8bbfc4

11 files changed

+226
-365
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The LabelSelector global lets you match kubernetes label selectors to sets of re
3030

3131
```
3232
// Create a new label selector
33-
//
33+
//
3434
// selector (optional) - the JSON format of a label selector as returned by k8s API
3535
// Example would be the label selector returned on a replication controller
3636
// emptySelectsAll (optional) - whether a label selector with no conjuncts
@@ -113,7 +113,7 @@ LabelFilter.onActiveFiltersChanged(function(labelSelector){})
113113
### Theme
114114

115115

116-
The example theme used in `index.html` is based on bootstrap, however bootstrap is not required as a bower dependency and you can change the theme however you want.
116+
The example theme used in `index.html` is based on [PatternFly](https://www.patternfly.org), however [PatternFly](https://www.patternfly.org) is not required as a bower dependency and you can change the theme however you want.
117117

118118
All icons are from [FontAwesome](http://fortawesome.github.io/Font-Awesome/icons/) which is included as a bower dependency.
119119

@@ -125,7 +125,7 @@ User first selects a label key.
125125

126126
![Selecting a label key](screenshots/labelFilterKey.png?raw=true)
127127

128-
Then chooses from the "in", "not in", and "exists" operators.
128+
Then chooses from the "exists", "does not exist", "in", or "not in" operators.
129129

130130
![Selecting a label selector operator](screenshots/labelFilterOperator.png?raw=true)
131131

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
"fontawesome": "~4.3.0"
3232
},
3333
"devDependencies": {
34-
"bootstrap": "~3.3.4"
34+
"patternfly": "3.5.1"
3535
}
3636
}

‎index.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<title>Label Selector and Filter example</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width">
9-
10-
<!-- example theme uses bootstrap -->
11-
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css" />
9+
10+
<!-- example theme uses patternfly -->
11+
<link rel="stylesheet" href="bower_components/patternfly/dist/css/patternfly.min.css" />
1212

1313
<!-- build:css(.) styles/vendor.css -->
1414
<!-- bower:css -->
@@ -24,9 +24,9 @@
2424
</style>
2525
</head>
2626
<body ng-app="exampleApp">
27-
<div style="margin: 10px 10px 0; position:relative">
27+
<div style="margin: 10px 10px 0; position: relative">
2828
<div class="filter">
29-
<div class="navbar-filter-widget"></div>
29+
<div class="navbar-filter-widget"></div>
3030
</div>
3131
<div class="active-filters"></div>
3232
</div>
@@ -56,7 +56,7 @@
5656
// LabelFilter.addLabelSuggestionsFromResources(resources, map);
5757
// where map will get the new suggestions added to it
5858
//
59-
// Or you can just create some suggestions yourself (setting suggestions is not required, users have the option to
59+
// Or you can just create some suggestions yourself (setting suggestions is not required, users have the option to
6060
// type in their own labels/values)
6161
LabelFilter.setLabelSuggestions({
6262
label_1: [
@@ -85,7 +85,7 @@
8585
{value: "value-4-1"},
8686
{value: "value-4-2"},
8787
{value: "value-41212121212121-212121212121-21212121212-1212121212"}
88-
]
88+
]
8989
});
9090

9191
// Do something when the active filters change
@@ -94,10 +94,10 @@
9494
// If you have a set of k8s resources, you can filter them by running
9595
// labelSelector.select(resources);
9696
// which will return a map of resource name to resource for all resources selected by the label selector
97-
// if you want to check specific resources yourself you can use
97+
// if you want to check specific resources yourself you can use
9898
// labelSelector.match(resource);
9999
// to return a boolean if that resource is matched by the selector
100-
});
100+
});
101101
});
102102
</script>
103103
</body>

0 commit comments

Comments
 (0)