diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 15:06:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 15:06:14 +0300 |
| commit | e464f195ff5debc3e9aad0f8c4537404b92019c6 (patch) | |
| tree | 9efe381ffb9d8c9bceb3cced1e27b6b59dc6298b /app/views/search | |
| parent | 5ff1b520badaa2da217416964709f49f3ede350a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/_form.html.haml | 1 | ||||
| -rw-r--r-- | app/views/search/show.html.haml | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/search/_form.html.haml b/app/views/search/_form.html.haml index 464db94b7f4..dc75918eb93 100644 --- a/app/views/search/_form.html.haml +++ b/app/views/search/_form.html.haml @@ -18,4 +18,3 @@ = render 'filter' .d-flex-center.flex-column.flex-lg-row = button_tag _("Search"), class: "btn btn-success btn-search form-control mt-lg-0 ml-lg-1 align-self-end" - = render_if_exists 'search/form_elasticsearch' diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml index 9235678bc1d..f300e1d4841 100644 --- a/app/views/search/show.html.haml +++ b/app/views/search/show.html.haml @@ -2,9 +2,10 @@ - page_title @search_term - @hide_breadcrumbs = true -.page-title-holder.d-flex.align-items-center +.page-title-holder.d-sm-flex.align-items-sm-center %h1.page-title< = _('Search') + = render_if_exists 'search/form_elasticsearch', attrs: { class: 'ml-sm-auto' } .prepend-top-default = render 'search/form' |