From f9baf02d1c112e7444109fdd7fac340ab1c30d03 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Sun, 24 Sep 2017 00:03:47 +0900
Subject: Enable MergeableSelector in scss-lint (for !13480)

---
 app/assets/stylesheets/framework/header.scss | 38 +++++++++++++---------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index ce5a277aad4..5d777f0d468 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -369,27 +369,6 @@
     }
   }
 
-  &.search-active form {
-    box-shadow: none;
-
-    .search-input {
-      color: $gl-text-color;
-      transition: color ease-in-out 0.15s;
-    }
-
-    .search-input::placeholder {
-      color: $gl-text-color-tertiary;
-    }
-
-    .search-input-wrap {
-      .search-icon,
-      .clear-icon {
-        color: $gl-text-color-tertiary;
-        transition: color ease-in-out 0.15s;
-      }
-    }
-  }
-
   .search-input {
     color: $white-light;
     background: none;
@@ -414,6 +393,23 @@
     form {
       background-color: rgba($indigo-200, .3);
       box-shadow: none;
+
+      .search-input {
+        color: $gl-text-color;
+        transition: color ease-in-out 0.15s;
+      }
+
+      .search-input::placeholder {
+        color: $gl-text-color-tertiary;
+      }
+
+      .search-input-wrap {
+        .search-icon,
+        .clear-icon {
+          color: $gl-text-color-tertiary;
+          transition: color ease-in-out 0.15s;
+        }
+      }
     }
 
     .location-badge {
-- 
cgit v1.2.1