From 8eec62619207ba671b2fb69b823ec678c5015982 Mon Sep 17 00:00:00 2001 From: Chris Roberson Date: Wed, 20 Dec 2017 13:48:53 -0500 Subject: [PATCH 1/4] First pass at applying EUI styles to the index pattern creation page --- .../create_index_pattern_wizard.html | 214 +++++------- .../matching_indices_list.html | 140 +++++--- .../step_index_pattern.html | 317 ++++++++--------- .../step_index_pattern.less | 8 +- .../step_time_field/step_time_field.html | 329 ++++++++++-------- 5 files changed, 523 insertions(+), 485 deletions(-) diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html index dc4d1fe66df41..fb71d3b98d779 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html @@ -6,105 +6,84 @@ class="kuiViewContent" > -
-
-

- Create index pattern -

- -
- -
- -
-
- -
-
-

- Checking for Elasticsearch data -

+
-
-

- - - - Reticulating splines... - - +

+ +
+
+
+ +
+

+ Checking for Elasticsearch data +

+
+

+ Reticulating splines...

-
-
- -
-
-
-

+ +
+

Couldn't find any Elasticsearch data

- -
-

- - You'll need to index some data into Elasticsearch before you can create an index pattern. - - - Learn how. - -

-
- +
+

+ + You'll need to index some data into Elasticsearch before you can create an index pattern. + + + Learn how. + +

+

-
- -
- - + +
+ + - - + + +
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/matching_indices_list/matching_indices_list.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/matching_indices_list/matching_indices_list.html index f7946f2518bde..4f54312e919b3 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/matching_indices_list/matching_indices_list.html +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/matching_indices_list/matching_indices_list.html @@ -1,68 +1,112 @@
-
-

- Looking for matching indices -

- -
-

- Just a sec... -

-
-
+

+ Looking for matching indices +

+
+

+ Just a sec... +

+
+
- -
-
-

- -

-
- -
- - - - - +
+

+ (representative sample only) +

+
+
+
+ + +
+
+ +
- -
    -
  • + + + -

    -

    -
  • -
-
+ + + + + +
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html index 0fbe58a816515..337771d2a39db 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html @@ -1,169 +1,170 @@ -
-
-
-

- Step 1 of 2: Define index pattern -

-
-
- -
-
-
-
- -
- - -
- -
- -

- You can use a * as a wildcard in your index pattern. -

+
+

+ Step 1 of 2: Define index pattern +

-

- You can't use empty spaces or the characters \ / ? " < > |. -

-
+
- - -
- - - -
+
+
+
-
- - - - The index pattern you've entered doesn't match any indices. You can match any of your {{stepIndexPattern.allIndices.length}} indices, below. - - - -
+ +
+
+ + + -
- - - - Your index pattern doesn't match any indices, but you have {{stepIndexPattern.partialMatchingIndices.length}} {{stepIndexPattern.partialMatchingIndices.length > 1 ? 'indices' : 'index'}} which {{stepIndexPattern.partialMatchingIndices.length > 1 ? 'look' : 'looks'}} similar. - - - -
+ + You've entered an invalid index pattern. Please adjust it to match any of your {{stepIndexPattern.allIndices.length}} indices, below. + +
+
+
+
+ + + + You only have a single index. You can create an index pattern to match it. + -
- - - + + Your index pattern can match any of your {{stepIndexPattern.allIndices.length}} indices, below. + + + +
+
+ + + + The index pattern you've entered doesn't match any indices. You can match any of your {{stepIndexPattern.allIndices.length}} indices, below. + + + +
+
+ + + + Your index pattern doesn't match any indices, but you have {{stepIndexPattern.partialMatchingIndices.length}} {{stepIndexPattern.partialMatchingIndices.length > 1 ? 'indices' : 'index'}} which {{stepIndexPattern.partialMatchingIndices.length > 1 ? 'look' : 'looks'}} similar. + + + +
+
+ + + - - Success! Your index pattern matches {{stepIndexPattern.matchingIndices.length}} {{stepIndexPattern.matchingIndices.length > 1 ? 'indices' : 'index'}}. - - - -
-
+ + Success! Your index pattern matches {{stepIndexPattern.matchingIndices.length}} {{stepIndexPattern.matchingIndices.length > 1 ? 'indices' : 'index'}}. + + +
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.less b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.less index fc1ba64b06723..dd37653fc6aeb 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.less +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.less @@ -1,9 +1,3 @@ -.createIndexPatternInputContainer { - display: flex; - justify-content: space-between; - align-items: flex-end; -} - .createIndexPatternInputField.ng-untouched { - border-color: #dedede !important; + box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.08), inset -400px 0 0 0 #fbfbfb; } diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html index 1b1d4deb884eb..a227c28c4e560 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html @@ -2,172 +2,193 @@ name="stepTimeField.form" role="form" ng-submit="stepTimeField.createIndexPattern()" - class="kuiPanel" > -
-
-

- Step 2 of 2: Configure settings -

-
-
+

+ Step 2 of 2: Configure settings +

+ +
+ +

+ You've defined {{stepTimeField.indexPatternName}} as your index pattern. Now you can specify some settings before we create it. +

+ +
+ +
+ + + + Refresh + -
-

- You've defined {{stepTimeField.indexPatternName}} as your index pattern. Now you can specify some settings before we create it. +

+

+
- -
-
- - - - Refresh - - -

- -

-
+
-
- - -

- The indices which match this index pattern don't contain any time fields. -

-
+ + +

+ The indices which match this index pattern don't contain any time fields. +

-

- The Time Filter will use this field to filter your data by time. - You can choose not to have a time field, but you will not be able to narrow down your data by a time range. -

-
+
-
- -
+

+ The Time Filter will use this field to filter your data by time. + You can choose not to have a time field, but you will not be able to narrow down your data by a time range. +

+ +
+ + - -
+
+
+ -

- Kibana will provide a unique identifier for each index pattern. - If you do not want to use this unique ID, enter a custom one. -

-
+
+ + + +
+ +

+ Kibana will provide a unique identifier for each index pattern. + If you do not want to use this unique ID, enter a custom one. +

+
- -
-
-
- - - + + -
+ +
From 47b245c26308fb3672879117dcaca455aba93348 Mon Sep 17 00:00:00 2001 From: Chris Roberson Date: Fri, 22 Dec 2017 10:36:10 -0500 Subject: [PATCH 2/4] PR feedback --- .../create_index_pattern_wizard.html | 18 +- .../step_index_pattern.html | 95 +++--- .../step_time_field/step_time_field.html | 290 ++++++++++-------- 3 files changed, 215 insertions(+), 188 deletions(-) diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html index fb71d3b98d779..049f49bb6b879 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html @@ -6,13 +6,21 @@ class="kuiViewContent" > -

+

Create index pattern

-
-

- Kibana uses index patterns to retrieve data from Elasticsearch indices for things like visualizations. -

+ +
+ +
+
+
+

+ Kibana uses index patterns to retrieve data from Elasticsearch indices for things like visualizations. +

+
+
+
@@ -182,7 +165,7 @@