From 3660f9e8e292d52661a739f69e4157bb97b43a3b Mon Sep 17 00:00:00 2001 From: Torsten Date: Wed, 25 Jan 2023 01:15:51 +0200 Subject: [PATCH] fi margins and order --- app/views/merged/view/_section_cards.haml | 4 ++-- app/views/merged/view/cards/_card_normal_square.haml | 6 +++--- app/views/merged/view/cards/_card_wide_square.haml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/merged/view/_section_cards.haml b/app/views/merged/view/_section_cards.haml index bde83a7..3a2f1de 100644 --- a/app/views/merged/view/_section_cards.haml +++ b/app/views/merged/view/_section_cards.haml @@ -1,7 +1,7 @@ -%section.m-5.md:m-12.lg:m-20{ options(section , :background , :text_color)} +%section.m-8.md:m-12.lg:m-20{ options(section , :background , :text_color)} .flex.justify-center - unless section.header.blank? and section.text.blank? - .max-w-prose.px-4.py-16{ options(section , :text_align)} + .px-4.py-16{ options(section , :text_align)} - unless section.header.blank? %h1.text-2xl.font-bold.tracking-tight.sm:text-4xl = section.header diff --git a/app/views/merged/view/cards/_card_normal_square.haml b/app/views/merged/view/cards/_card_normal_square.haml index 6cc4f42..4512661 100644 --- a/app/views/merged/view/cards/_card_normal_square.haml +++ b/app/views/merged/view/cards/_card_normal_square.haml @@ -1,7 +1,7 @@ -.m-4.md:m-8.lg:m-12{background_option(card)} - %div{ order_option(card)} +.flex.flex-col.justify-between{background_option(card)} + %div{ order_option(card , "align-bottom")} = image_for( card , "h-full w-full object-cover") - .m-6{options(card , :text_align , :text_color , :order)} + .m-6{options(card , :text_align , :text_color )} %h3.p-4.text-2xl.font-bold= card.header -if card.has_option?("subheader") %h4.p-4.text-xl= card.option("subheader") diff --git a/app/views/merged/view/cards/_card_wide_square.haml b/app/views/merged/view/cards/_card_wide_square.haml index 42e1abe..2c9f560 100644 --- a/app/views/merged/view/cards/_card_wide_square.haml +++ b/app/views/merged/view/cards/_card_wide_square.haml @@ -1,8 +1,8 @@ -.flex.m-2.flex-col.lg:flex-row.md:m-4.lg:m-6{background_option(card)} +.flex.flex-col.lg:flex-row{background_option(card)} = image_for( card , "object-cover lg:w-3/5") - .mx-6{options(card , :text_align , :text_color , :order , "lg:w-2/5")} - %h3.px-4.mt-2.text-2xl.font-bold= card.header + .ml-0.lg:ml-10.mt-6.lg:mt0{options(card , :text_align , :text_color , :order , "lg:w-2/5")} + %h3.text-2xl.font-bold= card.header -if card.has_option?("subheader") - %h4.p-4.text-xl= card.option("subheader") - .mt-2.p-4{prose_classes}= markdown(card) + %h4.py-4.text-xl= card.option("subheader") + .py-4{prose_classes}= markdown(card) =view_button(card , "mb-2")