Merge pull request #7540 from cjcenizal/7364/chore/deconcatenate-styl…

…es-table [7364]: Deconcatenate selectors for table-vis, agg-table, app-switcher, and doc-viewer.
elastic · Jun 28, 2016 · 7b8be05 · 7b8be05
2 parents 143e733 + 52f6922
commit 7b8be05
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 51 deletions.
diff --git a/src/plugins/table_vis/public/table_vis.less b/src/plugins/table_vis/public/table_vis.less
@@ -2,17 +2,17 @@
   display: flex;
   flex-direction: column;
   flex: 1 0 100%;
+}
 
-  &-error {
+  .table-vis-error {
     display: flex;
     flex-direction: column;
     justify-content: center;
     flex: 1 0 100%;
-
     text-align: center;
   }
 
-  &-container {
+  .table-vis-container {
     kbn-agg-table-group > .table > tbody > tr > td {
       border-top: 0px;
     }
@@ -25,4 +25,3 @@
       display: none;
     }
   }
-}
diff --git a/src/ui/public/agg_table/agg_table.less b/src/ui/public/agg_table/agg_table.less
@@ -9,8 +9,9 @@ kbn-agg-table-group {
   display: flex;
   flex: 1 1 auto;
   flex-direction: column;
+}
 
-  &-paginated {
+  .agg-table-paginated {
     flex: 1 1 auto;
     overflow: auto;
 
@@ -23,7 +24,7 @@ kbn-agg-table-group {
     }
   }
 
-  &-controls {
+  .agg-table-controls {
     flex: 0 0 auto;
     display: flex;
     align-items: center;
@@ -35,4 +36,3 @@ kbn-agg-table-group {
       padding: 0;
     }
   }
-}
diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.less b/src/ui/public/chrome/directives/app_switcher/app_switcher.less
@@ -37,11 +37,13 @@ body { overflow-x: hidden; }
       background-color: #e8488b;
     }
   }
+
   .bottom-apps {
     position: absolute;
     bottom: 0;
   }
 }
