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

fix button and nil

Browse Source
This commit is contained in:
Hub Feenix Member 2023-01-14 14:45:31 +02:00
parent a8f5229935
commit 6344acec3c
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/merged/pages/index.haml
View File

@ -28,7 +28,7 @@
=page.updated_by =page.updated_by
- s = page.sections_update - s = page.sections_update
%td.whitespace-nowrap.px-4.py-2.text-gray-700 %td.whitespace-nowrap.px-4.py-2.text-gray-700
=distance_of_time_in_words_to_now(s.updated_at) if s =distance_of_time_in_words_to_now(s&.updated_at) if s
%td.whitespace-nowrap.px-4.py-2.text-gray-700 %td.whitespace-nowrap.px-4.py-2.text-gray-700
=s.updated_by if s =s.updated_by if s
%td.whitespace-nowrap.px-4.py-2 %td.whitespace-nowrap.px-4.py-2

14
app/views/merged/sections/index.haml
View File

@ -28,13 +28,13 @@
Updated by: Updated by:
= section.updated_by = section.updated_by
- if section.has_cards? - if section.has_cards?
- card = section.cards_update - if card = section.cards_update
.basis-full .basis-full
Cards updated at: Cards updated at:
= distance_of_time_in_words_to_now(card.updated_at) = distance_of_time_in_words_to_now(card.updated_at)
.basis-full.mb-3 .basis-full.mb-3
Cards updated by: Cards updated by:
= card.updated_by = card.updated_by
.basis-full.mb-3 .basis-full.mb-3
= form_tag( merged.section_path(section.id) , {method: :delete } ) do = form_tag( merged.section_path(section.id) , {method: :delete } ) do
=submit_button( "Delete" , true) =submit_button( "Delete" , true)

3
app/views/merged/view/cards/_card_feature_box.haml
View File

@ -11,4 +11,5 @@
%p.mb-2.text-sm.text-gray-900{ prose_classes } %p.mb-2.text-sm.text-gray-900{ prose_classes }
= markdown(card) = markdown(card)
- if card.has_option?("button_link") - if card.has_option?("button_link")
%a.inline-flex.items-center.text-sm.font-semibold.transition-colors.duration-200.text-deep-purple-accent-400.hover:text-deep-purple-800{"aria-label" => "", :href => "/"} Learn more %a.inline-flex.items-center.text-sm.font-semibold.transition-colors.duration-200.text-deep-purple-accent-400.hover:text-deep-purple-800{"aria-label" => "", :href => "/"}
=card.option("button_text")

3
app/views/merged/view/cards/_card_feature_normal.haml
View File

@ -5,4 +5,5 @@
.mb-3.text-sm.text-gray-900{ prose_classes } .mb-3.text-sm.text-gray-900{ prose_classes }
= markdown(card) = markdown(card)
- if card.has_option?("button_link") - 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 %a.inline-flex.items-center.font-semibold.transition-colors.duration-200.text-deep-purple-accent-400.hover:text-deep-purple-800{"aria-label" => "", :href => card.option("button_link") }
=card.option("button_text")

3
app/views/merged/view/cards/_card_normal_square.haml
View File

@ -6,3 +6,6 @@
-if card.has_option?("subheader") -if card.has_option?("subheader")
%h4.p-4.text-xl= card.option("subheader") %h4.p-4.text-xl= card.option("subheader")
.pose.mt-2.p-4= markdown(card) .pose.mt-2.p-4= 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 => card.option("button_link") }
=card.option("button_text")

2
config/merged/card_styles.yml
View File

@ -37,6 +37,8 @@
- text_align - text_align
- subheader - subheader
- order - order
- button_link
- button_text
- template: card_wide_square - template: card_wide_square
header: Sideway card with square image header: Sideway card with square image
text: Much like standard square card, just turned sideways. text: Much like standard square card, just turned sideways.