diff --git a/merged/cards.yml b/merged/cards.yml index 0c05533..026bc25 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -386,7 +386,7 @@ :index: 3 :header: Winter :text: "Winter is a long and dark, but also clear and beautiful.\r\nX-mas is darkest, - but even February is coldest, it gets light again" + but even though February is coldest, it starts to get light again!" :options: background: solid_blue text_color: white @@ -395,14 +395,14 @@ order: right button_link: '' button_text: '' - :updated_at: 2023-01-25 00:53:43.013237916 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-04-08 20:48:51.442959931 +03:00 + :updated_by: hannaholma@gmail.com :id: 29 :image_id: 36 - :section_id: 20 :index: 2 :header: Autumn - :text: We make the most out of the autmn, enjoying the memory of warm, before it + :text: We make the most out of the autumn, enjoying the memory of warm, before it gets dark. :options: background: solid_red @@ -412,15 +412,15 @@ order: right button_link: '' button_text: '' - :updated_at: 2023-01-25 00:48:41.959065314 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-04-08 20:48:20.123243547 +03:00 + :updated_by: hannaholma@gmail.com :id: 30 :image_id: 37 - :section_id: 20 :index: 4 :header: Spring :text: By the time spring comes, we have forgotten the last summer and are glad - to see light and life again, so urgently coming forth + to see light and life again, so urgently coming forth. :options: background: light_blue text_color: black @@ -429,8 +429,8 @@ order: right button_link: '' button_text: '' - :updated_at: 2023-01-25 00:46:24.727773085 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-04-08 20:49:16.843218738 +03:00 + :updated_by: hannaholma@gmail.com :id: 31 :image_id: 38 - :section_id: 20 @@ -453,10 +453,10 @@ - :section_id: 21 :index: 2 :header: Winter - :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." + :text: "Usually there is varying amounts of snow from the 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." :options: background: none text_color: none @@ -465,15 +465,15 @@ subheader: '' button_link: "/in_winter" button_text: Winter - :updated_at: 2023-01-24 23:11:23.962046547 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-04-08 20:53:55.823253167 +03:00 + :updated_by: hannaholma@gmail.com :id: 33 :image_id: 40 - :section_id: 21 :index: 1 :header: Summer - :text: "Everybodu off course enjoys the summer, none more than the Fins (after a - long winter)\r\nFinish summer is never too hot, just around 25. Still the lakes + :text: "Everybody of course enjoys the summer, none more than the Finns (after a + long winter).\r\nFinnish summer is never too hot, just around 25. Still the lakes heat up and swimming in the near by lake is a daily activity. " :options: background: none @@ -483,8 +483,8 @@ subheader: '' button_link: "/in_summer" button_text: Summer - :updated_at: 2023-01-25 00:56:33.466535830 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-04-08 20:50:40.281635229 +03:00 + :updated_by: hannaholma@gmail.com :id: 34 :image_id: 41 - :section_id: 7 diff --git a/merged/sections.yml b/merged/sections.yml index b422d29..91f95da 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -387,8 +387,8 @@ - :template: section_cards :index: 1 :page_id: 7 - :updated_at: 2023-01-25 00:12:12.444766597 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-04-08 20:47:39.503698549 +03:00 + :updated_by: hannaholma@gmail.com :id: 20 :card_template: card_normal_square :options: @@ -399,17 +399,17 @@ text_align: center :header: Finland's 4 seasons :text: "Finland has four seasons, or in other words a **real** winter.\r\n\r\nSummer - is easy, beautiful, especially after the long winter. Autumn gentle even sometimes - a little too fast. Winter is a long and dark, but also clear and beautiful.\r\nBy + is easy, beautiful, especially after the long winter. \r\nAutumn gentle even sometimes + a little too fast. \r\nWinter is a long and dark, but also clear and beautiful.\r\n\r\nBy the time spring comes, we have forgotten the last summer and are glad to see light - and life again, so urgently coming forth.And then it starts again\r\nEach season - it quite it's own and beatiful, and here we want to introduce a little what that - means.\r\n" + and life again, so urgently coming forth. \r\nAnd then it starts again.\r\n\r\nEach + season it quite it's own and beatiful, and here we want to introduce a little + what that means.\r\n" - :template: section_cards :index: 2 :page_id: 7 - :updated_at: 2023-01-25 01:14:46.130313604 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-04-08 20:50:02.997922260 +03:00 + :updated_by: hannaholma@gmail.com :id: 21 :card_template: card_wide_square :options: @@ -419,7 +419,7 @@ text_color: none text_align: center :header: Summer and winter - :text: we've dedicated a page for the main seasons, you can fill in the dots between + :text: We've dedicated a page for the main seasons, you can fill in the dots between. :image_id: - :template: section_half_image :index: 9