[Styles] Update everything on the review page but the table

elastic · Apr 26, 2016 · 4a0d18c · 4a0d18c
1 parent 775cf88
commit 4a0d18c
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 27 deletions.
diff --git a/...s/add_data_steps/pattern_review_step.html → ...tern_review_step/pattern_review_step.html b/...s/add_data_steps/pattern_review_step.html → ...tern_review_step/pattern_review_step.html
@@ -1,22 +1,19 @@
-<div class="wizard-step-title">
-  <h3>Review the index pattern</h3>
-  Here we'll define how and where to store your parsed events. We've made some intellient guesses for you, but most
+<h2><em>Review the index pattern.</em>
+  Here we'll define how and where to store your parsed events. We've made some intelligent guesses for you, but most
   fields can be changed if we got it wrong!
-</div>
+</h2>
 
-<div class="pattern-review">
-  <div>
-    <label>Index name or pattern</label>
-    <kbn-info info="Patterns allow you to define dynamic index names using * as a wildcard. Example: filebeat-*"></kbn-info>
-  </div>
-  <input ng-model="reviewStep.indexPattern.id" class="pattern-input"/>
+<div class="pattern-review form-group form-inline">
+  <label>Index name or pattern</label>
+  <span id="pattern-help" class="help-block">Patterns allow you to define dynamic index names using * as a wildcard. Example: filebeat-*</span>
+  <input ng-model="reviewStep.indexPattern.id" class="pattern-input form-control" aria-describedby="pattern-help"/>
   <label>
     <input ng-model="reviewStep.isTimeBased" type="checkbox"/>
     time based
   </label>
   <label ng-if="reviewStep.isTimeBased" class="time-field-input">
     Time Field
-    <select ng-model="reviewStep.indexPattern.timeFieldName" name="time_field_name">
+    <select ng-model="reviewStep.indexPattern.timeFieldName" name="time_field_name" class="form-control">
       <option ng-repeat="field in reviewStep.dateFields" value="{{field}}">
         {{field}}
       </option>

diff --git a/...ces/add_data_steps/pattern_review_step.js → ...attern_review_step/pattern_review_step.js b/...ces/add_data_steps/pattern_review_step.js → ...attern_review_step/pattern_review_step.js
@@ -1,7 +1,8 @@
 import modules from 'ui/modules';
-import template from 'plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step.html';
+import template from './pattern_review_step.html';
 import _ from 'lodash';
 import editFieldTypeHTML from 'plugins/kibana/settings/sections/indices/partials/_edit_field_type.html';
+import './styles/_add_data_pattern_review_step.less';
 
 function pickDefaultTimeFieldName(dateFields) {
   if (_.isEmpty(dateFields)) {

diff --git a/...ions/indices/add_data_steps/pattern_review_step/styles/_add_data_pattern_review_step.less b/...ions/indices/add_data_steps/pattern_review_step/styles/_add_data_pattern_review_step.less
@@ -0,0 +1,20 @@
+.pattern-review {
+
+  label {
+    margin-bottom: 0;
+  }
+
+  .time-field-input {
+    padding-left: 14px;
+    margin-bottom: 0;
+  }
+
+  .pattern-input {
+    width: 300px;
+    margin-right: 7px;
+  }
+
+  > .help-block {
+    margin-top: 0;
+  }
+}
diff --git a/...ttings/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less b/...ttings/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less
@@ -35,4 +35,8 @@ processor-ui-container {
       }
     }
   }
+
+  label {
+    font-weight: normal;
+  }
 }
diff --git a/src/plugins/kibana/public/settings/sections/indices/styles/_add_data_wizard.less b/src/plugins/kibana/public/settings/sections/indices/styles/_add_data_wizard.less
@@ -15,10 +15,6 @@
     border-width: 1px;
     border-radius: 4px;
   }
-
-  label {
-    font-weight: normal;
-  }
 }
 
 .wizard-step-headings{
@@ -54,17 +50,6 @@
   padding-bottom: 14px;
 }
 
-.pattern-review {
-  .time-field-input {
-    padding-left: 14px;
-    margin-bottom: 0;
-  }
-
-  .pattern-input {
-    width: 300px;
-  }
-}
-
 .paste-samples {
   textarea {
     width: 100%;