From ca20909899f8a38e594ed99527651adc495f7a78 Mon Sep 17 00:00:00 2001
From: palak singhal <smarty1palak@gmail.com>
Date: Mon, 16 Dec 2019 23:24:43 +0530
Subject: [PATCH] Removed inconsistency in wiki/new toolbar icon. Icon and Text
 colour changed to #222 and hover color to white . (#6956)

* wiki/new toolbar icon colour changed to black and hover color to white

* error fixed

* changes suggested
---
 app/assets/stylesheets/style.css   | 12 ++++++++++++
 app/views/editor/_toolbar.html.erb | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css
index 05e03ab3b6..c95e2559ea 100644
--- a/app/assets/stylesheets/style.css
+++ b/app/assets/stylesheets/style.css
@@ -566,3 +566,15 @@ textarea, input {
   border-radius: 4px;
   padding: 10px; 
 }
+
+.btn-toolbar .btn-outline-secondary
+{
+    color:#222;
+}
+
+.btn-toolbar .btn-outline-secondary:hover
+{
+    color: #f1f1f1 !important;
+}
+
+
diff --git a/app/views/editor/_toolbar.html.erb b/app/views/editor/_toolbar.html.erb
index 8563195bb4..a3ce155605 100644
--- a/app/views/editor/_toolbar.html.erb
+++ b/app/views/editor/_toolbar.html.erb
@@ -1,9 +1,9 @@
 <div class="btn-toolbar" style="margin-bottom:8px;">
 
   <div class="btn-group mr-2 ">
-    <a data-toggle="tooltip" title="Bold" data-placement="bottom" class="btn btn-outline-secondary btn-sm" onClick="$E.bold()"><i class="fa fa-bold"></i></a>
-    <a data-toggle="tooltip" title="Italic" data-placement="bottom" class="btn btn-outline-secondary btn-sm" onClick="$E.italic()"><i class="fa fa-italic"></i></a>
-    <a data-toggle="tooltip" title="Header" data-placement="bottom" class="btn btn-outline-secondary btn-sm" onClick="$E.h2()"><b><span class="d-md-none d-lg-inline">Header</span><span class="d-none d-md-inline d-lg-none">H</span></b></a>
+    <a data-toggle="tooltip" title="Bold" data-placement="bottom" class="btn btn-outline-secondary btn-sm " onClick="$E.bold()"><i class="fa fa-bold" ></i></a>
+    <a data-toggle="tooltip" title="Italic" data-placement="bottom" class="btn btn-outline-secondary btn-sm " onClick="$E.italic()"><i class="fa fa-italic" ></i></a>
+    <a data-toggle="tooltip" title="Header" data-placement="bottom" class="btn btn-outline-secondary btn-sm " onClick="$E.h2()"><b><span class="d-md-none d-lg-inline  ">Header</span><span class="d-none d-md-inline d-lg-none">H</span></b></a>
   </div>
 
   <div class="btn-group mr-2">
@@ -12,7 +12,7 @@
 
   <div class="dropdown mr-2">
     <div class="d-md-none d-lg-inline">
-      <a class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" href="#">
+      <a class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" href="#" >
         Templates
         <span class="caret"></span>
       </a>
@@ -30,7 +30,7 @@
   </div>
 
   <div class="btn-group">
-    <a data-toggle="tooltip" title="Help" data-placement="bottom" class="btn btn-outline-secondary btn-sm" target="_blank" href="/wiki/authoring-help"><i class="fa fa-question-circle"></i></a>
+    <a data-toggle="tooltip" title="Help" data-placement="bottom" class="btn btn-outline-secondary btn-sm" target="_blank" href="/wiki/authoring-help"><i class="fa fa-question-circle" ></i></a>
   </div>
 
 </div>