diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 30aa3015a..b06987c19 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -425,4 +425,16 @@ } } } + + .card__collection-public-description { + max-inline-size: 66ch; + + p:first-child { + margin-block-start: 0; + } + + p:last-child { + margin-block-end: 0; + } + } } diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css index 050a152aa..7da38de27 100644 --- a/app/assets/stylesheets/utilities.css +++ b/app/assets/stylesheets/utilities.css @@ -65,6 +65,13 @@ row-gap: var(--row-gap, var(--block-space-half)); } + .gap-none { + --column-gap: 0; + --row-gap: 0; + + gap: 0; + } + /* Sizing */ .full-width { inline-size: 100%; } .min-width { min-inline-size: 0; } diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb index 170715e2c..e7100eaa4 100644 --- a/app/controllers/collections_controller.rb +++ b/app/controllers/collections_controller.rb @@ -33,7 +33,7 @@ class CollectionsController < ApplicationController end def collection_params - params.expect(collection: [ :name, :all_access, :auto_close_period, :auto_reconsider_period ]) + params.expect(collection: [ :name, :all_access, :auto_close_period, :auto_reconsider_period, :public_description ]) end def grantees diff --git a/app/models/collection.rb b/app/models/collection.rb index f341eeb40..1cce236e8 100644 --- a/app/models/collection.rb +++ b/app/models/collection.rb @@ -3,6 +3,8 @@ class Collection < ApplicationRecord belongs_to :creator, class_name: "User", default: -> { Current.user } + has_rich_text :public_description + has_many :cards, dependent: :destroy has_many :tags, -> { distinct }, through: :cards has_many :events diff --git a/app/views/collections/edit/_publication.html.erb b/app/views/collections/edit/_publication.html.erb index 82a6f3f10..72f315b8d 100644 --- a/app/views/collections/edit/_publication.html.erb +++ b/app/views/collections/edit/_publication.html.erb @@ -19,12 +19,21 @@