From 2cd7dd005d382396b89e77ea990e2570332bbaaf Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Tue, 21 Jun 2016 08:16:24 -0700 Subject: [PATCH] [7364]: Deconcatenate selectors in src/plugins/kibana/public/visualize/styles/main.less. - Refactor styles for reduced specificity. - Refactor markup attributes as part of a proposal for a new style. - Remove unused classes nested beneath wizard-row: striped, panel, panel-default. - Remove redundant wizard-agg-list class. Former-commit-id: d4036dc6cbc80118993b39320b7d883d13fdcafd --- .../kibana/public/visualize/styles/main.less | 93 +++++++------------ .../public/visualize/wizard/step_1.html | 22 +++-- .../public/visualize/wizard/step_2.html | 16 ++-- 3 files changed, 58 insertions(+), 73 deletions(-) diff --git a/src/plugins/kibana/public/visualize/styles/main.less b/src/plugins/kibana/public/visualize/styles/main.less index cfbd3addd324b..8ccc0e8cecae3 100644 --- a/src/plugins/kibana/public/visualize/styles/main.less +++ b/src/plugins/kibana/public/visualize/styles/main.less @@ -7,81 +7,34 @@ margin-left: 0; padding-left: 0; padding-right: 0; +} - @media (min-width: @screen-lg) { - .wizard { - padding: 0; - display: flex; - - div.wizard-small { - flex: 2; - } - - div.wizard-large { - flex: 3; - } - - .wizard-column { - flex: 1; - display: flex; - flex-direction: column; - padding: 0px 2.5px; - - .wizard-row { - flex: 1; - background-color: @kibanaGray6; - } - } - } - } - - h3 { + .wizard-sub-title { margin-top: 0px; margin-bottom: 8px; padding: 0px 5px; } - .wizard-row { - .panel { - margin-bottom: 0; - border: none; - } - - .panel-default > .panel-heading { - background-color: @kibanaGray6; - } - - .list-group { - margin-bottom: 0; - } - - .striped { - li:nth-child(odd) { - background-color: @white; - } - - li:nth-child(even) { - background-color: @kibanaGray6; - } - } - } - .wizard-type { flex: 1; + + // TODO: When we migrate off Bootstrap, we can eliminate these "mixins". .list-group-item(); .list-group-menu .list-group-menu-item(); border: none; border-radius: 0; background-color: @kibanaGray6; + } - &-heading { + .wizard-type-heading { flex: 0 0 200px; display: flex; align-items: center; font-size: 1.2em; + } - .fa { + .wizard-type-heading-icon { flex: 0 0 auto; margin-right: @padding-base-horizontal; font-size: 1.5em; @@ -89,16 +42,40 @@ color: @saved-object-finder-icon-color; } - h4 { + .wizard-type-heading-text { flex: 1 0 auto; } - } - &-description { + .wizard-type-description { flex: 1 1 auto; color: @wizard-vis-type-description-color; } + +@media (min-width: @screen-lg) { + .wizard { + padding: 0; + display: flex; } + + .wizard-column { + flex: 1; + display: flex; + flex-direction: column; + padding: 0px 2.5px; + } + + .wizard-row { + flex: 1; + background-color: @kibanaGray6; + } + + .wizard-column--small { + flex: 2; + } + + .wizard-column--large { + flex: 3; + } } @import "../editor/styles/_editor.less"; diff --git a/src/plugins/kibana/public/visualize/wizard/step_1.html b/src/plugins/kibana/public/visualize/wizard/step_1.html index d38dd53a13ca8..8f49ed3db0409 100644 --- a/src/plugins/kibana/public/visualize/wizard/step_1.html +++ b/src/plugins/kibana/public/visualize/wizard/step_1.html @@ -1,23 +1,31 @@
-

Create New Visualization

+

Create New Visualization

-

Or, Open a Saved Visualization

+

Or, Open a Saved Visualization

- + class="wizard-row" + >
diff --git a/src/plugins/kibana/public/visualize/wizard/step_2.html b/src/plugins/kibana/public/visualize/wizard/step_2.html index bc49fab790d95..1abc1b3778a98 100644 --- a/src/plugins/kibana/public/visualize/wizard/step_2.html +++ b/src/plugins/kibana/public/visualize/wizard/step_2.html @@ -1,22 +1,22 @@
-
-

From a New Search, Select Index

+
+

From a New Search, Select Index

- + class="wizard-row" + >
-
-

Or, From a Saved Search

+
+

Or, From a Saved Search

- + make-url="step2WithSearchUrl" + >