diff --git a/app/helpers/merged/merged_helper.rb b/app/helpers/merged/merged_helper.rb index e3e1d5d..a8e8ed2 100644 --- a/app/helpers/merged/merged_helper.rb +++ b/app/helpers/merged/merged_helper.rb @@ -67,13 +67,13 @@ module Merged puts "Columns #{option}" case option when "3" - columns = "grid-cols-1 md:grid-cols-3" + columns = "grid-cols-1 md:grid-cols-2 lg:grid-cols-3" when "4" columns = "grid-cols-1 md:grid-cols-2 lg:grid-cols-4" else # two columns = "grid-cols-1 md:grid-cols-2" end - {class: columns + " gap-6"} + {class: columns } end def button(text , url , color) diff --git a/app/views/merged/view/_section_cards.haml b/app/views/merged/view/_section_cards.haml index 92d0114..38396a5 100644 --- a/app/views/merged/view/_section_cards.haml +++ b/app/views/merged/view/_section_cards.haml @@ -1,9 +1,9 @@ -.flex.flex-col.mx-5{ background_option(section)} +.flex.flex-col.m-20{ background_option(section)} .flex.items-center.justify-center.flex-1 - .max-w-prose.px-4.py-8.mx-auto.text-center + .max-w-prose.px-4.py-16.mx-auto.text-center %h1.text-2xl.font-bold.tracking-tight.text-gray-900.sm:text-4xl = section.header - %p.mt-4.text-gray-500 + %p.mt-4.text-gray-700.pt-10 = section.text - template = "merged/view/cards/" + section.card_template .grid{ column_option(section)} diff --git a/app/views/merged/view/_section_full_up.haml b/app/views/merged/view/_section_full_up.haml index 5bed1c0..ff4967d 100644 --- a/app/views/merged/view/_section_full_up.haml +++ b/app/views/merged/view/_section_full_up.haml @@ -1,4 +1,4 @@ -.flex.flex-col.bg-white +.flex.flex-col.m-20.bg-white .flex.items-center.justify-center.flex-1 .max-w-xl.px-4.py-8.mx-auto.text-center %h1.text-2xl.font-bold.tracking-tight.text-gray-900.sm:text-4xl diff --git a/app/views/merged/view/_section_half_header.haml b/app/views/merged/view/_section_half_header.haml index 9f3504d..64a6394 100644 --- a/app/views/merged/view/_section_half_header.haml +++ b/app/views/merged/view/_section_half_header.haml @@ -1,4 +1,4 @@ -%section +%section.m-20 .mx-auto.max-w-screen-xl.px-4.py-16.sm:px-6.sm:py-24.lg:px-8 .max-w-3xl %h2.text-3xl.font-bold.sm:text-4xl diff --git a/app/views/merged/view/_section_half_image.haml b/app/views/merged/view/_section_half_image.haml index 2c31660..c066ecc 100644 --- a/app/views/merged/view/_section_half_image.haml +++ b/app/views/merged/view/_section_half_image.haml @@ -1,7 +1,7 @@ -%section.overflow-hidden.sm:grid.sm:grid-cols-2 +%section.overflow-hidden.grid.grid-cols-2.m-20 %div{ order_option(section)} - = image_for( section , "p-5 h-56 w-full object-cover sm:h-full") - .p-8.m-5.md:p-12.lg:px-16.lg:py-24{ background_option(section)} + = image_for( section , "h-56 w-full object-cover sm:h-full") + .p-8.md:p-12.lg:px-16.lg:py-24{ background_option(section)} .mx-auto.max-w-xl.text-center.sm:text-left %h2.text-2xl.font-bold.text-gray-900.md:text-3xl = section.header diff --git a/app/views/merged/view/cards/_card_full_image.haml b/app/views/merged/view/cards/_card_full_image.haml index 5a2f35e..dca57d8 100644 --- a/app/views/merged/view/cards/_card_full_image.haml +++ b/app/views/merged/view/cards/_card_full_image.haml @@ -1,4 +1,4 @@ -.group.m-4.overflow-hidden.relative.flex.h-96.items-end.bg-black +.group.m-8.overflow-hidden.relative.flex.h-96.items-end.bg-black = image_for( card , "absolute inset-0 h-full w-full object-cover hover:scale-110 ease-in duration-700") .relative.w-full.bg-cyan-600.m-2.p-4.text-center.tracking-widest.text-white.transition-colors.group-hover:bg-cyan-700{:class => "sm:w-1/2"} %h3.text-lg.uppercase diff --git a/app/views/merged/view/cards/_card_normal_square.haml b/app/views/merged/view/cards/_card_normal_square.haml index 7eec445..4d84896 100644 --- a/app/views/merged/view/cards/_card_normal_square.haml +++ b/app/views/merged/view/cards/_card_normal_square.haml @@ -1,4 +1,4 @@ -%div{background_option(card)} +%div.m-10{background_option(card)} = image_for( card , "h-96 w-full object-cover") %div.m-4{align_option(card)} %h3.mt-4.p-4.text-xl.font-bold= card.header