From 4bed35b0d72e3cc679e125da409c5234cedcdfdb Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Mon, 11 Jul 2016 08:08:53 +0200
Subject: [PATCH 1/6] fix #7194 Editor errors on Visualize are broken

Former-commit-id: c7e89a98d5cf718c7c3ec8313a0546421d71bd3a
---
 .../kibana/public/visualize/editor/styles/_editor.less   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
index e810e664665e8..6bd62e23e88aa 100644
--- a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -22,18 +22,17 @@
 
     > li {
       > a {
-        padding: 4px 0;
-        margin: 0 10px;
+        padding: 4px 10px 5px 10px;
         color: @kibanaGray2;
       }
-      > a:hover {
-        border-bottom: 2px solid @kibanaGray2;
-      }
     }
 
     .danger {
       color: @vis-editor-navbar-error-state-color;
       background-color: @vis-editor-navbar-error-state-bg;
+      &:hover {
+        background-color: darken(@vis-editor-navbar-error-state-bg, 12%);
+      }
     }
   }
 

From 2d4e9a4a5f1f289ebc84d17955a45d920b1fbbf2 Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Sat, 16 Jul 2016 11:20:05 +0200
Subject: [PATCH 2/6] - fixing styles to reduce specificity

Former-commit-id: be4a47f9fde591d06649700ccb667feeaf5c04c4
---
 .../public/visualize/editor/sidebar.html      | 10 +++-
 .../visualize/editor/styles/_editor.less      | 60 ++++++++++---------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/core_plugins/kibana/public/visualize/editor/sidebar.html b/src/core_plugins/kibana/public/visualize/editor/sidebar.html
index 0e153d2eb4996..57c90bdaabb1a 100644
--- a/src/core_plugins/kibana/public/visualize/editor/sidebar.html
+++ b/src/core_plugins/kibana/public/visualize/editor/sidebar.html
@@ -14,10 +14,14 @@
         <!-- tabs -->
         <ul class="nav navbar-nav">
           <li ng-class="{active: sidebar.section == 'data'}" ng-show="sidebar.showData">
-            <a class="navbar-link active" ng-click="sidebar.section='data'">Data</a>
+            <a class="vis-editor-subnav-link"
+               ng-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'data'}"
+               ng-click="sidebar.section='data'">Data</a>
           </li>
           <li ng-class="{active: sidebar.section == 'options'}">
-            <a class="navbar-link" ng-click="sidebar.section='options'">Options</a>
+            <a class="vis-editor-subnav-link"
+               ng-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'options'}"
+               ng-click="sidebar.section='options'">Options</a>
           </li>
         </ul>
 
@@ -26,7 +30,7 @@
           <li ng-if="visualizeEditor.softErrorCount() > 0"
             disabled
             tooltip="{{ visualizeEditor.describeErrors() }}" tooltip-placement="bottom" tooltip-popup-delay="400" tooltip-append-to-body="1">
-            <a class="danger navbar-link">
+            <a class="vis-editor-subnav-link vis-editor-subnav-link--danger">
               <i class="fa fa-warning"></i>
             </a>
           </li>
