Skip to content

Commit 8c864ea

Browse files
committed
Update to use base-font-size and related positioning changes.
1 parent 007d6cc commit 8c864ea

File tree

3 files changed

+38
-32
lines changed

3 files changed

+38
-32
lines changed

labelFilter.css

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@
390390
}
391391
.selectize-control.plugin-remove_button [data-value] .remove {
392392
border-left: 1px solid #005c83;
393+
padding: 0;
393394
}
394395
.selectize-control.single .selectize-input {
395396
background-color: rgba(0, 0, 0, 0);
@@ -403,6 +404,7 @@
403404
}
404405
.selectize-control.multi .selectize-input [data-value] {
405406
padding: 0 6px;
407+
margin: 0 3px 0 0;
406408
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
407409
-webkit-border-radius: 2px;
408410
-moz-border-radius: 2px;
@@ -432,7 +434,7 @@
432434
background: #ffffff;
433435
float: left;
434436
min-width: 230px;
435-
min-height: 41px;
437+
min-height: 30px;
436438
border: 1px solid #b7b7b7;
437439
border-radius: 1px;
438440
}
@@ -441,10 +443,10 @@
441443
}
442444
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input {
443445
vertical-align: middle;
444-
padding-bottom: 0px;
446+
padding: 3px 8px;
445447
border: 0;
446448
box-shadow: none;
447-
font-size: 15px;
449+
font-size: 13px;
448450
line-height: 1.66666667;
449451
}
450452
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input.full {
@@ -454,15 +456,15 @@
454456
border: 0;
455457
}
456458
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input input {
457-
font-size: 15px;
458-
height: 24px;
459+
font-size: 13px;
460+
height: 21px;
459461
}
460462
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-dropdown {
461463
min-width: 100px;
462464
width: auto !important;
463465
white-space: nowrap;
464466
z-index: 9999;
465-
margin: 7px 0 0 -1px;
467+
margin: 1px 0 0 -1px;
466468
border: 1px solid #b7b7b7;
467469
}
468470
.filter .navbar-filter-widget .label-filter .selectize-control.label-filter-key .selectize-input.not-full {
@@ -471,9 +473,10 @@
471473
.filter .navbar-filter-widget .label-filter-add.btn {
472474
border-left: 0;
473475
border-radius: 0;
476+
font-size: 13px;
474477
margin-right: 10px;
475478
opacity: 1;
476-
height: 41px;
479+
height: 30px;
477480
}
478481
.filter .navbar-filter-widget .label-filter-add.btn.disabled {
479482
opacity: .75;

labelFilter.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ angular.module('kubernetesUI')
7474
if (!dontFireCallbacks) {
7575
this._onActiveFiltersChangedCallbacks.fire(this._labelSelector);
7676
}
77-
};
77+
};
7878

7979
LabelFilter.prototype.onActiveFiltersChanged = function(callback) {
8080
this._onActiveFiltersChangedCallbacks.add(callback);
@@ -104,17 +104,17 @@ angular.module('kubernetesUI')
104104
.addClass("label-filter-operator")
105105
.attr("placeholder", "matching(...)")
106106
.hide()
107-
.appendTo(labelFilterElem);
107+
.appendTo(labelFilterElem);
108108

109109
this._labelFilterValuesInput = $('<select>')
110110
.addClass("label-filter-values")
111111
.attr("placeholder", "Value(s)")
112112
.attr("multiple", true)
113113
.hide()
114-
.appendTo(labelFilterElem);
114+
.appendTo(labelFilterElem);
115115

116116
this._labelFilterAddBtn = $('<button>')
117-
.addClass("label-filter-add btn btn-default btn-lg disabled")
117+
.addClass("label-filter-add btn btn-default disabled")
118118
.attr("disabled", true)
119119
.appendTo(filterInputElement)
120120
.append(
@@ -177,17 +177,17 @@ angular.module('kubernetesUI')
177177
return;
178178
}
179179
//for each value for key
180-
for (var i = 0; i < optionsMap[key].length; i++) {
180+
for (var i = 0; i < optionsMap[key].length; i++) {
181181
options.push(optionsMap[key][i]);
182-
}
182+
}
183183
callback(options);
184-
});
184+
});
185185

