diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-09-12 11:03:28 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-09-12 11:03:28 +0000 |
| commit | c2e46802626d44d383c1a4aec344d01602b9e9ea (patch) | |
| tree | 6e54cb9d1020c08d572ff87035f500266671f46c | |
| parent | da7d02601cfa1ebd362a5be060b218b3f23b0e04 (diff) | |
| parent | fdb4069ad8d01a60bffef4dfad4d38129831402c (diff) | |
| download | gitlab-ce-c2e46802626d44d383c1a4aec344d01602b9e9ea.tar.gz | |
Merge branch 'mishunov-master-patch-90654' into 'master'
Removed padding from project filter field
See merge request gitlab-org/gitlab-ce!32706
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 3 | ||||
| -rw-r--r-- | app/views/admin/projects/index.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/mishunov-master-patch-90654.yml | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 2d2f0c531c7..f8127dc794a 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -207,8 +207,7 @@ input[type='checkbox']:hover { pointer-events: none; } - .search-text-input, - .project-filter-form-field { + .search-text-input { padding-left: $gl-padding + 15px; padding-right: $gl-padding + 15px; } diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 7e03eb4f075..bb0d62a70c0 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -4,7 +4,7 @@ .top-area.scrolling-tabs-container.inner-page-scroll-tabs .prepend-top-default .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 - toggle_text = 'Namespace' - if params[:namespace_id].present? diff --git a/changelogs/unreleased/mishunov-master-patch-90654.yml b/changelogs/unreleased/mishunov-master-patch-90654.yml new file mode 100644 index 00000000000..b01160f7426 --- /dev/null +++ b/changelogs/unreleased/mishunov-master-patch-90654.yml @@ -0,0 +1,5 @@ +--- +title: Unified presentation of the filter input field for projects listings +merge_request: 32706 +author: +type: changed |