diff --git a/Guardfile b/Guardfile index 6a4d5c8..cc46eb2 100644 --- a/Guardfile +++ b/Guardfile @@ -1,5 +1,3 @@ - - guard :minitest , all_on_start: false do sys_tests = "test/integration" # with Minitest::Unit @@ -8,4 +6,7 @@ guard :minitest , all_on_start: false do watch(%r{^app/models/merged/([^/]+)\.rb$}) { |m| Dir["test/models/#{m[1]}*_test.rb"] } watch(%r{^app/views/merged/([^/]+)\/([^/]+)\.haml$}){ |m| Dir["test/integration/#{m[1]}_#{m[2]}_test.rb"] } watch(%r{^test/test_helper\.rb$}) { 'test' } + + notification :off + end diff --git a/app/controllers/merged/form_controller.rb b/app/controllers/merged/form_controller.rb index 8166827..e2fbb84 100644 --- a/app/controllers/merged/form_controller.rb +++ b/app/controllers/merged/form_controller.rb @@ -48,7 +48,7 @@ module Merged def check_maths key = params[:bot_fudder].to_i / 2 if( (2*key + 1).to_s != params[:challenge]) - @errors[:challenge] = "Check the maths #{key.to_i} #{params[:challenge]}" + @errors[:challenge] = "Check the maths #{params[:challenge]}" end end diff --git a/app/helpers/merged/options_helper.rb b/app/helpers/merged/options_helper.rb index 8429240..3b34fb7 100644 --- a/app/helpers/merged/options_helper.rb +++ b/app/helpers/merged/options_helper.rb @@ -93,10 +93,10 @@ module Merged "light_gray" => " bg-gray-100" , "light_orange" => " bg-orange-50" , "solid_blue" => " bg-cyan-700" , - "solid_red" => " bg-orange-800" , + "solid_red" => " bg-amber-600" , "solid_green" => " bg-green-700" , "solid_petrol" => " bg-teal-700" , - "solid_indigo" => " bg-indigo-800" , + "solid_indigo" => " bg-cyan-900" , "solid_black" => " bg-slate-900" , }[section.option('background')] || "" end diff --git a/app/views/merged/view/_section_full_image.haml b/app/views/merged/view/_section_full_image.haml index 92b466e..580b880 100644 --- a/app/views/merged/view/_section_full_image.haml +++ b/app/views/merged/view/_section_full_image.haml @@ -1,5 +1,5 @@ -%section.overflow-hidden.bg-cover.bg-center.bg-no-repeat{bg(section)} - .px-4.py-8.sm:px-6.lg:px-8 +%section.overflow-hidden.bg-cover.bg-center.bg-no-repeat{bg(section , "h-full")} + .px-4.py-24.sm:px-6.lg:px-8 .flex{ item_align_option( section)} .p-8.md:p-12.lg:px-16.lg:py-24{options(section , :shade )} .mx-auto.max-w-xl{ options(section , :color, :text_align)} diff --git a/test/dummy/merged/cards.yml b/test/dummy/merged/cards.yml index d7670bc..a10cb43 100644 --- a/test/dummy/merged/cards.yml +++ b/test/dummy/merged/cards.yml @@ -212,7 +212,7 @@ :image_id: - :id: 45 :header: Subject - :text: TEXT + :text: '' :options: compulsory: 'yes' form_type: text