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
Tatuya Kamada
gitlab-ce
Commits
fdd1bac9
Commit
fdd1bac9
authored
Dec 05, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style author dropdown
parent
f19503b0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
14 deletions
+24
-14
app/assets/javascripts/filtered_search/dropdown_hint.js.es6
app/assets/javascripts/filtered_search/dropdown_hint.js.es6
+2
-2
app/assets/stylesheets/framework/filters.scss
app/assets/stylesheets/framework/filters.scss
+10
-1
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+12
-11
No files found.
app/assets/javascripts/filtered_search/dropdown_hint.js.es6
View file @
fdd1bac9
...
@@ -32,8 +32,8 @@
...
@@ -32,8 +32,8 @@
}
}
itemClicked(e) {
itemClicked(e) {
const token = e.detail.selected.querySelector('.
dropdown
-filter-hint').innerText.trim();
const token = e.detail.selected.querySelector('.
js
-filter-hint').innerText.trim();
const tag = e.detail.selected.querySelector('.
dropdown
-filter-tag').innerText.trim();
const tag = e.detail.selected.querySelector('.
js
-filter-tag').innerText.trim();
if (tag.length) {
if (tag.length) {
gl.FilteredSearchManager.addWordToInput(this.getSelectedText(token));
gl.FilteredSearchManager.addWordToInput(this.getSelectedText(token));
...
...
app/assets/stylesheets/framework/filters.scss
View file @
fdd1bac9
...
@@ -85,8 +85,17 @@
...
@@ -85,8 +85,17 @@
}
}
}
}
.dropdown-
filter-tag
{
.dropdown-
light-content
{
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
400
;
font-weight
:
400
;
}
}
.dropdown-user
{
display
:
flex
;
}
.dropdown-user-details
{
display
:
flex
;
flex-direction
:
column
;
}
}
}
app/views/shared/issuable/_search_bar.html.haml
View file @
fdd1bac9
...
@@ -20,22 +20,23 @@
...
@@ -20,22 +20,23 @@
%li
.filter-dropdown
%li
.filter-dropdown
%button
.btn.btn-link
%button
.btn.btn-link
%i
.fa
{
'class'
:
'
{{
icon
}}
'
}
%i
.fa
{
'class'
:
'
{{
icon
}}
'
}
%span
.
dropdown
-filter-hint
%span
.
js
-filter-hint
{{hint}}
{{hint}}
%span
.
dropdown-filter-tag
%span
.
js-filter-tag.dropdown-light-content
{{tag}}
{{tag}}
#js-dropdown-author
.dropdown-menu
{
'data-dropdown'
=>
true
}
#js-dropdown-author
.dropdown-menu
{
'data-dropdown'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%li
%li
.filter-dropdown
%button
.btn.btn-link
%button
.btn.btn-link
.dropdown-user
%img
.avatar.avatar-inline
{
'data-src'
:
'
{{
avatar_url
}}
', width: '
30
'
}
%img
.avatar.avatar-inline
{
'data-src'
:
'
{{
avatar_url
}}
', width: '
30
'
}
%strong
.dropdown-user-details
{{name}}
%span
%span
{{username}}
{{name}}
%span
.dropdown-light-content
@{{username}}
#js-dropdown-assignee
.dropdown-menu
{
'data-dropdown'
=>
true
}
#js-dropdown-assignee
.dropdown-menu
{
'data-dropdown'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%li
%li
.filter-dropdown
%button
.btn.btn-link
%button
.btn.btn-link
%img
.avatar.avatar-inline
{
'data-src'
:
'
{{
avatar_url
}}
', width: '
30
'
}
%img
.avatar.avatar-inline
{
'data-src'
:
'
{{
avatar_url
}}
', width: '
30
'
}
%strong
%strong
...
@@ -44,12 +45,12 @@
...
@@ -44,12 +45,12 @@
{{username}}
{{username}}
#js-dropdown-milestone
.dropdown-menu
{
'data-dropdown'
=>
true
}
#js-dropdown-milestone
.dropdown-menu
{
'data-dropdown'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%li
%li
.filter-dropdown
%button
.btn.btn-link
%button
.btn.btn-link
{{title}}
{{title}}
#js-dropdown-label
.dropdown-menu
{
'data-dropdown'
=>
true
}
#js-dropdown-label
.dropdown-menu
{
'data-dropdown'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%li
%li
.filter-dropdown
%button
.btn.btn-link
%button
.btn.btn-link
%span
.dropdown-label-box
{
'style'
:
'
background:
{{
color
}}
'
}
%span
.dropdown-label-box
{
'style'
:
'
background:
{{
color
}}
'
}
{{title}}
{{title}}
...
...
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