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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
2ca454cf
Commit
2ca454cf
authored
Aug 18, 2017
by
Winnie Hellmann
Committed by
Clement Ho
Aug 18, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make issuable filter dropdown style consistent
parent
0d33de73
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
12 deletions
+20
-12
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+15
-5
app/assets/stylesheets/framework/filters.scss
app/assets/stylesheets/framework/filters.scss
+2
-4
app/views/shared/issuable/_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 @
2ca454cf
...
@@ -728,18 +728,27 @@
...
@@ -728,18 +728,27 @@
@mixin
new-style-dropdown
(
$selector
:
''
)
{
@mixin
new-style-dropdown
(
$selector
:
''
)
{
#{
$selector
}
.dropdown-menu
,
#{
$selector
}
.dropdown-menu
,
#{
$selector
}
.dropdown-menu-nav
{
#{
$selector
}
.dropdown-menu-nav
{
.divider
{
margin
:
6px
0
;
}
li
{
li
{
padding
:
0
1px
;
padding
:
0
1px
;
&
:hover
{
background-color
:
transparent
;
}
&
.divider
{
margin
:
6px
0
;
&
:hover
{
background-color
:
$dropdown-divider-color
;
}
}
&
.dropdown-header
{
&
.dropdown-header
{
padding
:
8px
16px
;
padding
:
8px
16px
;
}
}
a
{
a
,
button
{
border-radius
:
0
;
border-radius
:
0
;
padding
:
8px
16px
;
padding
:
8px
16px
;
...
@@ -753,6 +762,7 @@
...
@@ -753,6 +762,7 @@
&
:active
,
&
:active
,
&
:focus
{
&
:focus
{
background-color
:
$gray-darker
;
background-color
:
$gray-darker
;
color
:
$gl-text-color
;
}
}
&
.is-active
{
&
.is-active
{
...
...
app/assets/stylesheets/framework/filters.scss
View file @
2ca454cf
...
@@ -50,6 +50,8 @@
...
@@ -50,6 +50,8 @@
}
}
.filtered-search-wrapper
{
.filtered-search-wrapper
{
@include
new-style-dropdown
;
display
:
-
webkit-flex
;
display
:
-
webkit-flex
;
display
:
flex
;
display
:
flex
;
...
@@ -411,8 +413,6 @@
...
@@ -411,8 +413,6 @@
}
}
%filter-dropdown-item-btn-hover
{
%filter-dropdown-item-btn-hover
{
background-color
:
$dropdown-hover-color
;
color
:
$white-light
;
text-decoration
:
none
;
text-decoration
:
none
;
outline
:
0
;
outline
:
0
;
...
@@ -422,8 +422,6 @@
...
@@ -422,8 +422,6 @@
}
}
.droplab-dropdown
.dropdown-menu
.filter-dropdown-item
{
.droplab-dropdown
.dropdown-menu
.filter-dropdown-item
{
padding
:
0
;
.btn
{
.btn
{
border
:
none
;
border
:
none
;
width
:
100%
;
width
:
100%
;
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
2ca454cf
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
%li
.filter-dropdown-item
{
data:
{
value:
'none'
}
}
%li
.filter-dropdown-item
{
data:
{
value:
'none'
}
}
%button
.btn.btn-link
%button
.btn.btn-link
No Assignee
No Assignee
%li
.divider
%li
.divider
.droplab-item-ignore
-
if
current_user
-
if
current_user
=
render
'shared/issuable/user_dropdown_item'
,
=
render
'shared/issuable/user_dropdown_item'
,
user:
current_user
user:
current_user
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
%li
.filter-dropdown-item
{
'data-value'
=>
'started'
}
%li
.filter-dropdown-item
{
'data-value'
=>
'started'
}
%button
.btn.btn-link
%button
.btn.btn-link
Started
Started
%li
.divider
%li
.divider
.droplab-item-ignore
%ul
.filter-dropdown
{
data:
{
dynamic:
true
,
dropdown:
true
}
}
%ul
.filter-dropdown
{
data:
{
dynamic:
true
,
dropdown:
true
}
}
%li
.filter-dropdown-item
%li
.filter-dropdown-item
%button
.btn.btn-link.js-data-value
%button
.btn.btn-link.js-data-value
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
%li
.filter-dropdown-item
{
data:
{
value:
'none'
}
}
%li
.filter-dropdown-item
{
data:
{
value:
'none'
}
}
%button
.btn.btn-link
%button
.btn.btn-link
No Label
No Label
%li
.divider
%li
.divider
.droplab-item-ignore
%ul
.filter-dropdown
{
data:
{
dynamic:
true
,
dropdown:
true
}
}
%ul
.filter-dropdown
{
data:
{
dynamic:
true
,
dropdown:
true
}
}
%li
.filter-dropdown-item
%li
.filter-dropdown-item
%button
.btn.btn-link
%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