From 249ead6cfccd3a77b992ffa41bd64ba0cdf6c343 Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Mon, 16 Jan 2023 14:53:18 +0100 Subject: [PATCH] better form layout --- app/assets/stylesheets/commons/_forms.sass | 5 ++++ .../stylesheets/commons/_summernote.sass | 5 ++++ .../blocks/templates/chapter/_edit.html.erb | 27 +++++++------------ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/commons/_forms.sass b/app/assets/stylesheets/commons/_forms.sass index a61cc00e3..f404282e5 100644 --- a/app/assets/stylesheets/commons/_forms.sass +++ b/app/assets/stylesheets/commons/_forms.sass @@ -7,3 +7,8 @@ legend ~ * clear: left + +input.form-control[type=text] + font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif + font-size: 1rem + color: black diff --git a/app/assets/stylesheets/commons/_summernote.sass b/app/assets/stylesheets/commons/_summernote.sass index d0c877bbb..e31c419c3 100644 --- a/app/assets/stylesheets/commons/_summernote.sass +++ b/app/assets/stylesheets/commons/_summernote.sass @@ -1,5 +1,10 @@ .summernote color: black + .note-editable + * + font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif + &, p, div + font-size: 1rem b color: black font-weight: bold diff --git a/app/views/admin/communication/blocks/templates/chapter/_edit.html.erb b/app/views/admin/communication/blocks/templates/chapter/_edit.html.erb index 60946dd47..d4110b4ae 100644 --- a/app/views/admin/communication/blocks/templates/chapter/_edit.html.erb +++ b/app/views/admin/communication/blocks/templates/chapter/_edit.html.erb @@ -1,28 +1,21 @@ <%= block_component_edit :layout %> <div class="row mb-4"> - <div class="col-xl-6"> + <div class="col-xxl-8"> <%= block_component_edit :text %> <%= block_component_edit :notes %> </div> - <div class="col-xl-6"> + <div class="col-xxl-4"> <label class="form-label"> <%= t "admin.communication.blocks.templates.chapter.edit.image.label" %> </label> - - <div class="row"> - <div class="col-xxl-6"> - <%= block_component_edit :image %> - </div> - <div class="col-xxl-6"> - <%= block_component_edit :alt, - label: t('admin.communication.blocks.components.image.alt.label'), - placeholder: t('admin.communication.blocks.components.image.alt.placeholder') %> - <%= block_component_edit :credit, - label: t('admin.communication.blocks.components.image.credit.label'), - placeholder: t('admin.communication.blocks.components.image.credit.placeholder'), - summernote_config: 'link' %> - </div> - </div> + <%= block_component_edit :image %> + <%= block_component_edit :alt, + label: t('admin.communication.blocks.components.image.alt.label'), + placeholder: t('admin.communication.blocks.components.image.alt.placeholder') %> + <%= block_component_edit :credit, + label: t('admin.communication.blocks.components.image.credit.label'), + placeholder: t('admin.communication.blocks.components.image.credit.placeholder'), + summernote_config: 'link' %> </div> </div> -- GitLab