Commit eded27d0 authored by Phil Hughes's avatar Phil Hughes

Merge branch '28965-fix-filter-hover-state' into 'master'

Add border radius and remove blue outline on recent searches filter

See merge request gitlab-org/gitlab!23266
parents 12b035e9 804ae04a
...@@ -190,6 +190,7 @@ ...@@ -190,6 +190,7 @@
min-width: 0; min-width: 0;
border: 1px solid $border-color; border: 1px solid $border-color;
background-color: $white-light; background-color: $white-light;
border-radius: $border-radius-default 0 0 $border-radius-default;
@include media-breakpoint-down(sm) { @include media-breakpoint-down(sm) {
flex: 1 1 auto; flex: 1 1 auto;
...@@ -287,7 +288,7 @@ ...@@ -287,7 +288,7 @@
.filtered-search-history-dropdown-toggle-button { .filtered-search-history-dropdown-toggle-button {
flex: 1; flex: 1;
width: auto; width: auto;
border-radius: 0; border-radius: $border-radius-default 0 0 $border-radius-default;
border: 0; border: 0;
border-right: 1px solid $border-color; border-right: 1px solid $border-color;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
...@@ -296,8 +297,7 @@ ...@@ -296,8 +297,7 @@
&:hover, &:hover,
&:focus { &:focus {
color: $gl-text-color; color: $gl-text-color;
border-color: $blue-300; border-color: $border-color;
outline: none;
} }
svg { svg {
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
.filtered-search-box .filtered-search-box
= dropdown_tag(_('Recent searches'), = dropdown_tag(_('Recent searches'),
options: { wrapper_class: 'filtered-search-history-dropdown-wrapper', options: { wrapper_class: 'filtered-search-history-dropdown-wrapper',
toggle_class: 'filtered-search-history-dropdown-toggle-button', toggle_class: 'btn filtered-search-history-dropdown-toggle-button',
dropdown_class: 'filtered-search-history-dropdown', dropdown_class: 'filtered-search-history-dropdown',
content_class: 'filtered-search-history-dropdown-content' }) do content_class: 'filtered-search-history-dropdown-content' }) do
.js-filtered-search-history-dropdown{ data: { full_path: admin_runners_path } } .js-filtered-search-history-dropdown{ data: { full_path: admin_runners_path } }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
- if type != :boards_modal && type != :boards - if type != :boards_modal && type != :boards
= dropdown_tag(_('Recent searches'), = dropdown_tag(_('Recent searches'),
options: { wrapper_class: "filtered-search-history-dropdown-wrapper", options: { wrapper_class: "filtered-search-history-dropdown-wrapper",
toggle_class: "filtered-search-history-dropdown-toggle-button", toggle_class: "btn filtered-search-history-dropdown-toggle-button",
dropdown_class: "filtered-search-history-dropdown", dropdown_class: "filtered-search-history-dropdown",
content_class: "filtered-search-history-dropdown-content" }) do content_class: "filtered-search-history-dropdown-content" }) do
.js-filtered-search-history-dropdown{ data: { full_path: search_history_storage_prefix } } .js-filtered-search-history-dropdown{ data: { full_path: search_history_storage_prefix } }
......
---
title: Add border radius and remove blue outline on recent searches filter
merge_request: 23266
author:
type: fixed
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
.filtered-search-box .filtered-search-box
= dropdown_tag(_('Recent searches'), = dropdown_tag(_('Recent searches'),
options: { wrapper_class: "filtered-search-history-dropdown-wrapper", options: { wrapper_class: "filtered-search-history-dropdown-wrapper",
toggle_class: "filtered-search-history-dropdown-toggle-button", toggle_class: "btn filtered-search-history-dropdown-toggle-button",
dropdown_class: "filtered-search-history-dropdown", dropdown_class: "filtered-search-history-dropdown",
content_class: "filtered-search-history-dropdown-content" }) do content_class: "filtered-search-history-dropdown-content" }) do
.js-filtered-search-history-dropdown{ data: { full_path: search_history_storage_prefix } } .js-filtered-search-history-dropdown{ data: { full_path: search_history_storage_prefix } }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment