small fixed, merged update

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/HubFeenixMakers/merged
-  revision: 3a15e58ee38dae847ff877c261ce9856e00c74fb
+  revision: ee94e687f93cd317df6829e7ce2393b3451044b5
   specs:
     merged (0.1.0)
       active_hash
@@ -317,7 +317,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    redcarpet (3.5.1)
+    redcarpet (3.6.0)
     regexp_parser (2.1.1)
     reline (0.3.2)
       io-console (~> 0.5)

config/tailwind.config.js

@@ -2,7 +2,7 @@ const defaultTheme = require('tailwindcss/defaultTheme')
 
 const execSync = require('child_process').execSync;
 const output = execSync('bundle show merged', { encoding: 'utf-8' });
-const fullname = output.trim() + '/app/**/*.{haml,html,rb}' ;
+const fullname = output.trim() + '/**/*.{haml,html,rb}' ;
 
 const output2 = execSync('bundle show simple_form_tailwind_css', { encoding: 'utf-8' });
 const fullname2 = output2.trim() + '/lib/**/*.rb' ;

merged/cards.yml

@@ -516,7 +516,7 @@
   :text: "Usually there is varying amounts of snow from beginning of November to the
     end of march. Sometimes it melts, often not.\r\nWe only call it cold when it gets
     below minus 15 (and it does!). And it get **dark** , which we see as the opposite
-    of the light in summer.\r\nVery rarely we see a Boreals."
+    of the light in summer.\r\nVery rarely we see a Borealis."
   :options:
     background: none
     text_color: none
@@ -525,7 +525,7 @@
     subheader: ''
     button_link: "/in_winter"
     button_text: Winter
-  :updated_at: 2023-01-24 23:11:23.962046547 +02:00
+  :updated_at: 2023-01-29 16:20:49.967480056 +02:00
   :updated_by: torsten@villataika.fi
   :id: 45
   :image_id: 127

merged/sections.yml

@@ -69,15 +69,17 @@
   :options:
     fixed: 'on'
     shade_color: black_25
-    text_color: white
+    text_color: light_blue
     text_align: center
     item_align: left
     image_align: center
-  :updated_at: 2023-01-14 20:07:27.482852523 +02:00
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-29 13:03:27.023980367 +02:00
   :page_id: 6
   :index: 1
   :image_id: 47
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
 - :template: section_large_image
   :index: 4
   :page_id: 5
@@ -391,11 +393,19 @@
 - :template: section_large_image
   :index: 3
   :page_id: 8
-  :updated_at: 2023-01-23 23:32:17.915968380 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_at: 2023-01-29 16:34:52.753804263 +02:00
+  :updated_by: torsten@villataika.fi
   :id: 64
   :card_template: ''
-  :options: {}
+  :options:
+    subheader: ''
+    margin: medium
+    order: left
+    text_color: solid_black
+    text_align: left
+    background: white
+    button_link: ''
+    button_text: ''
   :image_id: 113
   :header: What you should bring
   :text: "**Clothing** - it can get pretty cold during winter, so make sure to come
@@ -428,7 +438,7 @@
 - :template: section_cards
   :index: 2
   :page_id: 13
-  :updated_at: 2023-01-25 01:14:46.130313604 +02:00
+  :updated_at: 2023-01-29 13:51:20.530440817 +02:00
   :updated_by: torsten@villataika.fi
   :id: 71
   :card_template: card_wide_square
@@ -510,6 +520,7 @@
   :updated_by: torsten@villataika.fi
   :id: 76
   :card_template: ''
+  :options: {}
 - :template: section_full_image
   :index: 1
   :page_id: 15