diff options
author | George Claghorn <george.claghorn@gmail.com> | 2019-01-04 23:09:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-04 23:09:12 -0500 |
commit | df8ee09ce71338cdf9816225df1bdebc707f3560 (patch) | |
tree | 5b2d265cdaca5c5859205389088b2bdc2327d935 /actiontext/lib/templates | |
parent | 88349cee3cb8f7bba662232fbc444eeebc8bb227 (diff) | |
parent | 0decd2ddc4a94cf522fc8ea8e6c73b9deedfdd93 (diff) | |
download | rails-df8ee09ce71338cdf9816225df1bdebc707f3560.tar.gz rails-df8ee09ce71338cdf9816225df1bdebc707f3560.tar.bz2 rails-df8ee09ce71338cdf9816225df1bdebc707f3560.zip |
Merge pull request #34873 from georgeclaghorn/actiontext
Import Action Text
Diffstat (limited to 'actiontext/lib/templates')
-rw-r--r-- | actiontext/lib/templates/actiontext.scss | 36 | ||||
-rw-r--r-- | actiontext/lib/templates/fixtures.yml | 4 | ||||
-rw-r--r-- | actiontext/lib/templates/installer.rb | 22 |
3 files changed, 62 insertions, 0 deletions
diff --git a/actiontext/lib/templates/actiontext.scss b/actiontext/lib/templates/actiontext.scss new file mode 100644 index 0000000000..7cb26e74ac --- /dev/null +++ b/actiontext/lib/templates/actiontext.scss @@ -0,0 +1,36 @@ +// +// Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and +// the trix-editor content (whether displayed or under editing). Feel free to incorporate this +// inclusion directly in any other asset bundle and remove this file. +// +//= require trix/dist/trix + +// We need to override trix.css’s image gallery styles to accommodate the +// <action-text-attachment> element we wrap around attachments. Otherwise, +// images in galleries will be squished by the max-width: 33%; rule. +.trix-content { + .attachment-gallery { + > action-text-attachment, + > .attachment { + flex: 1 0 33%; + padding: 0 0.5em; + max-width: 33%; + } + + &.attachment-gallery--2, + &.attachment-gallery--4 { + > action-text-attachment, + > .attachment { + flex-basis: 50%; + max-width: 50%; + } + } + } + + action-text-attachment { + .attachment { + padding: 0 !important; + max-width: 100% !important; + } + } +} diff --git a/actiontext/lib/templates/fixtures.yml b/actiontext/lib/templates/fixtures.yml new file mode 100644 index 0000000000..8b371ea604 --- /dev/null +++ b/actiontext/lib/templates/fixtures.yml @@ -0,0 +1,4 @@ +# one: +# record: name_of_fixture (ClassOfFixture) +# name: content +# body: <p>In a <i>million</i> stars!</p> diff --git a/actiontext/lib/templates/installer.rb b/actiontext/lib/templates/installer.rb new file mode 100644 index 0000000000..ee5a5af75b --- /dev/null +++ b/actiontext/lib/templates/installer.rb @@ -0,0 +1,22 @@ +say "Copying actiontext.scss to app/assets/stylesheets" +copy_file "#{__dir__}/actiontext.scss", "app/assets/stylesheets/actiontext.scss" + +say "Copying fixtures to test/fixtures/action_text/rich_texts.yml" +copy_file "#{__dir__}/fixtures.yml", "test/fixtures/action_text/rich_texts.yml" + +say "Copying blob rendering partial to app/views/active_storage/blobs/_blob.html.erb" +copy_file "#{__dir__}/../../app/views/active_storage/blobs/_blob.html.erb", + "app/views/active_storage/blobs/_blob.html.erb" + +# FIXME: Replace with release version on release +say "Installing JavaScript dependency" +run "yarn add https://github.com/rails/actiontext" + +APPLICATION_PACK_PATH = "app/javascript/packs/application.js" + +if File.exists?(APPLICATION_PACK_PATH) && File.read(APPLICATION_PACK_PATH) !~ /import "actiontext"/ + say "Adding import to default JavaScript pack" + append_to_file APPLICATION_PACK_PATH, <<-EOS +import "actiontext" +EOS +end |