Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 8 deletions

diff --git a/app/views/layouts/nav/breadcrumbs/_breadcrumbs.html.haml b/app/views/layouts/nav/breadcrumbs/_breadcrumbs.html.haml
index 040793d616f..417df51e984 100644
--- a/app/views/layouts/nav/breadcrumbs/_breadcrumbs.html.haml
+++ b/app/views/layouts/nav/breadcrumbs/_breadcrumbs.html.haml
@@ -2,8 +2,8 @@
 - unless @skip_current_level_breadcrumb
   - push_to_schema_breadcrumb(@breadcrumb_title, breadcrumb_title_link)
 
-%nav.breadcrumbs{ 'aria-label': _('Breadcrumbs'), data: { testid: 'breadcrumb-links' } }
-  %ul.list-unstyled.breadcrumbs-list.js-breadcrumbs-list
+%nav.breadcrumbs.gl-breadcrumbs{ 'aria-label': _('Breadcrumbs'), data: { testid: 'breadcrumb-links' } }
+  %ul.breadcrumb.gl-breadcrumb-list.js-breadcrumbs-list
     - unless hide_top_links
       = header_title
     - if @breadcrumbs_extra_links
@@ -11,8 +11,8 @@
         = breadcrumb_list_item link_to(extra[:text], extra[:link])
     = render "layouts/nav/breadcrumbs/collapsed_inline_list", location: :after
     - unless @skip_current_level_breadcrumb
-      %li{ data: { testid: 'breadcrumb-current-link' } }
-        = link_to @breadcrumb_title, breadcrumb_title_link
+      %li.gl-breadcrumb-item{ data: { testid: 'breadcrumb-current-link' } }
+        = link_to(@breadcrumb_title, breadcrumb_title_link)
   -# haml-lint:disable InlineJavaScript
   %script{ type: 'application/ld+json' }
     :plain
diff --git a/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml b/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
index dd2d23320be..3894501bbbb 100644
--- a/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
+++ b/app/views/layouts/nav/breadcrumbs/_collapsed_inline_list.html.haml
@@ -1,11 +1,9 @@
 - dropdown_location = local_assigns.fetch(:location, nil)
 - button_tooltip = local_assigns.fetch(:title, _("Show all breadcrumbs"))
 - if defined?(@breadcrumb_collapsed_links) && @breadcrumb_collapsed_links.key?(dropdown_location)
-  %li.expander
+  %li.expander.gl-breadcrumb-item
     %button.text-expander.has-tooltip.js-breadcrumbs-collapsed-expander{ type: "button", data: { container: "body" }, "aria-label": button_tooltip, title: button_tooltip }
       = sprite_icon("ellipsis_h", size: 12)
-    = sprite_icon("chevron-lg-right", size: 8, css_class: "breadcrumbs-list-angle")
   - @breadcrumb_collapsed_links[dropdown_location].each_with_index do |link, index|
-    %li{ :class => "gl-display-none! breadcrumbs-detail-item" }
+    %li.gl-breadcrumb-item{ :class => "gl-display-none!" }
       = link
-      = sprite_icon("chevron-lg-right", size: 8, css_class: "breadcrumbs-list-angle")