From 0ce1452fe3748d606892c24034803909189dfdca Mon Sep 17 00:00:00 2001 From: Torsten Date: Thu, 19 Jan 2023 00:12:44 +0200 Subject: [PATCH] update color to text_color --- Gemfile | 6 +++--- Gemfile.lock | 21 ++++++++++----------- merged/cards.yml | 10 +++++----- merged/sections.yml | 31 ++++++++++++++++--------------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index e798e91..c63c6b2 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,9 @@ source "https://rubygems.org" ruby "3.1.3" +#gem "merged" , git: "https://github.com/HubFeenixMakers/merged" +gem "merged" , path: "../merged" + gem "rails", "~> 7.0" gem "sprockets-rails" @@ -23,9 +26,6 @@ gem "simple_form" , "5.1.0" gem "simple_form_tailwind_css" gem 'kaminari' -gem "merged" , git: "https://github.com/HubFeenixMakers/merged" -#gem "merged" , path: "../merged" - gem "passenger" , "6.0.15" , require: "phusion_passenger/rack_handler" gem "bootsnap", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 19f0927..b825c53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,14 @@ GIT - remote: https://github.com/HubFeenixMakers/merged - revision: 22426c4bdf8a62c989ecc02a5adda8ed204cebb6 + remote: https://github.com/ruby2js/ruby2js/ + revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d + branch: haml_fix + specs: + ruby2js (5.0.1) + parser + regexp_parser (~> 2.1.1) + +PATH + remote: ../merged specs: merged (0.1.0) active_hash @@ -11,15 +19,6 @@ GIT redcarpet ruby2js (~> 5.0, >= 5.0.1) -GIT - remote: https://github.com/ruby2js/ruby2js/ - revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d - branch: haml_fix - specs: - ruby2js (5.0.1) - parser - regexp_parser (~> 2.1.1) - GEM remote: https://rubygems.org/ specs: diff --git a/merged/cards.yml b/merged/cards.yml index 3733c9d..e3fe7a4 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -5,7 +5,7 @@ :text: "\r\n\r\n\r\n\r\n\r\n" :options: background: light_blue - color: solid_black + text_color: solid_black text_align: center button_link: "/transportation" button_text: Transportation @@ -19,7 +19,7 @@ :text: "beans\r\ntofu\r\nbeans\r\ntofu\r\nbeans\r\ntofu\r\nbeans\r\ntofu\r\nbeans\r\ntofu\r\n" :options: background: solid_blue - color: solid_blue + text_color: solid_blue text_align: center button_link: '' button_text: '' @@ -33,7 +33,7 @@ :text: "washing machine\r\nshower\r\ncommon kitchen\r\nbathrooms" :options: background: solid_indigo - color: solid_black + text_color: solid_black text_align: center button_link: '' button_text: '' @@ -47,7 +47,7 @@ :text: "music room \r\nsauna\r\ncomputer room\r\ngym\r\n" :options: background: solid_blue - color: solid_blue + text_color: solid_blue text_align: center button_link: '' button_text: '' @@ -61,7 +61,7 @@ :text: "clothing room\r\nwork clothes\r\nfunny hats\r\nlarge socks\r\n" :options: background: light_blue - color: solid_black + text_color: solid_black text_align: center button_link: '' button_text: '' diff --git a/merged/sections.yml b/merged/sections.yml index d5cfec3..a9fcede 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -8,7 +8,7 @@ check later, or follow us on facebook." :options: fixed: 'off' - color: white + text_color: white text_align: left shade_color: solid_blue_25 item_align: left @@ -32,7 +32,7 @@ residencies, and other gatherings." :options: background: light_orange - color: solid_blue + text_color: solid_blue margin: '0' subheader: '' button_link: '' @@ -50,7 +50,7 @@ :image_name: map_wide :options: fixed: 'on' - color: black + text_color: black text_align: left shade_color: none item_align: left @@ -69,7 +69,7 @@ :options: fixed: 'on' shade_color: black_25 - color: white + text_color: white text_align: center item_align: left image_align: center @@ -88,18 +88,19 @@ - :template: section_full_up :index: 5 :page_id: 7 - :updated_at: 2023-01-14 19:34:21.430524728 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-01-18 23:53:07.932318628 +02:00 + :updated_by: torsten@villataika.fi :id: 42 :options: - background: white - color: none - margin: '0' + background: light_blue + text_color: none + margin: '20' subheader: About the Hub and living here - text_align: left + text_align: center item_align: center button_link: '' button_text: '' + columns: '3' :header: Info :text: "Hub Feenix is a non-profit centre for creativity and wellbeing, \r\nrun by Co-operative Hub Feenix.\r\nOur values are love of life, fairness, continuous @@ -190,7 +191,7 @@ :id: 43 :options: background: white - color: none + text_color: none margin: '0' subheader: '' text_align: center @@ -210,7 +211,7 @@ background: light_orange columns: '5' subheader: '' - color: solid_blue + text_color: solid_blue text_align: left :header: Accomodation :text: '' @@ -224,7 +225,7 @@ subheader: '' margin: '20' order: left - color: solid_black + text_color: solid_black background: light_blue button_link: '' button_text: '' @@ -251,7 +252,7 @@ :options: order: left background: light_orange - color: none + text_color: none text_align: center subheader: '' button_link: '' @@ -269,7 +270,7 @@ :options: order: left background: light_blue - color: none + text_color: none subheader: '' text_align: left button_link: ''