Sticky trix toolbar (SpinaCMS#730)

channainfo · Jun 30, 2021 · 974a670 · 974a670
1 parent 0640b75
commit 974a670
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/components/spina/forms/trix_toolbar_component.html.erb b/app/components/spina/forms/trix_toolbar_component.html.erb
@@ -1,4 +1,4 @@
-<div class="relative trix-toolbar" id="<%= @trix_id %>">
+<div class="relative sticky top-0 pt-4 bg-white trix-toolbar" id="<%= @trix_id %>">
   <div class="flex items-center flex-wrap" data-controller="reveal">
     <div class="flex items-center bg-gray-200 rounded overflow-hidden mb-3 mr-3">
       <button type="button" class="text-gray-700 w-9 h-9 flex items-center justify-center" data-trix-attribute="bold" data-trix-key="b" title="${Trix.config.lang.bold}" tabindex="-1">

diff --git a/app/views/spina/admin/parts/texts/_form.html.erb b/app/views/spina/admin/parts/texts/_form.html.erb
@@ -3,7 +3,7 @@
   <div class="mt-1 relative">
     <%= f.hidden_field :content, id: "#{f.object.object_id}_input" %>
 
-    <div class="relative form-textarea p-4 shadow-sm max-w-5xl" data-controller="trix" id="<%= "insert_#{f.object.object_id}_trix-toolbar" %>" data-action="media-picker:done->trix#insertAttachment">      
+    <div class="relative form-textarea p-4 pt-0 shadow-sm max-w-5xl" data-controller="trix" id="<%= "insert_#{f.object.object_id}_trix-toolbar" %>" data-action="media-picker:done->trix#insertAttachment">      
       <%= render Spina::Forms::TrixToolbarComponent.new("#{f.object.object_id}_trix-toolbar") %>
 
       <trix-editor class="prose prose-sm focus:outline-none max-w-3xl xl:border-r border-dashed border-gray-200 pr-3" toolbar="<%= f.object.object_id %>_trix-toolbar" input="<%= f.object.object_id %>_input" data-trix-target="editor" data-action="trix-file-accept->trix#preventDefault"></trix-editor>

diff --git a/app/views/spina/admin/settings/_wysiwyg_field.html.erb b/app/views/spina/admin/settings/_wysiwyg_field.html.erb
@@ -4,7 +4,7 @@
   <div class="mt-1 relative">
     <%= f.hidden_field attribute, id: "#{f.object.object_id}_input" %>
 
-    <div class="relative form-textarea p-4 shadow-sm max-w-5xl" data-controller="trix" id="<%= "insert_#{f.object.object_id}_trix-toolbar" %>" data-action="media-picker:done->trix#insertAttachment">      
+    <div class="relative form-textarea p-4 pt-0 shadow-sm max-w-5xl" data-controller="trix" id="<%= "insert_#{f.object.object_id}_trix-toolbar" %>" data-action="media-picker:done->trix#insertAttachment">      
       <%= render Spina::Forms::TrixToolbarComponent.new("#{f.object.object_id}_trix-toolbar") %>
 
       <trix-editor class="prose prose-sm focus:outline-none max-w-3xl xl:border-r border-dashed border-gray-200 pr-3" toolbar="<%= f.object.object_id %>_trix-toolbar" input="<%= f.object.object_id %>_input" data-trix-target="editor" data-action="trix-file-accept->trix#preventDefault"></trix-editor>

diff --git a/test/dummy/config/initializers/themes/demo.rb b/test/dummy/config/initializers/themes/demo.rb
@@ -58,7 +58,7 @@
     name: 'testrepeater',
     title: 'Testrepeater',
     part_type: "Spina::Parts::Repeater",
-    parts: %w(line)
+    parts: %w(line body)
   }]
 
   theme.view_templates = [{