From cf4368b1f14053cc0305a5f030c91b0d55674989 Mon Sep 17 00:00:00 2001
From: rishichawda <chawda.rishii@gmail.com>
Date: Mon, 31 Dec 2018 16:39:41 +0530
Subject: [PATCH 1/3] fix(navbar): navbar logo fix

---
 doc/src/components/common/componentData/Navbar/index.js | 6 +-----
 lib/navbar/theme.module.scss                            | 6 ++----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/doc/src/components/common/componentData/Navbar/index.js b/doc/src/components/common/componentData/Navbar/index.js
index d142ff4c..747f4637 100644
--- a/doc/src/components/common/componentData/Navbar/index.js
+++ b/doc/src/components/common/componentData/Navbar/index.js
@@ -145,10 +145,6 @@ export const componentData = {
 
       render() {
 
-        const MenuIcon = () => (
-          <svg xmlns="http://www.w3.org/2000/svg" height="30px" id="Layer_1"  version="1.1" viewBox="0 0 30 30" width="30px"><path d="M4,10h24c1.104,0,2-0.896,2-2s-0.896-2-2-2H4C2.896,6,2,6.896,2,8S2.896,10,4,10z M28,14H4c-1.104,0-2,0.896-2,2  s0.896,2,2,2h24c1.104,0,2-0.896,2-2S29.104,14,28,14z M28,22H4c-1.104,0-2,0.896-2,2s0.896,2,2,2h24c1.104,0,2-0.896,2-2  S29.104,22,28,22z"/></svg>
-        );
-
         return (
           <div>
             <PreviewBlock header="Default Navbar">
@@ -160,7 +156,7 @@ export const componentData = {
             <PreviewBlock header="Navbar with leftIcon">
 
             {/* Navbar with icon on left set with leftIcon prop */}
-              <Navbar leftIcon={<MenuIcon />} title="logo" />
+              <Navbar leftIcon={match} title="logo" />
 
             </PreviewBlock>
             <PreviewBlock header="Flat Navbar (No box shadow)">
diff --git a/lib/navbar/theme.module.scss b/lib/navbar/theme.module.scss
index 5d586382..acdfbd3c 100644
--- a/lib/navbar/theme.module.scss
+++ b/lib/navbar/theme.module.scss
@@ -4,9 +4,7 @@
   z-index: 2;
   box-sizing: border-box;
   width: 100%;
-  height: 81px;
-  height: fit-content;
-  height: -moz-fit-content;
+  height: 5rem;
   font-family: 'Roboto';
   box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.5);
   .clearfix {
@@ -58,7 +56,7 @@
   cursor: pointer;
   svg, img {
     width: auto;
-    height: 100%;
+    height: 70%;
     color: $white;
     fill: $white;
   }

From 07927266fb9e6d3e23cb10a66fcbc4feac88c8ce Mon Sep 17 00:00:00 2001
From: rishichawda <chawda.rishii@gmail.com>
Date: Mon, 31 Dec 2018 12:11:23 +0530
Subject: [PATCH 2/3] fix(navbar): fix inner wrapper and children overflows and
 adjust spacing

#287
---
 lib/navbar/theme.module.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/navbar/theme.module.scss b/lib/navbar/theme.module.scss
index acdfbd3c..5bbf3e5b 100644
--- a/lib/navbar/theme.module.scss
+++ b/lib/navbar/theme.module.scss
@@ -2,6 +2,7 @@
 
 :local(.navbarWrapper) {
   z-index: 2;
+  display: flex;
   box-sizing: border-box;
   width: 100%;
   height: 5rem;
@@ -13,8 +14,10 @@
 }
 :local(.innerWrapper) {
   display: flex;
+  padding: 1% 3%;
   z-index: 2;
   justify-content: space-between;
+  align-items: center;
   height: 100%;
   width: 100%;
   position: relative;
@@ -29,6 +32,8 @@
   box-sizing: border-box;
   padding: 2%;
   display: flex;
+  width: fit-content;
+  width: -moz-fit-content;
   align-items: center;
 }
 :local(.title) {
@@ -37,7 +42,6 @@
   height: 33px;
   font-size: 24px;
   font-weight: bold;
-  text-transform: uppercase;
   color: $white;
   margin-right: 15px;
   white-space: nowrap;

From b3bc0c681a5fcae87afb7116b6db506bb76fb616 Mon Sep 17 00:00:00 2001
From: rishichawda <chawda.rishii@gmail.com>
Date: Mon, 31 Dec 2018 16:32:57 +0530
Subject: [PATCH 3/3] fix(navbar): fix navbar spacing issues and right icon
 color

---
 lib/navbar/theme.module.scss | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/navbar/theme.module.scss b/lib/navbar/theme.module.scss
index 5bbf3e5b..d6ff09c2 100644
--- a/lib/navbar/theme.module.scss
+++ b/lib/navbar/theme.module.scss
@@ -14,7 +14,7 @@
 }
 :local(.innerWrapper) {
   display: flex;
-  padding: 1% 3%;
+  padding: 0% 2%;
   z-index: 2;
   justify-content: space-between;
   align-items: center;
@@ -65,12 +65,7 @@
     fill: $white;
   }
 }
-:local(.leftIcon) {
-  margin-right: 15px;
-}
-:local(.rightIcon) {
-  margin-left: 15px;
-}
+
 :local(.fixedPosition) {
   position: fixed;
   top: 0;
@@ -124,8 +119,7 @@
 @media only screen and (max-width: 768px) {
   .icon-menu {
     display: block;
-    background: white;
-    color: $cool-blue;
+    color: white;
   }
 
   :local(.navlinks) {