186186
self._labelFilterOperatorSelectizeInput.css("display", "inline-block");
187187
var operator = self._labelFilterOperatorSelectize.getValue();
188188
if (!operator) {
189189
self._labelFilterOperatorSelectize.focus();
190-
}
190+
}
191191
else {
192192
selectizeValues.focus();
193193
}
@@ -252,7 +252,7 @@ angular.module('kubernetesUI')
252252
self._labelFilterAddBtn.removeClass("disabled").prop('disabled', false);
253253
},
254254
onItemRemove: function(value) {
255-
// disable button if we have removed all the values
255+
// disable button if we have removed all the values
256256
},
257257
load: function(query, callback) {
258258
var options = [];
@@ -266,11 +266,11 @@ angular.module('kubernetesUI')
266266
if (!optionsMap[key]) {
267267
callback({});
268268
return;
269-
}
269+
}
270270
//for each value for key
271-
for (var i = 0; i < optionsMap[key].length; i++) {
271+
for (var i = 0; i < optionsMap[key].length; i++) {
272272
options.push(optionsMap[key][i]);
273-
}
273+
}
274274
callback(options);
275275
}
276276
});
@@ -290,7 +290,7 @@ angular.module('kubernetesUI')
290290
self._labelFilterOperatorSelectize.clear();
291291
self._labelFilterValuesSelectizeInput.hide();
292292
self._labelFilterValuesSelectize.clear();
293-
self._labelFilterAddBtn.addClass("disabled").prop('disabled', true);
293+
self._labelFilterAddBtn.addClass("disabled").prop('disabled', true);
294294

295295
// show the filtering active indicator and add the individual filter to the list of active filters
296296
self.addActiveFilter(key, operator, values);
@@ -302,7 +302,7 @@ angular.module('kubernetesUI')
302302
this._labelSelector.each(function(filter) {
303303
self._renderActiveFilter(filter);
304304
});
305-
}
305+
}
306306
};
307307

308308
LabelFilter.prototype._getLabelFilterKeys = function() {
@@ -319,12 +319,12 @@ angular.module('kubernetesUI')
319319

320320
LabelFilter.prototype.addActiveFilter = function(key, operator, values) {
321321
this._labelFilterActiveElement.show();
322-
this._addActiveFilter(key, operator, values);
322+
this._addActiveFilter(key, operator, values);
323323
};
324324

325325
LabelFilter.prototype._addActiveFilter = function(key, operator, values) {
326326
var filter = this._labelSelector.addConjunct(key, operator, values);
327-
this._onActiveFiltersChangedCallbacks.fire(this._labelSelector);
327+
this._onActiveFiltersChangedCallbacks.fire(this._labelSelector);
328328
this._renderActiveFilter(filter);
329329
};
330330

@@ -345,7 +345,7 @@ angular.module('kubernetesUI')
345345
$('<i>')
346346
.addClass("fa fa-times")
347347
)
348-
.appendTo(this._labelFilterActiveFiltersElement);
348+
.appendTo(this._labelFilterActiveFiltersElement);
349349
};
350350

351351
LabelFilter.prototype._removeActiveFilter = function(e) {

styles/labelFilter.less

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
@selectize-vertical-gradient-color-start: #178ee9;
4343
@selectize-width-item-border: 0;
4444
@navbar-label-filter-bg: #fff;
45-
@navbar-input-height: 41px;
45+
@navbar-input-height: 30px;
4646
@navbar-menu-border: 1px solid @btn-default-border;
4747

4848

@@ -73,6 +73,7 @@
7373
font-size: @font-size-base;
7474
.remove {
7575
border-left: 1px solid darken(@dark-blue, 5%);
76+
padding: 0;
7677
}
7778
}
7879
}
@@ -87,7 +88,8 @@
8788
&.multi {
8889
.selectize-input {
8990
[data-value] {
90-
padding: 0 6px; // prevent text jump when
91+
padding: 0 6px; // prevent text jump when
92+
margin: 0 3px 0 0;
9193
text-shadow: 0 1px 0 rgba(0,0,0,0.2);
9294
.selectize-border-radius(2px);
9395
.selectize-vertical-gradient(@selectize-color-item, @selectize-color-item);
@@ -115,10 +117,10 @@
115117
display: inline-block;
116118
.selectize-input {
117119
vertical-align: middle;
118-
padding-bottom: 0px;
120+
padding: 3px 8px;
119121
border: 0;
120122
box-shadow: none;
121-
font-size: @font-size-large;
123+
font-size: @font-size-base;
122124
line-height: @line-height-base;
123125
&.full {
124126
min-width: initial;
@@ -127,17 +129,17 @@
127129
}
128130
}
129131
input {
130-
font-size: @font-size-large;
131-
height: 24px; // keep IE from clipping text descenders
132+
font-size: @font-size-base;
133+
height: 21px; // keep IE from clipping text descenders
132134
}
133135
}
134136
.selectize-dropdown {
135137
min-width: 100px;
136138
width: auto !important; // overwrite inline width
137139
white-space: nowrap;
138140
z-index: 9999;
139-
margin: 7px 0 0 -1px;
140-
border: @navbar-menu-border;
141+
margin: 1px 0 0 -1px;
142+
border: @navbar-menu-border;
141143
.selectize-dropdown-content {
142144
.option {
143145
&.selected {}
@@ -156,6 +158,7 @@
156158
.label-filter-add.btn {
157159
border-left: 0;
158160
border-radius: 0;
161+
font-size: @font-size-base;
159162
margin-right: @selectize-padding-x;
160163
opacity: 1;
161164
height: @navbar-input-height;

0 commit comments

Comments
 (0)