diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-30 12:13:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-30 12:13:59 +0300 |
commit | 1aa447601c6be1e964acbb674887649dab23b804 (patch) | |
tree | f92778e2362ba9d7118bee2b02428647ccbcab4d /app/views/layouts | |
parent | 010d26e381cbdd763212ace65e4b1dc7153f44a9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/_header_search.html.haml | 31 | ||||
-rw-r--r-- | app/views/layouts/header/_default.html.haml | 15 |
2 files changed, 0 insertions, 46 deletions
diff --git a/app/views/layouts/_header_search.html.haml b/app/views/layouts/_header_search.html.haml deleted file mode 100644 index add518723e5..00000000000 --- a/app/views/layouts/_header_search.html.haml +++ /dev/null @@ -1,31 +0,0 @@ -#js-header-search.header-search-form.is-not-active.gl-relative.gl-w-full{ data: { 'search-context' => header_search_context.to_json, -'search-path' => search_path, -'issues-path' => issues_dashboard_path, -'mr-path' => merge_requests_dashboard_path, -'autocomplete-path' => search_autocomplete_path } } - = form_tag search_path, method: :get do |_f| - .gl-search-box-by-type - = sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon') - %input{ id: 'search', name: 'search', type: "text", placeholder: s_('GlobalSearch|Search GitLab'), - class: 'form-control gl-form-input gl-search-box-by-type-input', - autocomplete: 'off', - data: { testid: 'search_box' } } - - = hidden_field_tag :group_id, header_search_context[:group][:id] if header_search_context[:group] - = hidden_field_tag :project_id, header_search_context[:project][:id] if header_search_context[:project] - - - if header_search_context[:group] || header_search_context[:project] - = hidden_field_tag :scope, header_search_context[:scope] - = hidden_field_tag :search_code, header_search_context[:code_search] - - = hidden_field_tag :snippets, header_search_context[:for_snippets] - = hidden_field_tag :repository_ref, header_search_context[:ref] - = hidden_field_tag :nav_source, 'navbar' - - -# workaround for non-JS feature specs, see spec/support/helpers/search_helpers.rb - - if ENV['RAILS_ENV'] == 'test' - %noscript= button_tag 'Search' - %kbd.gl-absolute.gl-right-3.gl-top-0.keyboard-shortcut-helper.gl-z-index-1.has-tooltip{ data: { html: 'true', - placement: 'bottom' }, - title: html_escape(s_('GlobalSearch|Use the shortcut key %{kbdOpen}/%{kbdClose} to start a search')) % { kbdOpen: '<kbd>'.html_safe, kbdClose: '</kbd>'.html_safe } } - = '/' diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index fb875c67b6d..eac109573a5 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -18,21 +18,6 @@ .gl-display-none.gl-sm-display-block = render "layouts/nav/top_nav" - - if top_nav_show_search - .navbar-collapse.gl-transition-medium.collapse.gl-mr-auto.global-search-container.hide-when-top-nav-responsive-open - - search_menu_item = top_nav_search_menu_item_attrs - %ul.nav.navbar-nav.gl-w-full.gl-align-items-center - %li.nav-item.header-search.gl-display-none.gl-lg-display-block.gl-w-full - - unless current_controller?(:search) - = render 'layouts/header_search' - %li.nav-item{ class: 'd-none d-sm-inline-block d-lg-none' } - = link_to search_menu_item.fetch(:href), title: search_menu_item.fetch(:title), aria: { label: search_menu_item.fetch(:title) }, - data: { toggle: 'tooltip', placement: 'bottom', container: 'body', - track_action: 'click_link', - track_label: 'global_search', - track_property: 'navigation_top' } do - = sprite_icon(search_menu_item.fetch(:icon)) - .navbar-collapse.gl-transition-medium.collapse %ul.nav.navbar-nav.gl-w-full.gl-align-items-center.gl-justify-content-end - if current_user |