Commit a9090c96 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents e6143067 c2e46802
...@@ -207,8 +207,7 @@ input[type='checkbox']:hover { ...@@ -207,8 +207,7 @@ input[type='checkbox']:hover {
pointer-events: none; pointer-events: none;
} }
.search-text-input, .search-text-input {
.project-filter-form-field {
padding-left: $gl-padding + 15px; padding-left: $gl-padding + 15px;
padding-right: $gl-padding + 15px; padding-right: $gl-padding + 15px;
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.top-area.scrolling-tabs-container.inner-page-scroll-tabs .top-area.scrolling-tabs-container.inner-page-scroll-tabs
.prepend-top-default .prepend-top-default
.search-holder .search-holder
= render 'shared/projects/search_form', autofocus: true, icon: true, admin_view: true = render 'shared/projects/search_form', autofocus: true, admin_view: true
.dropdown .dropdown
- toggle_text = 'Namespace' - toggle_text = 'Namespace'
- if params[:namespace_id].present? - if params[:namespace_id].present?
......
---
title: Unified presentation of the filter input field for projects listings
merge_request: 32706
author:
type: changed
...@@ -29,15 +29,17 @@ describe('MergeRequest', function() { ...@@ -29,15 +29,17 @@ describe('MergeRequest', function() {
mock.restore(); mock.restore();
}); });
it('modifies the Markdown field', function() { it('modifies the Markdown field', done => {
spyOn($, 'ajax').and.stub(); spyOn($, 'ajax').and.stub();
const changeEvent = document.createEvent('HTMLEvents'); const changeEvent = document.createEvent('HTMLEvents');
changeEvent.initEvent('change', true, true); changeEvent.initEvent('change', true, true);
$('input[type=checkbox]') $('input[type=checkbox]')
.attr('checked', true)[0] .attr('checked', true)[0]
.dispatchEvent(changeEvent); .dispatchEvent(changeEvent);
setTimeout(() => {
expect($('.js-task-list-field').val()).toBe('- [x] Task List Item'); expect($('.js-task-list-field').val()).toBe('- [x] Task List Item');
done();
});
}); });
describe('tasklist', () => { describe('tasklist', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment