_sidebar.html.erb in trestle-0.10.1

- old
+ new
@@ -10,29 +10,29 @@
   </header>
 
   <div class="app-sidebar-inner" data-sidebar-target="inner">
     <nav class="app-nav" data-controller="navigation">
       <% Trestle.navigation(self).each do |group, items| %>
-        <%= content_tag(:ul, class: ("collapsed" if group.present? && navigation_group_collapsed?(group)), data: { group: group.id }) do %>
+        <%= tag.ul(class: ("collapsed" if group.present? && navigation_group_collapsed?(group)), data: { group: group.id }) do %>
           <% if group.present? %>
-            <li class="nav-header"><%= link_to content_tag(:span, group.label), "##{group.id}", data: { action: "navigation#toggle" } %></li>
+            <li class="nav-header"><%= link_to tag.span(group.label), "##{group.id}", data: { action: "navigation#toggle" } %></li>
           <% end %>
 
           <% items.each do |item| %>
-            <%= content_tag(:li, class: ["nav-item", ("active" if current_navigation_item?(item))]) do %>
+            <%= tag.li(class: ["nav-item", ("active" if current_navigation_item?(item))]) do %>
               <%= link_to item.path, item.html_options.merge(data: { controller: "navigation-tooltip" }) do %>
                 <%= icon("nav-icon", item.icon) %>
                 <span class="nav-label" data-navigation-tooltip-target="label"><%= item.label %></span>
 
-                <%= content_tag(:span, item.badge.text, class: ["badge", item.badge.html_class]) if item.badge? %>
+                <%= tag.span(item.badge.text, class: ["badge", item.badge.html_class]) if item.badge? %>
               <% end %>
             <% end %>
           <% end %>
         <% end %>
       <% end %>
     </nav>
-
-    <button class="toggle-sidebar" data-action="sidebar#toggle">
-      <span class="visually-hidden"><%= t("trestle.ui.toggle_sidebar", default: "Toggle sidebar") %></span>
-    </button>
   </div>
+
+  <button class="toggle-sidebar" data-action="sidebar#toggle">
+    <span class="visually-hidden"><%= t("trestle.ui.toggle_sidebar", default: "Toggle sidebar") %></span>
+  </button>
 </aside>