Skip to content

minor tweaks #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2016
Merged

minor tweaks #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions labelFilter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,10 @@
.selectize-dropdown.single {
border-color: #b7b7b7;
}
.selectize-dropdown [data-selectable],
.selectize-dropdown .optgroup-header {
padding: 5px 7px;
}
.filter .navbar-filter-widget:before,
.filter .navbar-filter-widget:after {
content: " ";
Expand All @@ -434,16 +438,17 @@
background: #ffffff;
float: left;
min-width: 230px;
min-height: 30px;
min-height: 27px;
border: 1px solid #b7b7b7;
border-radius: 1px;
}
.filter .navbar-filter-widget .label-filter .selectize-control {
display: inline-block;
}
.filter .navbar-filter-widget .label-filter .selectize-control .selectize-input {
background: transparent;
vertical-align: middle;
padding: 3px 8px;
padding: 2px 8px;
border: 0;
box-shadow: none;
font-size: 13px;
Expand All @@ -464,7 +469,7 @@
width: auto !important;
white-space: nowrap;
z-index: 9999;
margin: 1px 0 0 -1px;
margin: 0 0 0 -1px;
border: 1px solid #b7b7b7;
}
.filter .navbar-filter-widget .label-filter .selectize-control.label-filter-key .selectize-input.not-full {
Expand All @@ -476,7 +481,7 @@
font-size: 13px;
margin-right: 10px;
opacity: 1;
height: 30px;
height: 27px;
}
.filter .navbar-filter-widget .label-filter-add.btn.disabled {
opacity: .75;
Expand All @@ -490,6 +495,7 @@
display: inline-block;
font-weight: normal;
padding-top: .3em;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
}
.filter .active-filters .label-filter-active .label-filtering-remove-all i.fa.fa-times {
margin-left: 5px;
Expand All @@ -507,13 +513,19 @@
margin-left: 0;
margin-right: 3px;
max-width: 350px;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
word-wrap: break-word;
white-space: pre-wrap;
/* Necessary even if line-height is set on active-filters
when a label wraps. Otherwise, there is no margin or padding
between filter and the input above. */
margin-top: 2px;
}
.filter .active-filters .label-filter-active-filters .label i.fa-times {
font-size: 10px;
margin-top: -3px;
vertical-align: middle;
}
@media (min-width: 768px) {
.filter .active-filters {
margin-top: 0;
Expand Down
2 changes: 1 addition & 1 deletion labelFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ angular.module('kubernetesUI')

this._labelFilterKeyInput = $('<select>')
.addClass("label-filter-key")
.attr("placeholder", "Label key ")
.attr("placeholder", "Filter by label ")
.appendTo(labelFilterElem);

this._labelFilterOperatorInput = $('<select>')
Expand Down
20 changes: 16 additions & 4 deletions styles/labelFilter.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@
@selectize-padding-y: 7px;
@selectize-padding-dropdown-item-y: @selectize-padding-y;
@selectize-padding-dropdown-item-x: @selectize-padding-y;
@selectize-text-shadow: 0 1px 0 rgba(0,0,0,0.2);
@selectize-vertical-gradient-color-end: #1da7ee;
@selectize-vertical-gradient-color-start: #178ee9;
@selectize-width-item-border: 0;
@navbar-label-filter-bg: #fff;
@navbar-input-height: 30px;
@navbar-input-height: 27px;
@navbar-menu-border: 1px solid @btn-default-border;


Expand Down Expand Up @@ -90,7 +91,7 @@
[data-value] {
padding: 0 6px; // prevent text jump when
margin: 0 3px 0 0;
text-shadow: 0 1px 0 rgba(0,0,0,0.2);
text-shadow: @selectize-text-shadow;
.selectize-border-radius(2px);
.selectize-vertical-gradient(@selectize-color-item, @selectize-color-item);
}
Expand All @@ -100,6 +101,9 @@
.selectize-control.single .selectize-input, .selectize-dropdown.single {
border-color: @btn-default-border;
}
.selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header {
padding: 5px 7px;
}


// Custom code for label filter
Expand All @@ -116,8 +120,9 @@
.selectize-control {
display: inline-block;
.selectize-input {
background: transparent;
vertical-align: middle;
padding: 3px 8px;
padding: 2px 8px;
border: 0;
box-shadow: none;
font-size: @font-size-base;
Expand All @@ -138,7 +143,7 @@
width: auto !important; // overwrite inline width
white-space: nowrap;
z-index: 9999;
margin: 1px 0 0 -1px;
margin: 0 0 0 -1px;
border: @navbar-menu-border;
.selectize-dropdown-content {
.option {
Expand Down Expand Up @@ -177,6 +182,7 @@
display: inline-block;
font-weight: normal;
padding-top: .3em;
text-shadow: @selectize-text-shadow;
}
.label-filtering-remove-all i.fa.fa-times {
margin-left: 5px;
Expand All @@ -194,12 +200,18 @@
margin-left: 0;
margin-right: 3px;
max-width: 350px;
text-shadow: @selectize-text-shadow;
word-wrap: break-word;
white-space: pre-wrap;
/* Necessary even if line-height is set on active-filters
when a label wraps. Otherwise, there is no margin or padding
between filter and the input above. */
margin-top: 2px;
i.fa-times {
font-size: 10px;
margin-top: -3px;
vertical-align: middle;
}
}
}
}
Expand Down