+
 .app-wrapper {
   .real-flex-parent();
   position: absolute;
@@ -55,16 +57,20 @@ body { overflow-x: hidden; }
   margin: 0 auto;
   background-color: #fff;
 
-  &.hidden-chrome { left: 0; }
-  &-panel {
-    .flex-parent(@shrink: 0);
-    box-shadow: -4px 0px 3px rgba(0,0,0,0.2);
+  &.hidden-chrome {
+    left: 0;
   }
 
   .navbar-right {
     margin-right: 0;
   }
 }
+
+  .app-wrapper-panel {
+    .flex-parent(@shrink: 0);
+    box-shadow: -4px 0px 3px rgba(0,0,0,0.2);
+  }
+
 .app-links {
   text-align: justify;
 

diff --git a/src/ui/public/doc_viewer/doc_viewer.less b/src/ui/public/doc_viewer/doc_viewer.less
@@ -1,23 +1,31 @@
 @import (reference) "~ui/styles/variables";
 
-doc-viewer .doc-viewer {
-
-  &-buttons, &-field {
-    white-space: nowrap;
-  }
-
-  &-value, pre {
+.doc-viewer {
+  pre {
     display: inline-block;
     word-break: break-all;
     word-wrap: break-word;
     white-space: pre-wrap;
   }
 
-  td, pre {
+  td,
+  pre {
     font-family: "Lucida Console", Monaco, monospace;
   }
+}
 
-  &-content {
+  .doc-viewer-content {
     margin-top: @padding-base-vertical;
   }
-}
+
+  .doc-viewer-buttons,
+  .doc-viewer-field {
+    white-space: nowrap;
+  }
+
+  .doc-viewer-value {
+    display: inline-block;
+    word-break: break-all;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+  }
diff --git a/src/ui/public/filter_bar/filter_bar.html b/src/ui/public/filter_bar/filter_bar.html
@@ -1,4 +1,4 @@
-<div class="confirm" ng-show="newFilters.length">
+<div class="filter-bar-confirm" ng-show="newFilters.length">
   <form ng-submit="applyFilters(newFilters)">
   <ul class="list-unstyled">
     <li>Apply these filters?</li>
@@ -9,7 +9,7 @@
   </form>
 </div>
 
-<div class="bar" ng-show="filters.length">
+<div class="filter-bar" ng-show="filters.length">
   <div class="filter" ng-class="{ negate: filter.meta.negate, disabled: filter.meta.disabled }" ng-repeat="filter in filters">
     <div class="filter-description">
       <span ng-if="filter.$state.store == 'globalState'"><i class="fa fa-fw fa-thumb-tack pinned"></i></span>
@@ -79,7 +79,7 @@
   </div>
 </div>
 
-<div class="bar bar-condensed" ng-show="filters.length && showFilterActions">
+<div class="filter-bar filter-bar-condensed" ng-show="filters.length && showFilterActions">
   <div class="filter-actions-all">
     <div class="filter-link">
       <div class="filter-description"><strong>All filters:</strong></div>

diff --git a/src/ui/public/filter_bar/filter_bar.less b/src/ui/public/filter_bar/filter_bar.less
@@ -1,6 +1,6 @@
 @import (reference) "~ui/styles/variables";
 
-filter-bar .confirm {
+.filter-bar-confirm {
   padding: 8px 10px 4px;
   background: @filter-bar-confirm-bg;
   border-bottom: 1px solid;
@@ -46,17 +46,11 @@ filter-bar .confirm {
   }
 }
 
-filter-bar .bar {
+.filter-bar {
   padding: 5px 6px 3px 6px;
   background: @filter-bar-bar-bg;
   border-bottom: 0;
 
-  &-condensed {
-    padding: 6px 6px 2px 6px !important;
-    font-size: 0.9em;
-    background: @filter-bar-bar-condensed-bg;
-  }
-
   .ace_editor {
     height: 175px;
     margin: 15px 0;
@@ -159,3 +153,9 @@ filter-bar .bar {
     }
   }
 }
+
+  .filter-bar-condensed {
+    padding: 6px 6px 2px 6px !important;
+    font-size: 0.9em;
+    background: @filter-bar-bar-condensed-bg;
+  }
diff --git a/src/ui/public/notify/notify.less b/src/ui/public/notify/notify.less
@@ -45,14 +45,15 @@
         margin-right: 4px;
       }
     }
+  }
 
-    &-message {
+    .toast-message {
       flex: 1 1 auto;
       .ellipsis();
       line-height: normal;
     }
 
-    &-stack {
+    .toast-stack {
       padding-bottom: 10px;
 
       pre {
@@ -65,7 +66,7 @@
       }
     }
 
-    &-controls {
+    .toast-controls {
       display: flex;
 
       button {
@@ -75,7 +76,6 @@
         padding: 10px 15px;
       }
     }
-  }
 
   // add darkened background to the different badges
   .alert-success .badge {

diff --git a/src/ui/public/styles/dark-theme.less b/src/ui/public/styles/dark-theme.less
@@ -268,16 +268,13 @@
 
 
 // /src/ui/public/agg_table/agg_table.less
-  .agg-table {
-
-    &-paginated {
-      tr:hover td {
-        background-color: @table-row-hover-bg;
-      }
+  .agg-table-paginated {
+    tr:hover td {
+      background-color: @table-row-hover-bg;
+    }
 
-      .cell-hover:hover {
-        background-color: @table-cell-hover-hover-bg;
-      }
+    .cell-hover:hover {
+      background-color: @table-cell-hover-hover-bg;
     }
   }
 
@@ -441,7 +438,7 @@
 
 
 // /src/ui/public/filter_bar/filter_bar.less
-  filter-bar .confirm {
+  .filter-bar-confirm {
     background: @filter-bar-confirm-bg;
     border-bottom-color: @filter-bar-confirm-border;
 
@@ -451,14 +448,10 @@
     }
   }
 
-  filter-bar .bar {
+  .filter-bar {
     background: @filter-bar-bar-bg;
     border-bottom-color: @filter-bar-bar-border;
 
-    &-condensed {
-      background: @filter-bar-bar-condensed-bg;
-    }
-
     .filter {
       background-color: @filter-bar-bar-filter-bg;
       color: @filter-bar-bar-filter-color;
@@ -473,6 +466,10 @@
     }
   }
 
+    .filter-bar-condensed {
+      background: @filter-bar-bar-condensed-bg;
+    }
+
 
 // /src/ui/public/styles/config.less
   .config {