Commit 4aa57280 authored by Peter Hegman's avatar Peter Hegman

Merge branch '345745_07-search-placeholder' into 'master'

Global Search - Fix Search Placeholder

See merge request gitlab-org/gitlab!77540
parents 4c938b8c cabbe1d5
...@@ -19,8 +19,7 @@ import HeaderSearchScopedItems from './header_search_scoped_items.vue'; ...@@ -19,8 +19,7 @@ import HeaderSearchScopedItems from './header_search_scoped_items.vue';
export default { export default {
name: 'HeaderSearchApp', name: 'HeaderSearchApp',
i18n: { i18n: {
searchPlaceholder: s__('GlobalSearch|Search or jump to...'), searchGitlab: s__('GlobalSearch|Search GitLab'),
searchAria: s__('GlobalSearch|Search GitLab'),
searchInputDescribeByNoDropdown: s__( searchInputDescribeByNoDropdown: s__(
'GlobalSearch|Type and press the enter key to submit search.', 'GlobalSearch|Type and press the enter key to submit search.',
), ),
...@@ -136,7 +135,7 @@ export default { ...@@ -136,7 +135,7 @@ export default {
<form <form
v-outside="closeDropdown" v-outside="closeDropdown"
role="search" role="search"
:aria-label="$options.i18n.searchAria" :aria-label="$options.i18n.searchGitlab"
class="header-search gl-relative" class="header-search gl-relative"
> >
<gl-search-box-by-type <gl-search-box-by-type
...@@ -145,7 +144,7 @@ export default { ...@@ -145,7 +144,7 @@ export default {
role="searchbox" role="searchbox"
class="gl-z-index-1" class="gl-z-index-1"
autocomplete="off" autocomplete="off"
:placeholder="$options.i18n.searchPlaceholder" :placeholder="$options.i18n.searchGitlab"
:aria-activedescendant="currentFocusedId" :aria-activedescendant="currentFocusedId"
:aria-describedby="$options.SEARCH_INPUT_DESCRIPTION" :aria-describedby="$options.SEARCH_INPUT_DESCRIPTION"
@focus="openDropdown" @focus="openDropdown"
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
'autocomplete-path' => search_autocomplete_path } } 'autocomplete-path' => search_autocomplete_path } }
.gl-search-box-by-type .gl-search-box-by-type
= sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon') = sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon')
%input{ type: "text", placeholder: _('Search or jump to...'), class: 'form-control gl-form-input gl-search-box-by-type-input', id: 'search', autocomplete: 'off' } %input{ type: "text", placeholder: s_('GlobalSearch|Search GitLab'), class: 'form-control gl-form-input gl-search-box-by-type-input', id: 'search', autocomplete: 'off' }
- else - else
= render 'layouts/search' = render 'layouts/search'
%li.nav-item{ class: 'd-none d-sm-inline-block d-lg-none' } %li.nav-item{ class: 'd-none d-sm-inline-block d-lg-none' }
......
...@@ -16382,9 +16382,6 @@ msgstr "" ...@@ -16382,9 +16382,6 @@ msgstr ""
msgid "GlobalSearch|Search GitLab" msgid "GlobalSearch|Search GitLab"
msgstr "" msgstr ""
msgid "GlobalSearch|Search or jump to..."
msgstr ""
msgid "GlobalSearch|Search results are loading" msgid "GlobalSearch|Search results are loading"
msgstr "" msgstr ""
...@@ -31050,9 +31047,6 @@ msgstr "" ...@@ -31050,9 +31047,6 @@ msgstr ""
msgid "Search or filter results…" msgid "Search or filter results…"
msgstr "" msgstr ""
msgid "Search or jump to..."
msgstr ""
msgid "Search project" msgid "Search project"
msgstr "" msgstr ""
......
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