diff --git a/app/assets/images/merged/58.jpg b/app/assets/images/merged/58.jpg deleted file mode 100644 index 7ff0472..0000000 Binary files a/app/assets/images/merged/58.jpg and /dev/null differ diff --git a/app/assets/images/merged/61.jpg b/app/assets/images/merged/61.jpg deleted file mode 100644 index bea410e..0000000 Binary files a/app/assets/images/merged/61.jpg and /dev/null differ diff --git a/app/assets/images/merged/62.jpg b/app/assets/images/merged/62.jpg deleted file mode 100644 index 9ecf88d..0000000 Binary files a/app/assets/images/merged/62.jpg and /dev/null differ diff --git a/app/assets/images/merged/64.jpg b/app/assets/images/merged/64.jpg new file mode 100644 index 0000000..5abd0cc Binary files /dev/null and b/app/assets/images/merged/64.jpg differ diff --git a/merged/cards.yml b/merged/cards.yml index 7d9b491..684d957 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -214,10 +214,10 @@ subheader: 30 - 60 text_color: none :image_name: mandala_room - :updated_at: 2023-03-21 18:31:45.724204342 +02:00 + :updated_at: 2023-03-23 20:01:19.576975862 +02:00 :section_id: 15 :index: 2 - :image_id: 58 + :image_id: 64 :updated_by: maijanposteja@gmail.com - :id: 20 :header: Sky Conference diff --git a/merged/images.yml b/merged/images.yml index 421e505..d2945ce 100644 --- a/merged/images.yml +++ b/merged/images.yml @@ -463,15 +463,6 @@ :id: 56 :updated_at: 2023-03-21 18:22:03.824004899 +02:00 :updated_by: maijanposteja@gmail.com -- :name: hubfeenix_MiaJärvisalo-23-vaal_copy - :type: jpg - :tags: '' - :width: 792 - :height: 529 - :size: 115 - :id: 58 - :updated_at: 2023-03-21 18:30:34.648083752 +02:00 - :updated_by: maijanposteja@gmail.com - :name: hubfeenix_MiaJärvisalo-30 :type: jpg :tags: '' @@ -490,24 +481,6 @@ :id: 60 :updated_at: 2023-03-22 15:44:42.284530559 +02:00 :updated_by: maijanposteja@gmail.com -- :name: ladies riding - :type: jpg - :tags: '' - :width: 982 - :height: 737 - :size: 463 - :id: 61 - :updated_at: 2023-03-22 16:00:59.594863050 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: Ride in a forest - :type: jpg - :tags: '' - :width: 999 - :height: 687 - :size: 499 - :id: 62 - :updated_at: 2023-03-22 16:42:42.395158496 +02:00 - :updated_by: maijanposteja@gmail.com - :name: Ride in a forest edited :type: jpg :tags: '' @@ -517,3 +490,12 @@ :id: 63 :updated_at: 2023-03-22 22:03:56.643472331 +02:00 :updated_by: maijanposteja@gmail.com +- :name: Mandala edited + :type: jpg + :tags: '' + :width: 995 + :height: 551 + :size: 152 + :id: 64 + :updated_at: 2023-03-23 20:01:42.626360287 +02:00 + :updated_by: maijanposteja@gmail.com diff --git a/merged/sections.yml b/merged/sections.yml index 6fd5b10..e88705d 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -317,7 +317,8 @@ :id: 17 :image_name: suites_wide :header: Suites - :text: Suites are single occupancy and have en-suite toilet and shower. + :text: 'Suites come with a double bed or two separate beds, some fit even an extra + third bed. They have their own shower and toilet. ' :options: fixed: 'off' shade_color: solid_blue_25 @@ -325,16 +326,17 @@ text_align: left item_align: left image_align: center - :updated_at: 2023-01-04 19:52:33.506057908 +02:00 + :updated_at: 2023-03-23 21:24:16.518010281 +02:00 :page_id: 3 :index: 4 :image_id: 37 :updated_by: maijanposteja@gmail.com - :template: section_full_image :id: 18 - :header: Shared room - :text: "Shared rooms have double occupancy but their own bathroom with toilet and - shower.\r\n" + :header: Basic rooms + :text: Basic rooms have either two or four beds and shared facilities. Rooms with + two beds will often share the bathroom with another room. Some rooms have shared + facilities on the corridor. :image_name: shared_wide :options: fixed: 'off' @@ -343,30 +345,11 @@ shade_color: solid_red_25 item_align: right image_align: center - :updated_at: 2023-01-01 15:14:50.259757003 +02:00 + :updated_at: 2023-03-23 21:18:57.488262533 +02:00 :page_id: 3 :index: 5 :image_id: 30 - :updated_by: torsten@villataika.fi -- :template: section_full_image - :id: 19 - :header: Common room - :text: Common rooms have either two or four beds and shared facilities. Rooms with - two beds will often share the bathroom with another room. Some rooms have shared - facilities on the corridor. - :image_name: common_wide - :options: - fixed: 'off' - text_color: white - text_align: center - shade_color: black_25 - item_align: center - image_align: center - :updated_at: 2023-01-01 15:15:03.353671959 +02:00 - :page_id: 3 - :index: 6 - :image_id: 6 - :updated_by: torsten@villataika.fi + :updated_by: maijanposteja@gmail.com - :template: section_full_up :id: 20 :header: Common services for retreats @@ -382,7 +365,7 @@ item_align: center :updated_at: 2023-01-04 19:47:16.145420982 +02:00 :page_id: 3 - :index: 7 + :index: 6 :image_id: :updated_by: maijanposteja@gmail.com - :template: section_large_image @@ -398,7 +381,7 @@ picture, terraces and the cafe make a relaxed atmosphere. :updated_at: &2 2022-12-09 17:32:41.538163009 +02:00 :page_id: 3 - :index: 8 + :index: 7 :image_id: 5 - :template: section_large_image :id: 22 @@ -414,7 +397,7 @@ order: right :updated_at: *2 :page_id: 3 - :index: 9 + :index: 8 :image_id: 15 - :template: section_large_image :id: 23 @@ -428,7 +411,7 @@ background: light_orange :updated_at: *2 :page_id: 3 - :index: 10 + :index: 9 :image_id: 24 - :template: form_section :id: 24 @@ -443,7 +426,7 @@ text_color: solid_blue :updated_at: *2 :page_id: 3 - :index: 11 + :index: 10 :image_id: - :template: section_half_image :id: 25