diff --git a/Gemfile.lock b/Gemfile.lock index 57f9d62..3e080fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: b0c2d46c4815bb08dd750f34ef3e2ae996a8c69e + revision: ec96ed0162d5bc3f8a3bc4d0decb36af52f3fef1 specs: merged (0.1.0) active_hash @@ -23,47 +23,47 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4.1) - actionpack (= 7.0.4.1) - activesupport (= 7.0.4.1) + actioncable (7.0.4.2) + actionpack (= 7.0.4.2) + activesupport (= 7.0.4.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4.1) - actionpack (= 7.0.4.1) - activejob (= 7.0.4.1) - activerecord (= 7.0.4.1) - activestorage (= 7.0.4.1) - activesupport (= 7.0.4.1) + actionmailbox (7.0.4.2) + actionpack (= 7.0.4.2) + activejob (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4.1) - actionpack (= 7.0.4.1) - actionview (= 7.0.4.1) - activejob (= 7.0.4.1) - activesupport (= 7.0.4.1) + actionmailer (7.0.4.2) + actionpack (= 7.0.4.2) + actionview (= 7.0.4.2) + activejob (= 7.0.4.2) + activesupport (= 7.0.4.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.1) - actionview (= 7.0.4.1) - activesupport (= 7.0.4.1) + actionpack (7.0.4.2) + actionview (= 7.0.4.2) + activesupport (= 7.0.4.2) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4.1) - actionpack (= 7.0.4.1) - activerecord (= 7.0.4.1) - activestorage (= 7.0.4.1) - activesupport (= 7.0.4.1) + actiontext (7.0.4.2) + actionpack (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4.1) - activesupport (= 7.0.4.1) + actionview (7.0.4.2) + activesupport (= 7.0.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -72,22 +72,22 @@ GEM activesupport (>= 5.0.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (7.0.4.1) - activesupport (= 7.0.4.1) + activejob (7.0.4.2) + activesupport (= 7.0.4.2) globalid (>= 0.3.6) - activemodel (7.0.4.1) - activesupport (= 7.0.4.1) - activerecord (7.0.4.1) - activemodel (= 7.0.4.1) - activesupport (= 7.0.4.1) - activestorage (7.0.4.1) - actionpack (= 7.0.4.1) - activejob (= 7.0.4.1) - activerecord (= 7.0.4.1) - activesupport (= 7.0.4.1) + activemodel (7.0.4.2) + activesupport (= 7.0.4.2) + activerecord (7.0.4.2) + activemodel (= 7.0.4.2) + activesupport (= 7.0.4.2) + activestorage (7.0.4.2) + actionpack (= 7.0.4.2) + activejob (= 7.0.4.2) + activerecord (= 7.0.4.2) + activesupport (= 7.0.4.2) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4.1) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -123,7 +123,7 @@ GEM marcel (~> 1.0.0) ssrf_filter (~> 1.0) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) crass (1.0.6) date (3.3.3) db_text_search (1.0.0) @@ -149,7 +149,7 @@ GEM git (1.13.1) addressable (~> 2.8) rchardet (~> 1.8) - globalid (1.0.1) + globalid (1.1.0) activesupport (>= 5.0) guard (2.18.0) formatador (>= 0.2.4) @@ -286,20 +286,20 @@ GEM rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) - rails (7.0.4.1) - actioncable (= 7.0.4.1) - actionmailbox (= 7.0.4.1) - actionmailer (= 7.0.4.1) - actionpack (= 7.0.4.1) - actiontext (= 7.0.4.1) - actionview (= 7.0.4.1) - activejob (= 7.0.4.1) - activemodel (= 7.0.4.1) - activerecord (= 7.0.4.1) - activestorage (= 7.0.4.1) - activesupport (= 7.0.4.1) + rails (7.0.4.2) + actioncable (= 7.0.4.2) + actionmailbox (= 7.0.4.2) + actionmailer (= 7.0.4.2) + actionpack (= 7.0.4.2) + actiontext (= 7.0.4.2) + actionview (= 7.0.4.2) + activejob (= 7.0.4.2) + activemodel (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) bundler (>= 1.15.0) - railties (= 7.0.4.1) + railties (= 7.0.4.2) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -307,9 +307,9 @@ GEM loofah (~> 2.19, >= 2.19.1) rails_gravatar (1.0.4) actionview - railties (7.0.4.1) - actionpack (= 7.0.4.1) - activesupport (= 7.0.4.1) + railties (7.0.4.2) + actionpack (= 7.0.4.2) + activesupport (= 7.0.4.2) method_source rake (>= 12.2) thor (~> 1.0) @@ -375,7 +375,7 @@ GEM ssrf_filter (1.1.1) tailwindcss-rails (2.0.21-x86_64-linux) railties (>= 6.0.0) - temple (0.9.1) + temple (0.10.0) thor (1.2.1) thredded (1.0.1) active_record_union (>= 1.3.0) diff --git a/app/assets/images/cms/10.webp b/app/assets/images/merged/10.webp similarity index 100% rename from app/assets/images/cms/10.webp rename to app/assets/images/merged/10.webp diff --git a/app/assets/images/cms/11.webp b/app/assets/images/merged/11.webp similarity index 100% rename from app/assets/images/cms/11.webp rename to app/assets/images/merged/11.webp diff --git a/app/assets/images/cms/12.webp b/app/assets/images/merged/12.webp similarity index 100% rename from app/assets/images/cms/12.webp rename to app/assets/images/merged/12.webp diff --git a/app/assets/images/cms/13.webp b/app/assets/images/merged/13.webp similarity index 100% rename from app/assets/images/cms/13.webp rename to app/assets/images/merged/13.webp diff --git a/app/assets/images/cms/14.png b/app/assets/images/merged/14.png similarity index 100% rename from app/assets/images/cms/14.png rename to app/assets/images/merged/14.png diff --git a/app/assets/images/cms/15.webp b/app/assets/images/merged/15.webp similarity index 100% rename from app/assets/images/cms/15.webp rename to app/assets/images/merged/15.webp diff --git a/app/assets/images/cms/16.webp b/app/assets/images/merged/16.webp similarity index 100% rename from app/assets/images/cms/16.webp rename to app/assets/images/merged/16.webp diff --git a/app/assets/images/cms/17.jpg b/app/assets/images/merged/17.jpg similarity index 100% rename from app/assets/images/cms/17.jpg rename to app/assets/images/merged/17.jpg diff --git a/app/assets/images/cms/18.webp b/app/assets/images/merged/18.webp similarity index 100% rename from app/assets/images/cms/18.webp rename to app/assets/images/merged/18.webp diff --git a/app/assets/images/cms/19.webp b/app/assets/images/merged/19.webp similarity index 100% rename from app/assets/images/cms/19.webp rename to app/assets/images/merged/19.webp diff --git a/app/assets/images/cms/2.webp b/app/assets/images/merged/2.webp similarity index 100% rename from app/assets/images/cms/2.webp rename to app/assets/images/merged/2.webp diff --git a/app/assets/images/cms/20.webp b/app/assets/images/merged/20.webp similarity index 100% rename from app/assets/images/cms/20.webp rename to app/assets/images/merged/20.webp diff --git a/app/assets/images/cms/21.webp b/app/assets/images/merged/21.webp similarity index 100% rename from app/assets/images/cms/21.webp rename to app/assets/images/merged/21.webp diff --git a/app/assets/images/cms/22.webp b/app/assets/images/merged/22.webp similarity index 100% rename from app/assets/images/cms/22.webp rename to app/assets/images/merged/22.webp diff --git a/app/assets/images/cms/23.png b/app/assets/images/merged/23.png similarity index 100% rename from app/assets/images/cms/23.png rename to app/assets/images/merged/23.png diff --git a/app/assets/images/cms/24.webp b/app/assets/images/merged/24.webp similarity index 100% rename from app/assets/images/cms/24.webp rename to app/assets/images/merged/24.webp diff --git a/app/assets/images/cms/25.webp b/app/assets/images/merged/25.webp similarity index 100% rename from app/assets/images/cms/25.webp rename to app/assets/images/merged/25.webp diff --git a/app/assets/images/cms/26.webp b/app/assets/images/merged/26.webp similarity index 100% rename from app/assets/images/cms/26.webp rename to app/assets/images/merged/26.webp diff --git a/app/assets/images/cms/27.webp b/app/assets/images/merged/27.webp similarity index 100% rename from app/assets/images/cms/27.webp rename to app/assets/images/merged/27.webp diff --git a/app/assets/images/cms/28.jpg b/app/assets/images/merged/28.jpg similarity index 100% rename from app/assets/images/cms/28.jpg rename to app/assets/images/merged/28.jpg diff --git a/app/assets/images/cms/29.webp b/app/assets/images/merged/29.webp similarity index 100% rename from app/assets/images/cms/29.webp rename to app/assets/images/merged/29.webp diff --git a/app/assets/images/cms/3.webp b/app/assets/images/merged/3.webp similarity index 100% rename from app/assets/images/cms/3.webp rename to app/assets/images/merged/3.webp diff --git a/app/assets/images/cms/30.webp b/app/assets/images/merged/30.webp similarity index 100% rename from app/assets/images/cms/30.webp rename to app/assets/images/merged/30.webp diff --git a/app/assets/images/cms/31.webp b/app/assets/images/merged/31.webp similarity index 100% rename from app/assets/images/cms/31.webp rename to app/assets/images/merged/31.webp diff --git a/app/assets/images/cms/32.webp b/app/assets/images/merged/32.webp similarity index 100% rename from app/assets/images/cms/32.webp rename to app/assets/images/merged/32.webp diff --git a/app/assets/images/cms/33.webp b/app/assets/images/merged/33.webp similarity index 100% rename from app/assets/images/cms/33.webp rename to app/assets/images/merged/33.webp diff --git a/app/assets/images/cms/34.webp b/app/assets/images/merged/34.webp similarity index 100% rename from app/assets/images/cms/34.webp rename to app/assets/images/merged/34.webp diff --git a/app/assets/images/cms/35.webp b/app/assets/images/merged/35.webp similarity index 100% rename from app/assets/images/cms/35.webp rename to app/assets/images/merged/35.webp diff --git a/app/assets/images/cms/36.webp b/app/assets/images/merged/36.webp similarity index 100% rename from app/assets/images/cms/36.webp rename to app/assets/images/merged/36.webp diff --git a/app/assets/images/cms/37.webp b/app/assets/images/merged/37.webp similarity index 100% rename from app/assets/images/cms/37.webp rename to app/assets/images/merged/37.webp diff --git a/app/assets/images/cms/38.jpg b/app/assets/images/merged/38.jpg similarity index 100% rename from app/assets/images/cms/38.jpg rename to app/assets/images/merged/38.jpg diff --git a/app/assets/images/cms/39.webp b/app/assets/images/merged/39.webp similarity index 100% rename from app/assets/images/cms/39.webp rename to app/assets/images/merged/39.webp diff --git a/app/assets/images/cms/4.webp b/app/assets/images/merged/4.webp similarity index 100% rename from app/assets/images/cms/4.webp rename to app/assets/images/merged/4.webp diff --git a/app/assets/images/cms/40.webp b/app/assets/images/merged/40.webp similarity index 100% rename from app/assets/images/cms/40.webp rename to app/assets/images/merged/40.webp diff --git a/app/assets/images/cms/41.webp b/app/assets/images/merged/41.webp similarity index 100% rename from app/assets/images/cms/41.webp rename to app/assets/images/merged/41.webp diff --git a/app/assets/images/cms/42.webp b/app/assets/images/merged/42.webp similarity index 100% rename from app/assets/images/cms/42.webp rename to app/assets/images/merged/42.webp diff --git a/app/assets/images/cms/43.webp b/app/assets/images/merged/43.webp similarity index 100% rename from app/assets/images/cms/43.webp rename to app/assets/images/merged/43.webp diff --git a/app/assets/images/cms/44.webp b/app/assets/images/merged/44.webp similarity index 100% rename from app/assets/images/cms/44.webp rename to app/assets/images/merged/44.webp diff --git a/app/assets/images/cms/45.webp b/app/assets/images/merged/45.webp similarity index 100% rename from app/assets/images/cms/45.webp rename to app/assets/images/merged/45.webp diff --git a/app/assets/images/cms/46.png b/app/assets/images/merged/46.png similarity index 100% rename from app/assets/images/cms/46.png rename to app/assets/images/merged/46.png diff --git a/app/assets/images/cms/47.png b/app/assets/images/merged/47.png similarity index 100% rename from app/assets/images/cms/47.png rename to app/assets/images/merged/47.png diff --git a/app/assets/images/cms/48.png b/app/assets/images/merged/48.png similarity index 100% rename from app/assets/images/cms/48.png rename to app/assets/images/merged/48.png diff --git a/app/assets/images/cms/49.png b/app/assets/images/merged/49.png similarity index 100% rename from app/assets/images/cms/49.png rename to app/assets/images/merged/49.png diff --git a/app/assets/images/cms/5.webp b/app/assets/images/merged/5.webp similarity index 100% rename from app/assets/images/cms/5.webp rename to app/assets/images/merged/5.webp diff --git a/app/assets/images/cms/50.png b/app/assets/images/merged/50.png similarity index 100% rename from app/assets/images/cms/50.png rename to app/assets/images/merged/50.png diff --git a/app/assets/images/cms/52.png b/app/assets/images/merged/52.png similarity index 100% rename from app/assets/images/cms/52.png rename to app/assets/images/merged/52.png diff --git a/app/assets/images/cms/53.png b/app/assets/images/merged/53.png similarity index 100% rename from app/assets/images/cms/53.png rename to app/assets/images/merged/53.png diff --git a/app/assets/images/cms/6.webp b/app/assets/images/merged/6.webp similarity index 100% rename from app/assets/images/cms/6.webp rename to app/assets/images/merged/6.webp diff --git a/app/assets/images/cms/7.webp b/app/assets/images/merged/7.webp similarity index 100% rename from app/assets/images/cms/7.webp rename to app/assets/images/merged/7.webp diff --git a/app/assets/images/cms/8.webp b/app/assets/images/merged/8.webp similarity index 100% rename from app/assets/images/cms/8.webp rename to app/assets/images/merged/8.webp diff --git a/app/assets/images/cms/9.webp b/app/assets/images/merged/9.webp similarity index 100% rename from app/assets/images/cms/9.webp rename to app/assets/images/merged/9.webp diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d017789..976687f 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,7 +11,6 @@ * It is generally better to create a new file per style scope. * *= require_self - *= require merged/tailwind_styles */ #thredded--container{ max-width: 60rem; diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index 95d0475..8189210 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -1,14 +1,2 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - -/* - -@layer components { - .btn-primary { - @apply py-2 px-4 bg-blue-200; - } -} - -@import 'actiontext.css'; -*/ +@import "tailwind_base"; +@import "merged_tailwind_styles"; diff --git a/app/assets/stylesheets/merged_tailwind_styles.css b/app/assets/stylesheets/merged_tailwind_styles.css new file mode 100644 index 0000000..d52983c --- /dev/null +++ b/app/assets/stylesheets/merged_tailwind_styles.css @@ -0,0 +1,21 @@ +.prose { + max-width: 100%; + color: inherit; + --tw-prose-bullets: #6b7280; + --tw-prose-headings: inherit; +} + +@layer components { + .button { + @apply inline-block rounded-lg px-3 py-2 text-base font-medium border border-gray-500 hover:border-black; + } + .change { + @apply bg-cyan-200; + } + .remove { + @apply bg-red-200; + } + .action { + @apply bg-green-200; + } +} diff --git a/app/assets/stylesheets/tailwind_base.css b/app/assets/stylesheets/tailwind_base.css new file mode 100644 index 0000000..b5c61c9 --- /dev/null +++ b/app/assets/stylesheets/tailwind_base.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/config/initializers/merged.rb b/config/initializers/merged.rb new file mode 100644 index 0000000..88fe621 --- /dev/null +++ b/config/initializers/merged.rb @@ -0,0 +1,11 @@ +require "merged" + +# directory inside /app/assets/images where YOUR images are kept +# if you change this and add own styles, you will still need a merged directory +# for the previews (card_preview and section_preview) +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 = "." diff --git a/merged/card_styles.yml b/merged/card_styles.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/card_styles.yml @@ -0,0 +1 @@ +--- [] diff --git a/merged/option_definitions.yml b/merged/option_definitions.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/option_definitions.yml @@ -0,0 +1 @@ +--- [] diff --git a/merged/page_styles.yml b/merged/page_styles.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/page_styles.yml @@ -0,0 +1 @@ +--- [] diff --git a/merged/section_styles.yml b/merged/section_styles.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/section_styles.yml @@ -0,0 +1 @@ +--- []