update to multi-style enabled merged
114
Gemfile.lock
|
@ -1,6 +1,6 @@
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/HubFeenixMakers/merged
|
remote: https://github.com/HubFeenixMakers/merged
|
||||||
revision: b0c2d46c4815bb08dd750f34ef3e2ae996a8c69e
|
revision: ec96ed0162d5bc3f8a3bc4d0decb36af52f3fef1
|
||||||
specs:
|
specs:
|
||||||
merged (0.1.0)
|
merged (0.1.0)
|
||||||
active_hash
|
active_hash
|
||||||
|
@ -23,47 +23,47 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (7.0.4.1)
|
actioncable (7.0.4.2)
|
||||||
actionpack (= 7.0.4.1)
|
actionpack (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailbox (7.0.4.1)
|
actionmailbox (7.0.4.2)
|
||||||
actionpack (= 7.0.4.1)
|
actionpack (= 7.0.4.2)
|
||||||
activejob (= 7.0.4.1)
|
activejob (= 7.0.4.2)
|
||||||
activerecord (= 7.0.4.1)
|
activerecord (= 7.0.4.2)
|
||||||
activestorage (= 7.0.4.1)
|
activestorage (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
mail (>= 2.7.1)
|
mail (>= 2.7.1)
|
||||||
net-imap
|
net-imap
|
||||||
net-pop
|
net-pop
|
||||||
net-smtp
|
net-smtp
|
||||||
actionmailer (7.0.4.1)
|
actionmailer (7.0.4.2)
|
||||||
actionpack (= 7.0.4.1)
|
actionpack (= 7.0.4.2)
|
||||||
actionview (= 7.0.4.1)
|
actionview (= 7.0.4.2)
|
||||||
activejob (= 7.0.4.1)
|
activejob (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
net-imap
|
net-imap
|
||||||
net-pop
|
net-pop
|
||||||
net-smtp
|
net-smtp
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (7.0.4.1)
|
actionpack (7.0.4.2)
|
||||||
actionview (= 7.0.4.1)
|
actionview (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
rack (~> 2.0, >= 2.2.0)
|
rack (~> 2.0, >= 2.2.0)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||||
actiontext (7.0.4.1)
|
actiontext (7.0.4.2)
|
||||||
actionpack (= 7.0.4.1)
|
actionpack (= 7.0.4.2)
|
||||||
activerecord (= 7.0.4.1)
|
activerecord (= 7.0.4.2)
|
||||||
activestorage (= 7.0.4.1)
|
activestorage (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
globalid (>= 0.6.0)
|
globalid (>= 0.6.0)
|
||||||
nokogiri (>= 1.8.5)
|
nokogiri (>= 1.8.5)
|
||||||
actionview (7.0.4.1)
|
actionview (7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
|
@ -72,22 +72,22 @@ GEM
|
||||||
activesupport (>= 5.0.0)
|
activesupport (>= 5.0.0)
|
||||||
active_record_union (1.3.0)
|
active_record_union (1.3.0)
|
||||||
activerecord (>= 4.0)
|
activerecord (>= 4.0)
|
||||||
activejob (7.0.4.1)
|
activejob (7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (7.0.4.1)
|
activemodel (7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
activerecord (7.0.4.1)
|
activerecord (7.0.4.2)
|
||||||
activemodel (= 7.0.4.1)
|
activemodel (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
activestorage (7.0.4.1)
|
activestorage (7.0.4.2)
|
||||||
actionpack (= 7.0.4.1)
|
actionpack (= 7.0.4.2)
|
||||||
activejob (= 7.0.4.1)
|
activejob (= 7.0.4.2)
|
||||||
activerecord (= 7.0.4.1)
|
activerecord (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
marcel (~> 1.0)
|
marcel (~> 1.0)
|
||||||
mini_mime (>= 1.1.0)
|
mini_mime (>= 1.1.0)
|
||||||
activesupport (7.0.4.1)
|
activesupport (7.0.4.2)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 1.6, < 2)
|
i18n (>= 1.6, < 2)
|
||||||
minitest (>= 5.1)
|
minitest (>= 5.1)
|
||||||
|
@ -123,7 +123,7 @@ GEM
|
||||||
marcel (~> 1.0.0)
|
marcel (~> 1.0.0)
|
||||||
ssrf_filter (~> 1.0)
|
ssrf_filter (~> 1.0)
|
||||||
coderay (1.1.3)
|
coderay (1.1.3)
|
||||||
concurrent-ruby (1.1.10)
|
concurrent-ruby (1.2.0)
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
date (3.3.3)
|
date (3.3.3)
|
||||||
db_text_search (1.0.0)
|
db_text_search (1.0.0)
|
||||||
|
@ -149,7 +149,7 @@ GEM
|
||||||
git (1.13.1)
|
git (1.13.1)
|
||||||
addressable (~> 2.8)
|
addressable (~> 2.8)
|
||||||
rchardet (~> 1.8)
|
rchardet (~> 1.8)
|
||||||
globalid (1.0.1)
|
globalid (1.1.0)
|
||||||
activesupport (>= 5.0)
|
activesupport (>= 5.0)
|
||||||
guard (2.18.0)
|
guard (2.18.0)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
|
@ -286,20 +286,20 @@ GEM
|
||||||
rack (2.2.6.2)
|
rack (2.2.6.2)
|
||||||
rack-test (2.0.2)
|
rack-test (2.0.2)
|
||||||
rack (>= 1.3)
|
rack (>= 1.3)
|
||||||
rails (7.0.4.1)
|
rails (7.0.4.2)
|
||||||
actioncable (= 7.0.4.1)
|
actioncable (= 7.0.4.2)
|
||||||
actionmailbox (= 7.0.4.1)
|
actionmailbox (= 7.0.4.2)
|
||||||
actionmailer (= 7.0.4.1)
|
actionmailer (= 7.0.4.2)
|
||||||
actionpack (= 7.0.4.1)
|
actionpack (= 7.0.4.2)
|
||||||
actiontext (= 7.0.4.1)
|
actiontext (= 7.0.4.2)
|
||||||
actionview (= 7.0.4.1)
|
actionview (= 7.0.4.2)
|
||||||
activejob (= 7.0.4.1)
|
activejob (= 7.0.4.2)
|
||||||
activemodel (= 7.0.4.1)
|
activemodel (= 7.0.4.2)
|
||||||
activerecord (= 7.0.4.1)
|
activerecord (= 7.0.4.2)
|
||||||
activestorage (= 7.0.4.1)
|
activestorage (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
bundler (>= 1.15.0)
|
bundler (>= 1.15.0)
|
||||||
railties (= 7.0.4.1)
|
railties (= 7.0.4.2)
|
||||||
rails-dom-testing (2.0.3)
|
rails-dom-testing (2.0.3)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
|
@ -307,9 +307,9 @@ GEM
|
||||||
loofah (~> 2.19, >= 2.19.1)
|
loofah (~> 2.19, >= 2.19.1)
|
||||||
rails_gravatar (1.0.4)
|
rails_gravatar (1.0.4)
|
||||||
actionview
|
actionview
|
||||||
railties (7.0.4.1)
|
railties (7.0.4.2)
|
||||||
actionpack (= 7.0.4.1)
|
actionpack (= 7.0.4.2)
|
||||||
activesupport (= 7.0.4.1)
|
activesupport (= 7.0.4.2)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 12.2)
|
rake (>= 12.2)
|
||||||
thor (~> 1.0)
|
thor (~> 1.0)
|
||||||
|
@ -375,7 +375,7 @@ GEM
|
||||||
ssrf_filter (1.1.1)
|
ssrf_filter (1.1.1)
|
||||||
tailwindcss-rails (2.0.21-x86_64-linux)
|
tailwindcss-rails (2.0.21-x86_64-linux)
|
||||||
railties (>= 6.0.0)
|
railties (>= 6.0.0)
|
||||||
temple (0.9.1)
|
temple (0.10.0)
|
||||||
thor (1.2.1)
|
thor (1.2.1)
|
||||||
thredded (1.0.1)
|
thredded (1.0.1)
|
||||||
active_record_union (>= 1.3.0)
|
active_record_union (>= 1.3.0)
|
||||||
|
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 96 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 207 KiB After Width: | Height: | Size: 207 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 170 KiB After Width: | Height: | Size: 170 KiB |
Before Width: | Height: | Size: 260 KiB After Width: | Height: | Size: 260 KiB |
Before Width: | Height: | Size: 211 KiB After Width: | Height: | Size: 211 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 1021 KiB After Width: | Height: | Size: 1021 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 362 KiB After Width: | Height: | Size: 362 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 129 KiB After Width: | Height: | Size: 129 KiB |
Before Width: | Height: | Size: 246 KiB After Width: | Height: | Size: 246 KiB |
Before Width: | Height: | Size: 137 KiB After Width: | Height: | Size: 137 KiB |
Before Width: | Height: | Size: 216 KiB After Width: | Height: | Size: 216 KiB |
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 82 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 245 KiB After Width: | Height: | Size: 245 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 146 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 137 KiB After Width: | Height: | Size: 137 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 372 KiB After Width: | Height: | Size: 372 KiB |
Before Width: | Height: | Size: 403 KiB After Width: | Height: | Size: 403 KiB |
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 95 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 103 KiB After Width: | Height: | Size: 103 KiB |
Before Width: | Height: | Size: 977 KiB After Width: | Height: | Size: 977 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 201 KiB After Width: | Height: | Size: 201 KiB |
Before Width: | Height: | Size: 323 KiB After Width: | Height: | Size: 323 KiB |
Before Width: | Height: | Size: 125 KiB After Width: | Height: | Size: 125 KiB |
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 135 KiB |
|
@ -11,7 +11,6 @@
|
||||||
* It is generally better to create a new file per style scope.
|
* It is generally better to create a new file per style scope.
|
||||||
*
|
*
|
||||||
*= require_self
|
*= require_self
|
||||||
*= require merged/tailwind_styles
|
|
||||||
*/
|
*/
|
||||||
#thredded--container{
|
#thredded--container{
|
||||||
max-width: 60rem;
|
max-width: 60rem;
|
||||||
|
|
|
@ -1,14 +1,2 @@
|
||||||
@tailwind base;
|
@import "tailwind_base";
|
||||||
@tailwind components;
|
@import "merged_tailwind_styles";
|
||||||
@tailwind utilities;
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
@layer components {
|
|
||||||
.btn-primary {
|
|
||||||
@apply py-2 px-4 bg-blue-200;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@import 'actiontext.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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
@tailwind base;
|
||||||
|
@tailwind components;
|
||||||
|
@tailwind utilities;
|
|
@ -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 = "."
|
|
@ -0,0 +1 @@
|
||||||
|
--- []
|
|
@ -0,0 +1 @@
|
||||||
|
--- []
|
|
@ -0,0 +1 @@
|
||||||
|
--- []
|
|
@ -0,0 +1 @@
|
||||||
|
--- []
|