This is an automated email from the ASF dual-hosted git repository.

atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new a6900dc  AMBARI-23357 Update combo filter style
a6900dc is described below

commit a6900dca0187f2ffef731162c5efc7183d723471
Author: Andrii Tkach <atk...@apache.org>
AuthorDate: Mon Mar 26 12:22:58 2018 +0300

    AMBARI-23357 Update combo filter style
---
 .../resources/ui/admin-web/app/styles/main.css     |  2 +-
 ambari-web/app/styles/application.less             | 55 ----------------------
 ambari-web/app/styles/visualsearch.less            | 53 ++++++++++++++++++++-
 ambari-web/app/templates/main/alerts.hbs           |  2 +-
 .../templates/main/dashboard/config_history.hbs    |  2 +-
 ambari-web/app/templates/main/host.hbs             |  2 +-
 6 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css 
b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
index 3b7de26..08f8960 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
@@ -1383,7 +1383,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,
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 335f0a3..04348d2 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2438,61 +2438,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;
diff --git a/ambari-web/app/styles/visualsearch.less 
b/ambari-web/app/styles/visualsearch.less
index 16c3377..7e9d478 100644
--- a/ambari-web/app/styles/visualsearch.less
+++ b/ambari-web/app/styles/visualsearch.less
@@ -19,6 +19,7 @@
 @import 'common.less';
 
 @background-color: #ddd;
+@border-color: #ccc;
 
 #combo_search_box {
   .VS-icon-search {
@@ -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;
@@ -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;
@@ -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;
   }
 }
diff --git a/ambari-web/app/templates/main/alerts.hbs 
b/ambari-web/app/templates/main/alerts.hbs
index a111728..6872a56 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -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>
diff --git a/ambari-web/app/templates/main/dashboard/config_history.hbs 
b/ambari-web/app/templates/main/dashboard/config_history.hbs
index 3a1967a..0436f56 100644
--- a/ambari-web/app/templates/main/dashboard/config_history.hbs
+++ b/ambari-web/app/templates/main/dashboard/config_history.hbs
@@ -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>
diff --git a/ambari-web/app/templates/main/host.hbs 
b/ambari-web/app/templates/main/host.hbs
index b823b9b..fe6780c 100644
--- a/ambari-web/app/templates/main/host.hbs
+++ b/ambari-web/app/templates/main/host.hbs
@@ -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>

-- 
To stop receiving notification emails like this one, please contact
atk...@apache.org.

Reply via email to