From 65369014c677423fae7598ba258a4e9904c98297 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Sun, 4 Dec 2022 18:37:43 +0200
Subject: [PATCH] checkpoint for template style changes

---
 Gemfile.lock   |  7 +++++--
 cms/index.yaml | 13 +++++++------
 merged         |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70d58ad..f154eef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,9 +2,9 @@ PATH
   remote: merged
   specs:
     merged (0.1.0)
+      git
       haml-rails
       rails (>= 7.0.4)
-      rugged
 
 GEM
   remote: https://rubygems.org/
@@ -97,6 +97,9 @@ GEM
       reline (>= 0.3.1)
     erubi (1.11.0)
     ffi (1.15.5)
+    git (1.12.0)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
     globalid (1.0.0)
       activesupport (>= 5.0)
     haml (6.0.12)
@@ -176,12 +179,12 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rake (13.0.6)
+    rchardet (1.8.0)
     regexp_parser (2.6.1)
     reline (0.3.1)
       io-console (~> 0.5)
     rexml (3.2.5)
     rubyzip (2.3.2)
-    rugged (1.5.0.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
diff --git a/cms/index.yaml b/cms/index.yaml
index ced7928..8c8c47d 100644
--- a/cms/index.yaml
+++ b/cms/index.yaml
@@ -1,13 +1,15 @@
 ---
-- template: section_full_left2
+- template: section_full_left
   header: HUB FEENIX
   text: Only an hour west of Helsinki, the Feenix rises from an old sanatorium. The
     Hub is a place to create, learn and regenerate.
   image: house
   id: e134b2680319aa90c968
+  options:
+    "-fixed": true
 - template: section_spacer
   id: 79001495919c68bfba31
-- template: section_half_right
+- template: section_half_image
   header: Retreats
   text: Hub Feenix is a beautiful place, ideally situated in the country, but close
     to Helsinki. We have different sized studios and spaces, to organise retreats
@@ -17,17 +19,16 @@
     button_link: retreats
   image: retreats
   id: 6bec75e2fddc9bfa4436
-- template: section_half_left
+- template: section_half_image
   header: Studios
   text: We offer different size and different type of studios for artists. There are
     large and small rooms, with more or less light, also rooms with tiles for wetwork,
     small dance studios etc.
   options:
-    button_text: Studios
-    button_link: studios
+    order: left
   image: studios
   id: c23a6a50094d6a398a0b
-- template: section_half_right
+- template: section_half_image
   header: Makerspace
   text: The hub encourages all people to be creative in any way they choose. We provide
     facilities from more traditional sowing and woodworking, to modern 3d printers
diff --git a/merged b/merged
index d7f5554..d30ce30 160000
--- a/merged
+++ b/merged
@@ -1 +1 @@
-Subproject commit d7f55540b3e9a8bf1def448b512af45f64245b98
+Subproject commit d30ce303705fd5dc099f4ba26544d3b84df972df