diff --git a/app/assets/stylesheets/commons/_actiontext.sass b/app/assets/stylesheets/commons/_actiontext.sass
deleted file mode 100644
index 266498590207b3450a25522403ccd54e7ea1bdd4..0000000000000000000000000000000000000000
--- a/app/assets/stylesheets/commons/_actiontext.sass
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// 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.
-//
-@import '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
- line-height: 2rem
- h1
- font-size: 1.5rem
- h2
- font-size: 1.3rem
- h3
- font-size: 1.15rem
-
- .attachment
- text-align: initial
-
- .attachment-gallery
- > action-text-attachment,
- > .attachment
- flex: 1 0 33%
- max-width: 33%
- padding: 0 0.5em
-
- &.attachment-gallery--2,
- &.attachment-gallery--4
- > action-text-attachment,
- > .attachment
- flex-basis: 50%
- max-width: 50%
-
-
- action-text-attachment
- .attachment
- max-width: 100% !important
- padding: 0 !important
-
-trix-editor.form-control
- height: auto
- margin-top: -34px
- padding-top: 40px
-
-trix-toolbar
- background: white
- border-bottom: 1px solid #EEEEEE
- margin: 1px
- padding: 5px 0
- position: sticky
- top: 0
- .trix-button-group, .trix-button
- border: none
- .trix-button-group
- margin-bottom: 0
diff --git a/app/views/admin/communication/website/blocks/templates/partners/_show.html.erb b/app/views/admin/communication/website/blocks/templates/partners/_show.html.erb
index a46172395d78c831b9e9450c87c7c0aafb4818cb..86a1cb21a5b221dbb3953748dbd6a6e85b915fe5 100644
--- a/app/views/admin/communication/website/blocks/templates/partners/_show.html.erb
+++ b/app/views/admin/communication/website/blocks/templates/partners/_show.html.erb
@@ -5,10 +5,11 @@
<div class="col-md-3">
<article class="card">
<div class="card-body">
- <%# TODO : Replace by kamifusen %>
- <% if partner['logo'] %>
- <img src="<%= partner['logo'] %>" class="img-fluid mb-2" />
+ <% unless partner.dig('logo', 'id').blank? %>
+ <% blob = ActiveStorage::Blob.find(partner.dig('logo', 'id')) %>
+ <%= kamifusen_tag blob, width: 300, class: 'img-fluid mb-2' %>
<% end %>
+
<h3 class="card-title h5"><%= partner['name'] %></h3>
<p class="mb-0"><%= partner['url'] %></p>
</div>
diff --git a/package.json b/package.json
index a81ea6c43a13401c8c44bb415d09a557b8529947..706af33303dde85fd911a6b807fec0796726719f 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,7 @@
"notyf": "^3.10.0",
"slug": "^5.1.0",
"sortablejs": "^1.14.0",
- "trix": "^1.3.1",
"vue": "^3.2.31",
- "vue-draggable-next": "^2.1.1",
- "vuedraggable": "4.1.0"
+ "vue-draggable-next": "^2.1.1"
}
}
diff --git a/yarn.lock b/yarn.lock
index d2c268ba14f424468dcbf9dce4178a28fe6494e3..9d2b82f2d23e3d314e536556b8da291f63c7ac3b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -153,7 +153,7 @@ slug@^5.1.0:
resolved "https://registry.yarnpkg.com/slug/-/slug-5.1.0.tgz#8a7e30ca1c3a6dc40cf74e269750913a865edb0b"
integrity sha512-IS39jKR6m+puU8zWgH6ruwx1sfzFNJ6Ai5PKIlUqd0X8C3ca7PB49Cvm0uayqgEt1jgaojO2wWEsQJngnh7fDA==
-sortablejs@1.14.0, sortablejs@^1.14.0:
+sortablejs@^1.14.0:
version "1.14.0"
resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8"
integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==
@@ -173,11 +173,6 @@ sourcemap-codec@^1.4.4:
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-trix@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/trix/-/trix-1.3.1.tgz#ccce8d9e72bf0fe70c8c019ff558c70266f8d857"
- integrity sha512-BbH6mb6gk+AV4f2as38mP6Ucc1LE3OD6XxkZnAgPIduWXYtvg2mI3cZhIZSLqmMh9OITEpOBCCk88IVmyjU7bA==
-
vue-draggable-next@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/vue-draggable-next/-/vue-draggable-next-2.1.1.tgz#49886da82f116d11b3e4df7674320fdacf5d7e04"
@@ -193,10 +188,3 @@ vue@^3.2.31:
"@vue/runtime-dom" "3.2.31"
"@vue/server-renderer" "3.2.31"
"@vue/shared" "3.2.31"
-
-vuedraggable@4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"
- integrity sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==
- dependencies:
- sortablejs "1.14.0"