From d28e39c4e6536b7112fe6f107e383c4c5e8e3630 Mon Sep 17 00:00:00 2001
From: emyarod <afw5059@gmail.com>
Date: Mon, 31 Dec 2018 11:11:06 -0600
Subject: [PATCH] fix(toolbar): hide collapsed search input bottom border

---
 src/components/toolbar/_toolbar.scss | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/toolbar/_toolbar.scss b/src/components/toolbar/_toolbar.scss
index a1c968d9a78b..e1f51611a9ba 100644
--- a/src/components/toolbar/_toolbar.scss
+++ b/src/components/toolbar/_toolbar.scss
@@ -13,7 +13,7 @@ $css--helpers: true;
 @import '../overflow-menu/overflow-menu';
 @import '../search/search';
 
-@include exports('toolbar') {
+@mixin toolbar {
   .#{$prefix}--toolbar {
     @include font-family;
     display: flex;
@@ -125,3 +125,18 @@ $css--helpers: true;
     border: none;
   }
 }
+
+@mixin toolbar--x {
+  @include toolbar;
+  .#{$prefix}--toolbar-search:not(.#{$prefix}--toolbar-search--active) .#{$prefix}--search-input {
+    border-bottom: none;
+  }
+}
+
+@include exports('toolbar') {
+  @if feature-flag-enabled('components-x') {
+    @include toolbar--x;
+  } @else {
+    @include toolbar;
+  }
+}