scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-09 16:01:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix tinyMCE layout in safari [SCI-8426]

Browse source
This commit is contained in:
Anton 2023-05-23 13:28:31 +02:00
parent 2bbeef0775
commit 043ce88434
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/my_modules/protocol.scss
View file

@ -84,6 +84,10 @@
} }
.tinymce-wrapper { .tinymce-wrapper {
width: 100%; width: 100%;
.tox-tinymce {
flex-grow: 1;
}
} }
.tinymce-container { .tinymce-container {
display: flex; display: flex;

7
app/assets/stylesheets/my_modules/results/index.scss
View file

@ -73,3 +73,10 @@
width: 3em; width: 3em;
} }
} }
.edit-text-result {
.form-group {
display: flex;
flex-direction: column;
}
}

2
app/javascript/vue/shared/tinymce.vue
View file

@ -27,7 +27,7 @@
:data-placeholder="placeholder" :data-placeholder="placeholder"
:data-tinymce-init="`tinymce-${objectType}-description-${objectId}`"> :data-tinymce-init="`tinymce-${objectType}-description-${objectId}`">
</div> </div>
<div class="form-group"> <div class="flex">
<textarea :id="`${objectType}_textarea_${objectId}`" <textarea :id="`${objectType}_textarea_${objectId}`"
class="form-control hidden" class="form-control hidden"
autocomplete="off" autocomplete="off"

2
app/views/result_texts/_edit.html.erb
View file

@ -1,4 +1,4 @@
<div class="well"> <div class="well edit-text-result">
<%= bootstrap_form_for(@result, url: result_text_path(format: :json), <%= bootstrap_form_for(@result, url: result_text_path(format: :json),
data: { 'name-max-length': Constants::NAME_MAX_LENGTH, 'rich-text-max-length': Constants::RICH_TEXT_MAX_LENGTH }, data: { 'name-max-length': Constants::NAME_MAX_LENGTH, 'rich-text-max-length': Constants::RICH_TEXT_MAX_LENGTH },
remote: :true) do |f| %> remote: :true) do |f| %>

2
app/views/result_texts/_new.html.erb
View file

@ -1,4 +1,4 @@
<div class="well"> <div class="well edit-text-result">
<%= bootstrap_form_for(@result, url: my_module_result_texts_path(format: :json, page: params[:page], order: params[:order]), <%= bootstrap_form_for(@result, url: my_module_result_texts_path(format: :json, page: params[:page], order: params[:order]),
data: { 'name-max-length': Constants::NAME_MAX_LENGTH, 'rich-text-max-length': Constants::RICH_TEXT_MAX_LENGTH }, data: { 'name-max-length': Constants::NAME_MAX_LENGTH, 'rich-text-max-length': Constants::RICH_TEXT_MAX_LENGTH },
remote: true) do |f| %> remote: true) do |f| %>