diff --git a/app/assets/images/merged/card_preview/card_gap_square.png b/app/assets/images/merged/card_preview/card_gap_square.png new file mode 100644 index 0000000..f6ab89a Binary files /dev/null and b/app/assets/images/merged/card_preview/card_gap_square.png differ diff --git a/app/assets/images/merged/merged_logo.png b/app/assets/images/merged/merged_logo.png index e047800..327f054 100644 Binary files a/app/assets/images/merged/merged_logo.png and b/app/assets/images/merged/merged_logo.png differ diff --git a/app/views/merged/view/_section_half_image.haml b/app/views/merged/view/_section_half_image.haml index 97f57ae..02bb2e1 100644 --- a/app/views/merged/view/_section_half_image.haml +++ b/app/views/merged/view/_section_half_image.haml @@ -13,6 +13,6 @@ -if section.has_option?("text") %p.mt-8.md:block = section.option("text") - .mt-8.md:mt-8 - -if section.has_option?("button_text") + -if section.has_option?("button_text") + .mt-8.md:mt-8 = render 'merged/view/elements/button' , section: section diff --git a/app/views/merged/view/cards/_card_gap_square.haml b/app/views/merged/view/cards/_card_gap_square.haml new file mode 100644 index 0000000..7bc9ee1 --- /dev/null +++ b/app/views/merged/view/cards/_card_gap_square.haml @@ -0,0 +1,8 @@ +.grid.grid-cols-1.gap-16.m-16 + %div{ order_option(card)} + = image_for( card , "h-70 w-full object-cover grid") + %div.grid.h-70{options(card , :align , :color , :background )} + %h3.p-4.mt-10.text-3xl.font-bold= card.header + -if card.has_option?("subheader") + %h4.p-4.text-xl= card.option("subheader") + %p.m-10= card.text diff --git a/config/styles.yaml b/config/styles.yaml index e107ab6..fa994b5 100644 --- a/config/styles.yaml +++ b/config/styles.yaml @@ -85,6 +85,19 @@ cards: - background - color - align +- template: card_gap_square + header: Narrow card with up down section + text: Smaller image, large margins, possible subheader + Order turns it upside down, image bottom + fields: + - header + - text + options: + - background + - color + - order + - align + - subheader - template: card_normal_square header: Standard card with square image text: Image, header, text, normal stuff