FeenixMakers/merged
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve layout

Browse Source
This commit is contained in:
Torsten 2023-01-09 20:47:47 +02:00
parent cc4aa25e46
commit 484fa4f6e7
4 changed files with 25 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/views/layouts/_merged_header.haml
View File

@ -1,21 +0,0 @@
.flex.h-16.items-center.gap-16
%a.ml-20{: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
= yield :merged_menu
%button.my-3{class: last_change_class}= last_change_text

48
app/views/layouts/merged/_header.haml
View File

@ -1,26 +1,28 @@
.mx-20.my-6.flex.h-16.items-center.gap-16 .flex.mx-20.my-6.h-16.justify-between
%a{:href => "/merged/pages"} .flex.items-center.gap-16
%span.sr-only Home %a{:href => "/merged/pages"}
=image_tag("merged/merged_logo" , class: "h-10") %span.sr-only Home
=image_tag("merged/merged_logo" , class: "h-10")
%ul.flex.items-center.gap-6.text-lg %ul.flex.items-center.gap-6.text-lg
%li %li
%a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.pages_path} %a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.pages_path}
Pages Pages
%li %li
%a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.images_path} %a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.images_path}
Images Images
%li %li
%a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.styles_index_path} %a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.styles_index_path}
Styles Styles
%li %li
%a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.changes_index_path} %a.text-gray-500.transition{:class => "hover:text-gray-500/75", :href => merged.changes_index_path}
Changes Changes
%button.my-3{class: last_change_class}= last_change_text .flex.items-center.gap-16
%button.my-3{class: last_change_class}= last_change_text
= form_tag( main_app.destroy_member_session_path , {method: :delete } ) do = 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"} %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"} %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"} %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 Sign out

2
app/views/merged/sections/new.haml
View File

@ -5,8 +5,6 @@
Branch Branch
= @git.current_branch = @git.current_branch
= render "layouts/merged_header"
%h1 New merged_section %h1 New merged_section
= render 'form' = render 'form'

1
app/views/merged/sections/select_card_template.haml
View File

@ -4,7 +4,6 @@
.text-xl.text-gray-900 .text-xl.text-gray-900
Select Card Style for Section #{@section.index} - #{@section.header} Select Card Style for Section #{@section.index} - #{@section.header}
= render "layouts/merged_header"
.grid.grid-cols-4.gap-6.m-8 .grid.grid-cols-4.gap-6.m-8
- @cards.each do |style| - @cards.each do |style|
.border.border-gray-300.rounded-lg.p-2 .border.border-gray-300.rounded-lg.p-2