summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorTakuya Noguchi <tak.noguchi.iridge@gmail.com>2017-09-24 00:03:47 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2017-11-03 11:17:24 +0900
commitf9baf02d1c112e7444109fdd7fac340ab1c30d03 (patch)
tree63ea278640422cfc4171ad3dcb245a6b425645b5 /app/assets
parent27ce861d7621378b8f207e151e6f8b862546b5fa (diff)
downloadgitlab-ce-f9baf02d1c112e7444109fdd7fac340ab1c30d03.tar.gz
Enable MergeableSelector in scss-lint (for !13480)
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/header.scss38
1 files changed, 17 insertions, 21 deletions
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 {