BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
84336b84
Commit
84336b84
authored
Aug 18, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'winh-filtered-search-dropdowns' into 'master'
Make issuable filter dropdown style consistent See merge request !13421
parents
0d33de73
2ca454cf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
12 deletions
+20
-12
dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+15
-5
filters.scss
app/assets/stylesheets/framework/filters.scss
+2
-4
_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+3
-3
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
84336b84
...
...
@@ -728,18 +728,27 @@
@mixin
new-style-dropdown
(
$selector
:
''
)
{
#{
$selector
}
.dropdown-menu
,
#{
$selector
}
.dropdown-menu-nav
{
.divider
{
margin
:
6px
0
;
}
li
{
padding
:
0
1px
;
&
:hover
{
background-color
:
transparent
;
}
&
.divider
{
margin
:
6px
0
;
&
:hover
{
background-color
:
$dropdown-divider-color
;
}
}
&
.dropdown-header
{
padding
:
8px
16px
;
}
a
{
a
,
button
{
border-radius
:
0
;
padding
:
8px
16px
;
...
...
@@ -753,6 +762,7 @@
&
:active
,
&
:focus
{
background-color
:
$gray-darker
;
color
:
$gl-text-color
;
}
&
.is-active
{
...
...
app/assets/stylesheets/framework/filters.scss
View file @
84336b84
...
...
@@ -50,6 +50,8 @@
}
.filtered-search-wrapper
{
@include
new-style-dropdown
;
display
:
-
webkit-flex
;
display
:
flex
;
...
...
@@ -411,8 +413,6 @@
}
%filter-dropdown-item-btn-hover
{
background-color
:
$dropdown-hover-color
;
color
:
$white-light
;
text-decoration
:
none
;
outline
:
0
;
...
...
@@ -422,8 +422,6 @@
}
.droplab-dropdown
.dropdown-menu
.filter-dropdown-item
{
padding
:
0
;
.btn
{
border
:
none
;
width
:
100%
;
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
84336b84
...
...
@@ -57,7 +57,7 @@
%li
.filter-dropdown-item
{
data:
{
value:
'none'
}
}
%button
.btn.btn-link
No Assignee
%li
.divider
%li
.divider
.droplab-item-ignore
-
if
current_user
=
render
'shared/issuable/user_dropdown_item'
,
user:
current_user
...
...
@@ -76,7 +76,7 @@
%li
.filter-dropdown-item
{
'data-value'
=>
'started'
}
%button
.btn.btn-link
Started
%li
.divider
%li
.divider
.droplab-item-ignore
%ul
.filter-dropdown
{
data:
{
dynamic:
true
,
dropdown:
true
}
}
%li
.filter-dropdown-item
%button
.btn.btn-link.js-data-value
...
...
@@ -86,7 +86,7 @@
%li
.filter-dropdown-item
{
data:
{
value:
'none'
}
}
%button
.btn.btn-link
No Label
%li
.divider
%li
.divider
.droplab-item-ignore
%ul
.filter-dropdown
{
data:
{
dynamic:
true
,
dropdown:
true
}
}
%li
.filter-dropdown-item
%button
.btn.btn-link
...
...
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