diff --git a/app/assets/stylesheets/merged/merged.css b/app/assets/stylesheets/merged/merged.css index 2fa0b3b..032d1e9 100644 --- a/app/assets/stylesheets/merged/merged.css +++ b/app/assets/stylesheets/merged/merged.css @@ -1392,8 +1392,8 @@ select { margin: 0px; } -.m-20 { - margin: 5rem; +.m-2 { + margin: 0.5rem; } .m-5 { @@ -1404,6 +1404,10 @@ select { margin: 2rem; } +.m-20 { + margin: 5rem; +} + .m-10 { margin: 2.5rem; } @@ -1412,10 +1416,6 @@ select { margin: 0.75rem; } -.m-2 { - margin: 0.5rem; -} - .m-12 { margin: 3rem; } @@ -2142,6 +2142,11 @@ select { background-color: rgb(127 29 29 / var(--tw-bg-opacity)); } +.bg-cyan-200 { + --tw-bg-opacity: 1; + background-color: rgb(165 243 252 / var(--tw-bg-opacity)); +} + .bg-white { --tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity)); @@ -2216,11 +2221,6 @@ select { background-color: rgb(154 52 18 / 0.25); } -.bg-cyan-200 { - --tw-bg-opacity: 1; - background-color: rgb(165 243 252 / var(--tw-bg-opacity)); -} - .bg-red-50 { --tw-bg-opacity: 1; background-color: rgb(254 242 242 / var(--tw-bg-opacity)); @@ -2889,20 +2889,20 @@ select { } @media (min-width: 768px) { - .md\:m-12 { - margin: 3rem; - } - - .md\:m-20 { - margin: 5rem; + .md\:m-4 { + margin: 1rem; } .md\:m-8 { margin: 2rem; } - .md\:m-4 { - margin: 1rem; + .md\:m-12 { + margin: 3rem; + } + + .md\:m-20 { + margin: 5rem; } .md\:my-10 { diff --git a/app/helpers/merged/options_helper.rb b/app/helpers/merged/options_helper.rb index bfc3b79..4be9c21 100644 --- a/app/helpers/merged/options_helper.rb +++ b/app/helpers/merged/options_helper.rb @@ -93,7 +93,7 @@ module Merged {class: clazz } end - def text_column_option( section , clazz = "") + def text_columns_option( section , clazz = "") if section.has_option?("text_columns") clazz += " " + (Merged.text_columns[section.option("text_columns")] || "") end diff --git a/app/views/merged/view/_blog_header.haml b/app/views/merged/view/_blog_header.haml index e31d143..7ade6ce 100644 --- a/app/views/merged/view/_blog_header.haml +++ b/app/views/merged/view/_blog_header.haml @@ -8,6 +8,6 @@ = section.header .font-bold.text-center.mb-4.lg:mb-8 = date_precision(section.page , "published_date") - .max-w-full.mt-4.gap-16{ options(section , :text_column , :prose ) } + .max-w-full.mt-4.gap-16{ options(section , :text_columns , :prose ) } = markdown(section) = header_list diff --git a/app/views/merged/view/_section_text.haml b/app/views/merged/view/_section_text.haml index 1f77b3c..21897b0 100644 --- a/app/views/merged/view/_section_text.haml +++ b/app/views/merged/view/_section_text.haml @@ -8,7 +8,7 @@ .text-xl.pb-6{ prose_classes } = section.option("subheader") - .max-w-full.mt-4.gap-16{ options(section , :text_column , :prose ) } + .max-w-full.mt-4.gap-16{ options(section , :text_columns , :prose ) } = markdown_image(section) - if section.has_option?("button_text") and section.has_option?("button_link") %span.block.transition.group-hover:translate-x-1