own style definitions, rename image dir

2023-01-27 19:09:49 +02:00 · 2023-01-27 19:09:49 +02:00 · b2989c1940
parent 3231bb1bf3
commit b2989c1940
65 changed files with 14 additions and 1 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,6 +1,6 @@
 GIT
  remote: https://github.com/HubFeenixMakers/merged
-  revision: 924eb6317c815c88675e65d72b4da8253bee2aae
+  revision: df67ed16b51eabb562a22d25778078491d815ac6
  specs:
    merged (0.1.0)
      active_hash
--- a/app/assets/images/merged/100.jpg
+++ b/app/assets/images/merged/100.jpg
--- a/app/assets/images/merged/102.jpg
+++ b/app/assets/images/merged/102.jpg
--- a/app/assets/images/merged/103.jpg
+++ b/app/assets/images/merged/103.jpg
--- a/app/assets/images/merged/110.jpg
+++ b/app/assets/images/merged/110.jpg
--- a/app/assets/images/merged/112.png
+++ b/app/assets/images/merged/112.png
--- a/app/assets/images/merged/113.jpg
+++ b/app/assets/images/merged/113.jpg
--- a/app/assets/images/merged/114.jpg
+++ b/app/assets/images/merged/114.jpg
--- a/app/assets/images/merged/115.jpg
+++ b/app/assets/images/merged/115.jpg
--- a/app/assets/images/merged/116.jpg
+++ b/app/assets/images/merged/116.jpg
--- a/app/assets/images/merged/117.jpg
+++ b/app/assets/images/merged/117.jpg
--- a/app/assets/images/merged/118.jpg
+++ b/app/assets/images/merged/118.jpg
--- a/app/assets/images/merged/12.webp
+++ b/app/assets/images/merged/12.webp
--- a/app/assets/images/merged/120.jpg
+++ b/app/assets/images/merged/120.jpg
--- a/app/assets/images/merged/122.jpg
+++ b/app/assets/images/merged/122.jpg
--- a/app/assets/images/merged/123.jpg
+++ b/app/assets/images/merged/123.jpg
--- a/app/assets/images/merged/124.jpg
+++ b/app/assets/images/merged/124.jpg
--- a/app/assets/images/merged/125.jpg
+++ b/app/assets/images/merged/125.jpg
--- a/app/assets/images/merged/127.jpg
+++ b/app/assets/images/merged/127.jpg
--- a/app/assets/images/merged/128.jpg
+++ b/app/assets/images/merged/128.jpg
--- a/app/assets/images/merged/129.jpg
+++ b/app/assets/images/merged/129.jpg
--- a/app/assets/images/merged/130.jpg
+++ b/app/assets/images/merged/130.jpg
--- a/app/assets/images/merged/131.jpg
+++ b/app/assets/images/merged/131.jpg
--- a/app/assets/images/merged/135.jpg
+++ b/app/assets/images/merged/135.jpg
--- a/app/assets/images/merged/136.jpg
+++ b/app/assets/images/merged/136.jpg
--- a/app/assets/images/merged/137.jpg
+++ b/app/assets/images/merged/137.jpg
--- a/app/assets/images/merged/138.jpg
+++ b/app/assets/images/merged/138.jpg
--- a/app/assets/images/merged/139.jpg
+++ b/app/assets/images/merged/139.jpg
--- a/app/assets/images/merged/140.jpg
+++ b/app/assets/images/merged/140.jpg
--- a/app/assets/images/merged/141.jpg
+++ b/app/assets/images/merged/141.jpg
--- a/app/assets/images/merged/142.jpg
+++ b/app/assets/images/merged/142.jpg
--- a/app/assets/images/merged/143.webp
+++ b/app/assets/images/merged/143.webp
--- a/app/assets/images/merged/19.webp
+++ b/app/assets/images/merged/19.webp
--- a/app/assets/images/merged/2.webp
+++ b/app/assets/images/merged/2.webp
--- a/app/assets/images/merged/23.png
+++ b/app/assets/images/merged/23.png
--- a/app/assets/images/merged/3.webp
+++ b/app/assets/images/merged/3.webp
--- a/app/assets/images/merged/42.webp
+++ b/app/assets/images/merged/42.webp
--- a/app/assets/images/merged/47.jpg
+++ b/app/assets/images/merged/47.jpg
--- a/app/assets/images/merged/61.png
+++ b/app/assets/images/merged/61.png
--- a/app/assets/images/merged/62.png
+++ b/app/assets/images/merged/62.png
--- a/app/assets/images/merged/63.png
+++ b/app/assets/images/merged/63.png
--- a/app/assets/images/merged/64.png
+++ b/app/assets/images/merged/64.png
--- a/app/assets/images/merged/65.png
+++ b/app/assets/images/merged/65.png
--- a/app/assets/images/merged/69.jpg
+++ b/app/assets/images/merged/69.jpg
--- a/app/assets/images/merged/70.jpg
+++ b/app/assets/images/merged/70.jpg
--- a/app/assets/images/merged/71.jpg
+++ b/app/assets/images/merged/71.jpg
--- a/app/assets/images/merged/72.jpg
+++ b/app/assets/images/merged/72.jpg
--- a/app/assets/images/merged/73.jpg
+++ b/app/assets/images/merged/73.jpg
--- a/app/assets/images/merged/74.jpg
+++ b/app/assets/images/merged/74.jpg
--- a/app/assets/images/merged/75.jpg
+++ b/app/assets/images/merged/75.jpg
--- a/app/assets/images/merged/76.jpg
+++ b/app/assets/images/merged/76.jpg
--- a/app/assets/images/merged/77.jpg
+++ b/app/assets/images/merged/77.jpg
--- a/app/assets/images/merged/78.jpg
+++ b/app/assets/images/merged/78.jpg
--- a/app/assets/images/merged/79.jpg
+++ b/app/assets/images/merged/79.jpg
--- a/app/assets/images/merged/81.png
+++ b/app/assets/images/merged/81.png
--- a/app/assets/images/merged/82.png
+++ b/app/assets/images/merged/82.png
--- a/app/assets/images/merged/83.png
+++ b/app/assets/images/merged/83.png
--- a/app/assets/images/merged/9.webp
+++ b/app/assets/images/merged/9.webp
--- a/app/assets/images/merged/93.webp
+++ b/app/assets/images/merged/93.webp
--- a/app/assets/images/merged/99.jpg
+++ b/app/assets/images/merged/99.jpg
--- a/config/initializers/merged.rb
+++ b/config/initializers/merged.rb
@ -0,0 +1,9 @@
+require "merged"
+
+# directory inside /app/assets/images where the images are kept
+Merged.images_dir = "merged"
+
+# directory where data and styles are kept
+# Notice that the data is ALWAYS inside a merged directory,
+# so in the default case Rails.root/merged/*.yml
+Merged.data_dir = "."
--- a/merged/card_styles.yml
+++ b/merged/card_styles.yml
@ -0,0 +1 @@
+--- []
--- a/merged/option_definitions.yml
+++ b/merged/option_definitions.yml
@ -0,0 +1 @@
+--- []
--- a/merged/page_styles.yml
+++ b/merged/page_styles.yml
@ -0,0 +1 @@
+--- []
--- a/merged/section_styles.yml
+++ b/merged/section_styles.yml
@ -0,0 +1 @@
+--- []