Merge pull request #826 from yaacov/fix-new-patternfly-regresions-in-…

…ad-hoc-page Fix ad-hoc page css for new Patternfly version (cherry picked from commit 99f6d78)
ManageIQ · Mar 30, 2017 · fa23ecd · fa23ecd
1 parent 33521ec
commit fa23ecd
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 47 deletions.
diff --git a/app/assets/stylesheets/metrics.scss b/app/assets/stylesheets/metrics.scss
@@ -1,9 +1,18 @@
 .miq-metrics {
-  overflow-x:hidden;
+  overflow-x: hidden;
+  overflow-y: hidden;
 
   .ad-hoc-toolbar {
     margin-left: 10px;
   }
+  .toolbar-pf {
+    .toolbar-pf-actions {
+      .form-group {
+        margin-bottom: 0;
+        border: 0;
+      }
+    }
+  }
 
   .ad-hoc-tenant {
     margin-left: 5px;
@@ -21,15 +30,11 @@
       margin-left: 0;
     }
   }
-
-  .form-group {
-    &.toolbar-pf-filter {
-      margin-bottom: 0;
-    }
-
-    &.toolbar-actions.ng-scope {
-      margin-bottom: 0;
-    }
+  .form-group.toolbar-pf-filter {
+    margin-bottom: 0;
+  }
+  .form-group.toolbar-actions.ng-scope {
+    margin-bottom: 0;
   }
 
   .pagination {
@@ -58,14 +63,10 @@
     .form-group.toolbar-actions.ng-scope {
       margin-bottom: 10px;
     }
-
-    .dropdown-kebab-pf .dropdown-menu {
-      left: 0;
-    }
-
-    .toolbar-pf-actions .dropdown-kebab-pf {
-      float: none;
-      margin-left: 10px;
+    .toolbar-pf-actions {
+      .dropdown-kebab-pf {
+        float: none;
+      }
     }
   }
 
@@ -74,7 +75,6 @@
     padding-top: 10px;
     margin-bottom: 0;
   }
-
   .line-chart {
     min-height: calc(100vh - 347px);
     margin-top: 36px;
@@ -92,32 +92,37 @@
     overflow-x: hidden;
     overflow-y: hidden;
 
-    .form-group {
-      &.toolbar-actions.ng-scope {
-        width: calc(100% - 425px);
-      }
+    .list-group-item-container {
+      margin-top: 10px;
     }
-
-    .dropdown-kebab-pf .dropdown-menu {
-      left: -5px;
+    .form-group.toolbar-actions.ng-scope {
+      width: calc(100% - 485px);
+      border: 0;
     }
-
-    .toolbar-pf-actions .dropdown-kebab-pf {
-      float: none;
-      margin-left: 10px;
+    .dropdown-kebab-pf {
+      .dropdown-menu {
+        left: -5px;
+      }
     }
-
-    .filter-pf.filter-fields .form-group {
-      width: 410px;
+    .toolbar-pf-actions {
+      .dropdown-kebab-pf {
+        float: none;
+        margin-left: 0px;
+      }
     }
-
-    .toolbar-pf .form-group {
-      .btn-group {
-        margin-left: 0;
+    .filter-pf.filter-fields {
+      .form-group {
+        width: 410px;
       }
-
-      .btn {
-        margin-left: 0;
+    }
+    .toolbar-pf {
+      .form-group {
+        .btn-group {
+          margin-left: 0;
+        }
+        .btn {
+          margin-left: 0;
+        }
       }
     }
   }
@@ -157,11 +162,15 @@
     min-width: 100px;
   }
 
-  .filters-selector .btn {
-    margin-left: 0;
+  .filters-selector {
+    .btn {
+      margin-left: 0;
+    }
   }
 
-  .tenants-selector .btn {
-    margin-left: 0;
+  .tenants-selector {
+    .btn {
+      margin-left: 0;
+    }
   }
 }
diff --git a/app/views/ems_container/ad_hoc/_chart_view_form.html.haml b/app/views/ems_container/ad_hoc/_chart_view_form.html.haml
@@ -34,7 +34,7 @@
                                            "data-toggle"   => "dropdown",
                                            "aria-haspopup" => "true",
                                            "aria-expanded" => "true"}
-        %span.fa.fa-fw.fa-ellipsis-v
+        %span.fa.fa-ellipsis-v
       %ul.dropdown-menu{"aria-labelledby" => "dropdownKebab"}
         %li{"ng-repeat" => "range in dash.timeIntervals"}
           %a{"href"     => "#",

diff --git a/app/views/ems_container/ad_hoc/_list_view_form.html.haml b/app/views/ems_container/ad_hoc/_list_view_form.html.haml
@@ -13,7 +13,7 @@
                                           "data-live-search" => "true",
                                           "data-actions-box" => "true"}
 
-.ad-hoc-toolbar.filters-selector{"pf-toolbar" => "", "config" => "dash.toolbarConfig"}
+.ad-hoc-toolbar.filters-selector{"pf-toolbar" => "", "id" => "filters-selector", "config" => "dash.toolbarConfig"}
   %actions
     %button.btn.btn-default{"type"        => "button",
                             "ng-click"    => "dash.doAddFilter()",
@@ -33,7 +33,7 @@
                                            "data-toggle"   => "dropdown",
                                            "aria-haspopup" => "true",
                                            "aria-expanded" => "true"}
-        %span.fa.fa-fw.fa-ellipsis-v
+        %span.fa.fa-ellipsis-v
       %ul.dropdown-menu{"aria-labelledby" => "dropdownKebab"}
         %li{"ng-repeat" => "range in dash.filterTypes"}
           %a{"href"     => "#",