Skip to content
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

Jump to bottom

AMBARI-23357 Update combo filter style #780

Merged
merged 1 commit into from Apr 4, 2018
Merged

AMBARI-23357 Update combo filter style #780

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
View file
Open in desktop
Expand Up @@ -1377,7 +1377,7 @@ th.entity-actions {
transform: rotate(45deg);
top: 10px;
left: 2px;
box-shadow: -2px -2px 10px -3px rgba(0, 0, 0, 0.5);
border: 1px solid #ccc;
}

a.disabled i:before,
Expand Down
55 changes: 0 additions & 55 deletions ambari-web/app/styles/application.less
View file
Open in desktop
Expand Up @@ -2396,61 +2396,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
}
}

#combo_search_box {
.VS-search {
.VS-search-box {
border: 1px solid #ccc;
border-radius: 4px;
box-shadow: 0 0 1px #fff inset;
min-height: 34px;
}
.VS-icon-search, .VS-icon-cancel {
top: 10px;
}
.VS-placeholder {
color: #ccc;
top: 9px;
}
.search_input input {
height: 32px;
margin-top: 0px;
}
.search_facet {
border-radius: 4px;
margin: 5px -3px 3px 0;
height: 22px;
.category {
margin-left: 3px;
padding: 4px 0 0;
}
input {
font: inherit;
font-family: 'Roboto', sans-serif;
height: 20px;
}
.search_facet_remove {
left: 3px;
top: 4px;
}
&.not_selected {
border: 1px solid #d2d2d2;
background-image: -moz-linear-gradient(top, #fdfdfd, #e3e3e3); /* FF3.6 */
background-image: -webkit-gradient(linear, left top, left bottom, from(#fdfdfd), to(#e3e3e3)); /* Saf4+, Chrome */
background-image: linear-gradient(top, #fdfdfd, #e3e3e3);
}
&.is_selected {
margin-left: 0;
}
}
}
}

.VS-interface.ui-autocomplete.ui-menu{
li.ui-menu-item, li.ui-autocomplete-category {
font-family: 'Roboto', sans-serif;
}
}

.delete-service-progress {
.modal-body {
text-align: center;
Expand Down
53 changes: 52 additions & 1 deletion ambari-web/app/styles/visualsearch.less
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@
@import 'common.less';

@background-color: #ddd;
@border-color: #ccc;

#combo_search_box {
.VS-icon-search {
Expand All @@ -32,6 +33,50 @@
background: none;
}
.VS-search {
.VS-search-box {
border: 1px solid @border-color;
border-radius: 4px;
box-shadow: 0 0 1px #fff inset;
min-height: 34px;
}
.VS-icon-search, .VS-icon-cancel {
top: 10px;
}
.VS-placeholder {
color: @border-color;
top: 9px;
}
.search_input input {
height: 32px;
margin-top: 0px;
}
.search_facet {
border-radius: 4px;
margin: 5px -3px 3px 0;
height: 22px;
.category {
margin-left: 3px;
padding: 4px 0 0;
}
input {
font: inherit;
font-family: 'Roboto', sans-serif;
height: 20px;
}
.search_facet_remove {
left: 3px;
top: 4px;
}
&.not_selected {
border: 1px solid #d2d2d2;
background-image: -moz-linear-gradient(top, #fdfdfd, #e3e3e3); /* FF3.6 */
background-image: -webkit-gradient(linear, left top, left bottom, from(#fdfdfd), to(#e3e3e3)); /* Saf4+, Chrome */
background-image: linear-gradient(top, #fdfdfd, #e3e3e3);
}
&.is_selected {
margin-left: 0;
}
}
.search_facet.not_selected {
height: 24px;
padding: 1px 0 0 14px;
Expand All @@ -52,6 +97,12 @@
}
}

.VS-interface.ui-autocomplete.ui-menu{
li.ui-menu-item, li.ui-autocomplete-category {
font-family: 'Roboto', sans-serif;
}
}

.VS-interface.ui-autocomplete {
max-width: 300px;
width: auto !important;
Expand Down Expand Up @@ -93,6 +144,6 @@
transform: rotate(45deg);
top: 10px;
left: 2px;
box-shadow: -2px -2px 10px -3px rgba(0, 0, 0, 0.5);
border: 1px solid @border-color;
}
}
2 changes: 1 addition & 1 deletion ambari-web/app/templates/main/alerts.hbs
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
{{/isAuthorized}}
<div class="VS-open-box pull-right">
<button class="btn btn-default">
<i class="icon-search"></i>
<i class="icon-filter"></i>
</button>
<div class="popup-arrow-up hide"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ambari-web/app/templates/main/dashboard/config_history.hbs
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
<div class="col-sm-12">
<div class="VS-open-box pull-right">
<button class="btn btn-default">
<i class="icon-search"></i>
<i class="icon-filter"></i>
</button>
<div class="popup-arrow-up hide"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ambari-web/app/templates/main/host.hbs
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
{{/havePermissions}}
<div class="VS-open-box pull-right">
<button class="btn btn-default">
<i class="icon-search"></i>
<i class="icon-filter"></i>
</button>
<div class="popup-arrow-up hide"></div>
</div>
Expand Down