kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Style author dropdown

Browse source
This commit is contained in:
Clement Ho 2016-12-05 12:35:28 -06:00
parent f19503b008
commit fdd1bac91a
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/filtered_search/dropdown_hint.js.es6
View file

@ -32,8 +32,8 @@
}
itemClicked(e) {
const token = e.detail.selected.querySelector('.dropdown-filter-hint').innerText.trim();
const tag = e.detail.selected.querySelector('.dropdown-filter-tag').innerText.trim();
const token = e.detail.selected.querySelector('.js-filter-hint').innerText.trim();
const tag = e.detail.selected.querySelector('.js-filter-tag').innerText.trim();
if (tag.length) {
gl.FilteredSearchManager.addWordToInput(this.getSelectedText(token));

11
app/assets/stylesheets/framework/filters.scss
View file

@ -85,8 +85,17 @@
}
}
.dropdown-filter-tag {
.dropdown-light-content {
font-size: 14px;
font-weight: 400;
}
.dropdown-user {
display: flex;
}
.dropdown-user-details {
display: flex;
flex-direction: column;
}
}

23
app/views/shared/issuable/_search_bar.html.haml
View file

@ -20,22 +20,23 @@
%li.filter-dropdown
%button.btn.btn-link
%i.fa{ 'class': '{{icon}}'}
%span.dropdown-filter-hint
%span.js-filter-hint
{{hint}}
%span.dropdown-filter-tag
%span.js-filter-tag.dropdown-light-content
{{tag}}
#js-dropdown-author.dropdown-menu{ 'data-dropdown' => true }
%ul{ 'data-dynamic' => true }
%li
%button.btn.btn-link
%li.filter-dropdown
%button.btn.btn-link.dropdown-user
%img.avatar.avatar-inline{ 'data-src': '{{avatar_url}}', width: '30' }
%strong
{{name}}
%span
{{username}}
.dropdown-user-details
%span
{{name}}
%span.dropdown-light-content
@{{username}}
#js-dropdown-assignee.dropdown-menu{ 'data-dropdown' => true }
%ul{ 'data-dynamic' => true }
%li
%li.filter-dropdown
%button.btn.btn-link
%img.avatar.avatar-inline{ 'data-src': '{{avatar_url}}', width: '30' }
%strong
@ -44,12 +45,12 @@
{{username}}
#js-dropdown-milestone.dropdown-menu{ 'data-dropdown' => true }
%ul{ 'data-dynamic' => true }
%li
%li.filter-dropdown
%button.btn.btn-link
{{title}}
#js-dropdown-label.dropdown-menu{ 'data-dropdown' => true }
%ul{ 'data-dynamic' => true }
%li
%li.filter-dropdown
%button.btn.btn-link
%span.dropdown-label-box{ 'style': 'background: {{color}}'}
{{title}}