From fd302f59014a1e2087ea3cc0f55caca5f1c2bfd6 Mon Sep 17 00:00:00 2001 From: Torsten Date: Thu, 5 Jan 2023 17:04:05 +0200 Subject: [PATCH] small step on features --- ...card_feature.png => card_feature_normal.png} | Bin .../merged/card_preview/card_feature_small.png | Bin 0 -> 30120 bytes .../merged/view/cards/_card_feature_normal.haml | 8 ++++++++ config/merged/card_styles.yml | 14 ++++++++++++++ config/merged/option_definitions.yml | 2 +- test/integration/cards_test.rb | 3 ++- test/models/card_style_test.rb | 2 +- 7 files changed, 26 insertions(+), 3 deletions(-) rename app/assets/images/merged/card_preview/{card_feature.png => card_feature_normal.png} (100%) create mode 100644 app/assets/images/merged/card_preview/card_feature_small.png create mode 100644 app/views/merged/view/cards/_card_feature_normal.haml diff --git a/app/assets/images/merged/card_preview/card_feature.png b/app/assets/images/merged/card_preview/card_feature_normal.png similarity index 100% rename from app/assets/images/merged/card_preview/card_feature.png rename to app/assets/images/merged/card_preview/card_feature_normal.png diff --git a/app/assets/images/merged/card_preview/card_feature_small.png b/app/assets/images/merged/card_preview/card_feature_small.png new file mode 100644 index 0000000000000000000000000000000000000000..013df0e2402d31a2844623a9de7c208d07426e4b GIT binary patch literal 30120 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 XKIBkY%Y@&edP7!HNupfLDDeLQ>i$o$ literal 0 HcmV?d00001 diff --git a/app/views/merged/view/cards/_card_feature_normal.haml b/app/views/merged/view/cards/_card_feature_normal.haml new file mode 100644 index 0000000..bbba85f --- /dev/null +++ b/app/views/merged/view/cards/_card_feature_normal.haml @@ -0,0 +1,8 @@ +.max-w-md.sm:mx-auto.sm:text-center + .flex.items-center.justify-center.mb-4.rounded-full.mx-auto.w-40.h-40{options(card,:background )} + = image_for( card , "h-20 w-20") + %h6.mb-3.text-xl.font-bold.leading-5{options(card, :color)}= card.header + .mb-3.text-sm.text-gray-900{ prose_classes } + = markdown(card) + - if card.has_option?("button_link") + %a.inline-flex.items-center.font-semibold.transition-colors.duration-200.text-deep-purple-accent-400.hover:text-deep-purple-800{"aria-label" => "", :href => "/"} Learn more diff --git a/config/merged/card_styles.yml b/config/merged/card_styles.yml index 017013c..8cd4361 100644 --- a/config/merged/card_styles.yml +++ b/config/merged/card_styles.yml @@ -63,6 +63,20 @@ - text_align - button_link - button_text +- template: card_feature_small + header: Card looking feature, smaller version + text: For things where no image is available or apropriate. + Making lists a little more interesting to look at. + May use svg as image. + fields: + - header + - text + options: + - background + - color + - text_align + - button_link + - button_text - template: card_normal_round header: Standard card with rounded look text: Otherwise quite similar to standard. But there is gap under the image. diff --git a/config/merged/option_definitions.yml b/config/merged/option_definitions.yml index f3c6c69..565d3d5 100644 --- a/config/merged/option_definitions.yml +++ b/config/merged/option_definitions.yml @@ -6,7 +6,7 @@ :id: 1 - :name: columns :description: Number of columns in a layout that supports cards - :values: 2 3 4 + :values: 2 3 4 5 6 :default: 3 :id: 2 - :name: background diff --git a/test/integration/cards_test.rb b/test/integration/cards_test.rb index b775411..7c58d06 100644 --- a/test/integration/cards_test.rb +++ b/test/integration/cards_test.rb @@ -37,7 +37,8 @@ class CardsTest < ActionDispatch::IntegrationTest end def test_remove_image_force - visit "merged/cards/6/set_image?image=''" + first = Merged::Card.first.id + visit "merged/cards/#{first}/set_image?image=''" assert_text page , "No image" end end diff --git a/test/models/card_style_test.rb b/test/models/card_style_test.rb index 35dca9a..2db1de8 100644 --- a/test/models/card_style_test.rb +++ b/test/models/card_style_test.rb @@ -7,7 +7,7 @@ module Merged end def test_has_all - assert_equal CardStyle.all.length , 6 + assert CardStyle.all.length > 5 end def test_has_fields