diff --git a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
index 6bd62e23e88aa..93a1c3100b237 100644
--- a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -7,35 +7,6 @@
 .vis-editor {
   .flex-parent();
 
-  // For the vis-editor sidebar nav
-  .navbar-default .navbar-nav {
-    &> .active > a {
-      border-bottom: 2px solid @kibanaGray2;
-      color: @kibanaGray1;
-      &:before {
-        display: none;
-      }
-      &:hover {
-        background-color: transparent;
-      }
-    }
-
-    > li {
-      > a {
-        padding: 4px 10px 5px 10px;
-        color: @kibanaGray2;
-      }
-    }
-
-    .danger {
-      color: @vis-editor-navbar-error-state-color;
-      background-color: @vis-editor-navbar-error-state-bg;
-      &:hover {
-        background-color: darken(@vis-editor-navbar-error-state-bg, 12%);
-      }
-    }
-  }
-
   .btn-xs {
     line-height: 1.3;
   }
@@ -381,6 +352,37 @@ vis-editor-vis-options > * {
   .flex-parent();
 }
 
+.vis-editor-subnav-link {
+  padding: 4px 10px 5px 10px !important; /* 1 */
+  color: @kibanaGray2 !important; /* 1 */
+
+  &.is-vis-editor-sub-nav-link-selected {
+    border-bottom: 2px solid @kibanaGray2;
+    color: @kibanaGray1;
+    background-color: #f6f6f6;
+
+    &:before {
+      display: none;
+    }
+
+    &:hover {
+      background-color: transparent;
+    }
+  }
+}
+
+/**
+ * 1. TODO: Override bootstrap styles. Remove !important once we're rid of bootstrap.
+ */
+.vis-editor-subnav-link--danger {
+  color: @vis-editor-navbar-error-state-color !important; /* 1 */
+  background-color: @vis-editor-navbar-error-state-bg;
+
+  &:hover {
+    background-color: darken(@vis-editor-navbar-error-state-bg, 12%) !important; /* 1 */
+  }
+}
+
 form.vis-share {
   div.form-control {
     height: inherit;

From 52024b209f699951fbaa5d612c8e4c5a0aae4f0c Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Sat, 16 Jul 2016 11:23:48 +0200
Subject: [PATCH 3/6] - adding comment

Former-commit-id: d019a5e8d84b6fd7b23027c986f176092bbc297f
---
 .../kibana/public/visualize/editor/styles/_editor.less         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
index 93a1c3100b237..b7cc3e1af7c2b 100644
--- a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -352,6 +352,9 @@ vis-editor-vis-options > * {
   .flex-parent();
 }
 
+/**
+   * 1. TODO: Override bootstrap styles. Remove !important once we're rid of bootstrap.
+   */
 .vis-editor-subnav-link {
   padding: 4px 10px 5px 10px !important; /* 1 */
   color: @kibanaGray2 !important; /* 1 */

From 0a2eb3ffe663ac046db5f25b5f37a61e3e2a381a Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Tue, 26 Jul 2016 10:54:46 +0200
Subject: [PATCH 4/6] updating to follow new html style guide

Former-commit-id: 5a913294d725355939fe43a48bb136cc9e890bad
---
 .../public/visualize/editor/sidebar.html      | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/core_plugins/kibana/public/visualize/editor/sidebar.html b/src/core_plugins/kibana/public/visualize/editor/sidebar.html
index 57c90bdaabb1a..370fefd40c423 100644
--- a/src/core_plugins/kibana/public/visualize/editor/sidebar.html
+++ b/src/core_plugins/kibana/public/visualize/editor/sidebar.html
@@ -1,8 +1,10 @@
 <div class="sidebar-container">
-  <form class="sidebar-list"
-        ng-submit="visualizeEditor.$invalid ? dontApply() : stageEditableVis()"
-        name="visualizeEditor"
-        novalidate><!-- see http://goo.gl/9kgz5w -->
+  <form
+    class="sidebar-list"
+    ng-submit="visualizeEditor.$invalid ? dontApply() : stageEditableVis()"
+    name="visualizeEditor"
+    novalidate
+  ><!-- see http://goo.gl/9kgz5w -->
 
     <div css-truncate title="{{indexPattern.id}}" ng-if="vis.type.requiresSearch" class="index-pattern">
       {{ indexPattern.id }}
@@ -14,27 +16,40 @@
         <!-- tabs -->
         <ul class="nav navbar-nav">
           <li ng-class="{active: sidebar.section == 'data'}" ng-show="sidebar.showData">
-            <a class="vis-editor-subnav-link"
-               ng-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'data'}"
-               ng-click="sidebar.section='data'">Data</a>
+            <a
+              class="vis-editor-subnav-link"
+              g-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'data'}"
+              g-click="sidebar.section='data'"
+            >Data</a>
           </li>
           <li ng-class="{active: sidebar.section == 'options'}">
-            <a class="vis-editor-subnav-link"
-               ng-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'options'}"
-               ng-click="sidebar.section='options'">Options</a>
+            <a
+              class="vis-editor-subnav-link"
+              g-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'options'}"
+              g-click="sidebar.section='options'"
+            >Options</a>
           </li>
         </ul>
 
         <!-- controls -->
         <ul class="nav navbar-nav navbar-right">
