back to merged layout (more space)

app/views/layouts/merged/_header.haml

@@ -0,0 +1,26 @@
+.mx-20.my-6.flex.h-16.items-center.gap-16
+  %a{:href => "/merged/pages"}
+    %span.sr-only Home
+    =image_tag("merged/merged_logo" , class: "h-10")
+
+  %ul.flex.items-center.gap-6.text-lg
+    %li
+      %a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.pages_path}
+        Pages
+    %li
+      %a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.images_path}
+        Images
+    %li
+      %a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.styles_index_path}
+        Styles
+    %li
+      %a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.changes_index_path}
+        Changes
+
+  %button.my-3{class: last_change_class}= last_change_text
+
+  = form_tag( main_app.destroy_member_session_path , {method: :delete  } ) do
+    %button.flex.w-full.items-center.gap-2.rounded-lg.px-4.py-2.text-sm.text-blue-700.hover:bg-red-50{:role => "menuitem", :type => "submit"}
+      %svg.h-4.w-4{:fill => "none", :stroke => "currentColor", "stroke-width" => "2", :viewbox => "0 0 24 24", :xmlns => "http://www.w3.org/2000/svg"}
+        %path{:d => "M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16", "stroke-linecap" => "round", "stroke-linejoin" => "round"}
+      Sign out

app/views/layouts/merged/_messages.haml

@@ -0,0 +1,28 @@
+-if flash.alert
+  #flash
+    .m-20.rounded.border-l-4.border-red-500.bg-red-50.p-4{:role => "alert"}
+      %strong.block.font-medium.text-red-700 Oops
+      %p.mt-2.text-sm.text-red-700
+        =flash.alert
+
+-if flash.notice
+  #flash
+    .m-20.rounded-xl.border.border-gray-100.p-4.shadow-xl{:role => "alert"}
+      .flex.items-start.gap-4
+        %span.text-green-600
+          %svg.h-6.w-6{:fill => "none", :stroke => "currentColor", "stroke-width" => "1.5", :viewbox => "0 0 24 24", :xmlns => "http://www.w3.org/2000/svg"}
+            %path{:d => "M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z", "stroke-linecap" => "round", "stroke-linejoin" => "round"}
+        .flex-1
+          %strong.block.font-medium.text-gray-900 Ok
+          %p.mt-1.text-sm.text-gray-700
+            = flash.notice
+:javascript
+  function hideNotice() {
+    const notification = document.querySelector('#flash')
+    if (notification) {
+      setInterval(function() {
+        notification.classList.add('hidden');
+      }, 5000);
+    }
+  }
+  hideNotice();

app/views/layouts/merged/application.haml

@@ -0,0 +1,18 @@
+!!!
+%html
+  %head
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %title Hubfeenix
+    %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
+    = csrf_meta_tags
+    = csp_meta_tag
+    = stylesheet_link_tag "merged/merged"
+
+    = javascript_importmap_tags
+    - if false
+      %script{:src => "https://cdn.tailwindcss.com"}
+
+  %body
+    = render "layouts/merged/header"
+    = render "layouts/merged/messages"
+    = yield