summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-19 14:34:56 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-19 14:34:56 +0000
commit46a3e0ea9843b4120b66937015905a75a379af8a (patch)
tree2a0174bf16229e2ef11652eb0fe33e12faca2fc2
parentc0c394262833a4a35e3b2f7006ba6a4e93ef80d1 (diff)
parent935e23990f726b7de1bdd1a3c885524002b39cfc (diff)
downloadgitlab-ce-46a3e0ea9843b4120b66937015905a75a379af8a.tar.gz
Merge branch 'winh-label-filter-hover' into 'master'
Darken label color in search filter when hovering Closes #31899 See merge request !12182
-rw-r--r--app/assets/stylesheets/framework/filters.scss2
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index cfbaaaa04c7..880ab52fa1b 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -152,7 +152,7 @@
}
.value-container {
- background-color: $filter-value-selected-color;
+ box-shadow: inset 0 0 0 100px $filtered-search-term-shadow-color;
}
}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 49ba0108228..71513199d84 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -282,6 +282,7 @@ $dropdown-toggle-active-border-color: darken($border-color, 14%);
/*
* Filtered Search
*/
+$filtered-search-term-shadow-color: rgba(0, 0, 0, 0.09);
$dropdown-hover-color: $blue-400;
/*