lib/trestle/toolbar/menu.rb in trestle-0.9.8 vs lib/trestle/toolbar/menu.rb in trestle-0.10.0.pre

@@ -16,19 +16,16 @@
         result = @template.capture { @template.instance_exec(builder, &block) }
         items << result if result.present?
       end
 
       def render_toggle(options={})
-        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle"], data: { toggle: "dropdown" }) do
-          safe_join([
-            content_tag(:span, "", class: "caret"),
-            content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "sr-only")
-          ])
+        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle dropdown-toggle-split"], data: { bs_toggle: "dropdown" }, aria: { expanded: false }) do
+          content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "visually-hidden")
         end
       end
 
       def render_items
-        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-right", role: "menu")
+        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-end", role: "menu")
       end
 
       class Builder
         delegate :admin_link_to, :content_tag, to: :@template