Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
804ae04a
Commit
804ae04a
authored
Jan 17, 2020
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add border radius and remove blue outline on recent searches filter
parent
8d416b7b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
6 deletions
+11
-6
app/assets/stylesheets/framework/filters.scss
app/assets/stylesheets/framework/filters.scss
+3
-3
app/views/admin/runners/index.html.haml
app/views/admin/runners/index.html.haml
+1
-1
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+1
-1
changelogs/unreleased/28965-fix-filter-hover-state.yml
changelogs/unreleased/28965-fix-filter-hover-state.yml
+5
-0
ee/app/views/shared/epic/_search_bar.html.haml
ee/app/views/shared/epic/_search_bar.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/filters.scss
View file @
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
{
...
...
app/views/admin/runners/index.html.haml
View file @
804ae04a
...
@@ -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
}
}
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
804ae04a
...
@@ -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
}
}
...
...
changelogs/unreleased/28965-fix-filter-hover-state.yml
0 → 100644
View file @
804ae04a
---
title
:
Add border radius and remove blue outline on recent searches filter
merge_request
:
23266
author
:
type
:
fixed
ee/app/views/shared/epic/_search_bar.html.haml
View file @
804ae04a
...
@@ -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
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment