Merge branch 'staging'

merged/cards.yml

@@ -230,10 +230,14 @@
     text_align: center
     color: none
     subheader: 35 - 80
-  :updated_at: *3
+    order: left
+    button_link: SkyConference
+    button_text: skyconference
+  :updated_at: 2023-01-14 15:02:58.515834158 +02:00
   :section_id: 15
   :index: 3
   :image_id: 34
+  :updated_by: maijanposteja@gmail.com
 - :id: 21
   :header: Lootus room
   :text: "Downstairs, next to the café, the spacious lotus room is especially good
@@ -555,3 +559,101 @@
   :updated_by: maijanposteja@gmail.com
   :id: 48
   :image_id: 45
+- :section_id: 48
+  :index: 1
+  :header: Room Rental
+  :text: Whole room rental is 500e per day. Go for lunch elsewhere (eg Mustio Castle)
+    or use our Cafe in the ground floor.
+  :options:
+    background: light_orange
+    color: none
+    order: left
+    text_align: center
+    subheader: ''
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-15 14:14:38.668995960 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 49
+  :image_id: 47
+- :section_id: 48
+  :index: 2
+  :header: With coffee
+  :text: "4h rental with coffee and pastry for 35e per person. \r\nMinimum 25 people.
+    Vegan options"
+  :options:
+    background: light_orange
+    color: none
+    order: left
+    text_align: center
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-15 14:14:48.933291558 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 50
+  :image_id: 46
+- :section_id: 48
+  :index: 3
+  :header: With food
+  :text: "Whole day rental with lunch and afternoon coffee is 50€. \r\nAlso minimum
+    25 people. \r\nDelicious vegetarian food with vegan options."
+  :options:
+    background: light_orange
+    color: none
+    order: left
+    text_align: center
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-15 14:14:59.906260976 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 51
+  :image_id: 48
+- :section_id: 49
+  :index: 1
+  :header: Facilities
+  :text: "- Large Video screen\r\n- Blackout curtains\r\n- Good audio\r\n- Good acoustics\r\n-
+    Great Views (5th floor), balcony\r\n- Lounge area\r\n- Breakout rooms\r\n- Coffee/food
+    available, no own"
+  :options:
+    background: light_orange
+    color: none
+    text_align: center
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-15 14:16:37.836362306 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 52
+  :image_id: 50
+- :section_id: 49
+  :index: 2
+  :header: Extras
+  :text: "Accommodation packages for multi day events are available. We have different
+    price and comfort levels, see here.\r\n\r\n​Upon request we can also arrange for
+    extra program eg.\r\n\r\n- Yoga\r\n- Relaxing free dance\r\n- Different Massage
+    and Treatments\r\n- Horse Riding"
+  :options:
+    background: light_orange
+    color: none
+    text_align: center
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-15 14:16:48.645395891 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 53
+  :image_id: 52
+- :section_id: 49
+  :index: 3
+  :header: Book
+  :text: "Just send us your info, either by email or the form and we can start to
+    customize your package.\r\n\r\nAlso if you just want to inquire about the options,
+    send us a mail."
+  :options:
+    background: light_orange
+    color: black
+    text_align: center
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-15 14:16:55.676568791 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 54
+  :image_id: 53

merged/images.yml

@@ -354,3 +354,57 @@
   :size: 14
   :updated_at: 2023-01-04 18:15:49.797854998 +02:00
   :updated_by: maijanposteja@gmail.com
+- :name: coffee-cup
+  :type: png
+  :tags: ''
+  :id: 46
+  :width: 247
+  :height: 247
+  :size: 6
+  :updated_at: 2023-01-14 15:13:08.039479490 +02:00
+  :updated_by: maijanposteja@gmail.com
+- :name: house icon 1
+  :type: png
+  :tags: ''
+  :id: 47
+  :width: 450
+  :height: 423
+  :size: 13
+  :updated_at: 2023-01-14 16:01:33.073509683 +02:00
+  :updated_by: maijanposteja@gmail.com
+- :name: food plate icon 1
+  :type: png
+  :tags: ''
+  :id: 48
+  :width: 256
+  :height: 256
+  :size: 15
+  :updated_at: 2023-01-14 16:11:20.367901818 +02:00
+  :updated_by: maijanposteja@gmail.com
+- :name: screen icon 1
+  :type: png
+  :tags: ''
+  :id: 50
+  :width: 256
+  :height: 256
+  :size: 2
+  :updated_at: 2023-01-14 16:35:31.261144227 +02:00
+  :updated_by: maijanposteja@gmail.com
+- :name: lootus icon 2
+  :type: png
+  :tags: ''
+  :id: 52
+  :width: 512
+  :height: 512
+  :size: 29
+  :updated_at: 2023-01-15 14:01:27.969181970 +02:00
+  :updated_by: maijanposteja@gmail.com
+- :name: kalenteri icon
+  :type: png
+  :tags: ''
+  :id: 53
+  :width: 512
+  :height: 512
+  :size: 22
+  :updated_at: 2023-01-15 14:05:46.255612352 +02:00
+  :updated_by: maijanposteja@gmail.com

merged/pages.yml

@@ -31,3 +31,8 @@
   :type: page
   :updated_by: maijanposteja@gmail.com
   :id: 7
+- :name: thehall
+  :updated_at: 2023-01-14 13:42:20.827958862 +02:00
+  :type: page
+  :updated_by: maijanposteja@gmail.com
+  :id: 8

merged/sections.yml

@@ -259,22 +259,23 @@
   :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
-    for groups from 10, up to 100 people.\r\n"
+    for groups from 10, up to 100 people.\r\n\r\nDifferent levels of accommodation,
+    our cafe, great vegetarian food and beautiful nature make your stay enjoyable
+    also outside the course program."
   :options:
     button_link: ''
     button_text: ''
     order: left
     background: white
     subheader: Come to learn, enjoy your stay
-    text: " Different levels of accommodation and our cafe and great vegan food make
-      your stay enjoyable also outside the course program."
     text_align: center
     color: solid_blue
   :image_name: retreats
-  :updated_at: &2 2022-12-09 17:32:41.538163009 +02:00
+  :updated_at: 2023-01-14 13:19:27.302295214 +02:00
   :page_id: 3
   :index: 1
   :image_id: 28
+  :updated_by: maijanposteja@gmail.com
 - :template: section_cards
   :id: 15
   :card_template: card_normal_square
@@ -395,7 +396,7 @@
   :header: Common spaces
   :text: Enjoy the free time in between learning. Several common spaces, like in the
     picture, terraces and the cafe make a relaxed atmosphere.
-  :updated_at: *2
+  :updated_at: &2 2022-12-09 17:32:41.538163009 +02:00
   :page_id: 3
   :index: 8
   :image_id: 6
@@ -559,8 +560,8 @@
   :updated_by: torsten@villataika.fi
 - :template: section_full_image
   :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.
+  :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_name: house
   :id: 31
   :options:
@@ -570,11 +571,11 @@
     text_align: center
     item_align: left
     image_align: center
-  :updated_at: 2023-01-01 14:25:22.424062699 +02:00
+  :updated_at: 2023-01-14 14:34:15.639002781 +02:00
   :page_id: 6
   :index: 1
   :image_id: 17
-  :updated_by: torsten@villataika.fi
+  :updated_by: maijanposteja@gmail.com
 - :template: section_spacer
   :id: 32
   :updated_at: &4 2022-12-10 20:28:17.967357225 +02:00
@@ -749,7 +750,7 @@
 - :template: section_full_image
   :index: 1
   :page_id: 7
-  :updated_at: 2023-01-04 18:36:36.420348213 +02:00
+  :updated_at: 2023-01-15 14:12:24.160141007 +02:00
   :updated_by: maijanposteja@gmail.com
   :id: 44
   :options:
@@ -758,11 +759,11 @@
     text_align: center
     item_align: center
     image_align: center
-    shade_color: none
+    shade_color: solid_red_25
   :image_id: 43
   :header: Sky Conference
-  :text: "# Subheader\r\n\r\nHalf or full day, with or \r\nwithout food, see packages
-    below\r\n\r\n"
+  :text: "### Meet in a beautiful room, with great views\r\n\r\n\r\n\r\nHalf or full
+    day, with or \r\nwithout food, see packages below\r\n\r\n"
 - :template: section_cards
   :index: 3
   :page_id: 7
@@ -774,9 +775,42 @@
     item_align: center
     image_align: center
     shade_color: none
-    background: light_blue
+    background: light_gray
     columns: '2'
-  :updated_at: 2023-01-04 20:08:40.028774121 +02:00
+    subheader: ''
+  :updated_at: 2023-01-15 14:19:12.616775002 +02:00
   :updated_by: maijanposteja@gmail.com
   :id: 46
   :card_template: card_wide_square
+- :template: section_feature
+  :index: 1
+  :page_id: 8
+  :updated_at: 2023-01-14 13:43:55.311505751 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 47
+  :card_template: card_full_image
+  :options: {}
+- :template: section_cards
+  :index: 3
+  :page_id: 7
+  :updated_at: 2023-01-14 15:51:19.931570535 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 48
+  :card_template: card_feature_box
+  :options:
+    background: white
+    columns: '4'
+    subheader: ''
+    color: none
+    text_align: left
+  :image_id: 0
+  :header: Packages
+  :text: ''
+- :template: section_cards
+  :index: 4
+  :page_id: 7
+  :updated_at: 2023-01-14 16:27:37.174648506 +02:00
+  :updated_by: maijanposteja@gmail.com
+  :id: 49
+  :card_template: card_feature_box
+  :options: {}