-          <li ng-if="visualizeEditor.softErrorCount() > 0"
+          <li
+            ng-if="visualizeEditor.softErrorCount() > 0"
             disabled
-            tooltip="{{ visualizeEditor.describeErrors() }}" tooltip-placement="bottom" tooltip-popup-delay="400" tooltip-append-to-body="1">
+            tooltip="{{ visualizeEditor.describeErrors() }}"
+            tooltip-placement="bottom"
+            tooltip-popup-delay="400"
+            tooltip-append-to-body="1"
+          >
             <a class="vis-editor-subnav-link vis-editor-subnav-link--danger">
               <i class="fa fa-warning"></i>
             </a>
           </li>
-          <li tooltip="Apply changes" tooltip-placement="bottom" tooltip-popup-delay="400" tooltip-append-to-body="1">
+          <li
+            tooltip="Apply changes"
+            tooltip-placement="bottom"
+            tooltip-popup-delay="400" tooltip-append-to-body="1"
+          >
             <button class="btn-success navbar-btn-link"
               type="submit"
               ng-disabled="!vis.dirty">
@@ -42,7 +57,12 @@
               <i class="fa fa-play"></i>
             </button>
           </li>
-          <li tooltip="Discard changes" tooltip-placement="bottom" tooltip-popup-delay="400" tooltip-append-to-body="1">
+          <li
+            tooltip="Discard changes"
+            tooltip-placement="bottom"
+            tooltip-popup-delay="400"
+            tooltip-append-to-body="1"
+          >
             <button class="btn-default navbar-btn-link"
               ng-disabled="!vis.dirty"
               ng-click="resetEditableVis()">

From 0149667aaa5c38c6ba4627c173238bd3d3b32754 Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Tue, 26 Jul 2016 18:23:31 +0200
Subject: [PATCH 5/6] updating style

Former-commit-id: 7c47e1384f61f4bfeb16f9059bc20232b0775456
---
 .../kibana/public/visualize/editor/sidebar.html           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core_plugins/kibana/public/visualize/editor/sidebar.html b/src/core_plugins/kibana/public/visualize/editor/sidebar.html
index 370fefd40c423..fd00a8b655667 100644
--- a/src/core_plugins/kibana/public/visualize/editor/sidebar.html
+++ b/src/core_plugins/kibana/public/visualize/editor/sidebar.html
@@ -20,14 +20,18 @@
               class="vis-editor-subnav-link"
               g-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'data'}"
               g-click="sidebar.section='data'"
-            >Data</a>
+            >
+              Data
+            </a>
           </li>
           <li ng-class="{active: sidebar.section == 'options'}">
             <a
               class="vis-editor-subnav-link"
               g-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'options'}"
               g-click="sidebar.section='options'"
-            >Options</a>
+            >
+              Options
+            </a>
           </li>
         </ul>
 

From 4b7c204947802f834b975abf273c88c69d542e97 Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Tue, 26 Jul 2016 18:26:27 +0200
Subject: [PATCH 6/6] fixing typos

Former-commit-id: 380aafccffad7a732c3fa4a1d805e34baa326649
---
 .../kibana/public/visualize/editor/sidebar.html           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core_plugins/kibana/public/visualize/editor/sidebar.html b/src/core_plugins/kibana/public/visualize/editor/sidebar.html
index fd00a8b655667..02ed5e96edae4 100644
--- a/src/core_plugins/kibana/public/visualize/editor/sidebar.html
+++ b/src/core_plugins/kibana/public/visualize/editor/sidebar.html
@@ -18,8 +18,8 @@
           <li ng-class="{active: sidebar.section == 'data'}" ng-show="sidebar.showData">
             <a
               class="vis-editor-subnav-link"
-              g-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'data'}"
-              g-click="sidebar.section='data'"
+              ng-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'data'}"
+              ng-click="sidebar.section='data'"
             >
               Data
             </a>
@@ -27,8 +27,8 @@
           <li ng-class="{active: sidebar.section == 'options'}">
             <a
               class="vis-editor-subnav-link"
-              g-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'options'}"
-              g-click="sidebar.section='options'"
+              ng-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'options'}"
+              ng-click="sidebar.section='options'"
             >
               Options
             </a>