diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php index 821402618f..25dca8a36b 100644 --- a/components/Posting/Posting.php +++ b/components/Posting/Posting.php @@ -82,10 +82,10 @@ class Posting extends Component $request = $vars['request']; $form_params = [ + ['to', ChoiceType::class, ['label' => _m('To:'), 'multiple' => false, 'expanded' => false, 'choices' => $to_tags]], + ['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'multiple' => false, 'expanded' => false, 'data' => 'public', 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]], ['content', TextareaType::class, ['label' => _m('Content:'), 'data' => $initial_content, 'attr' => ['placeholder' => _m($placeholder)]]], ['attachments', FileType::class, ['label' => _m('Attachments:'), 'data' => null, 'multiple' => true, 'required' => false]], - ['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'multiple' => false, 'expanded' => false, 'data' => 'public', 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]], - ['to', ChoiceType::class, ['label' => _m('To:'), 'multiple' => false, 'expanded' => false, 'choices' => $to_tags]], ]; if (count($available_content_types) > 1) { $form_params[] = ['content_type', ChoiceType::class, diff --git a/public/assets/css/base.css b/public/assets/css/base.css index 79dd755a97..8a436a37f7 100644 --- a/public/assets/css/base.css +++ b/public/assets/css/base.css @@ -5,11 +5,6 @@ html { scroll-margin-top: 3rem; } -* { - max-width: 100%; - max-height: 100%; -} - *:focus { -webkit-box-shadow: inset 0 0 0 3px var(--bg3); -moz-box-shadow: inset 0 0 0 3px var(--bg3); @@ -483,7 +478,6 @@ hr { margin-bottom: var(--medium-size); box-shadow: var(--shadow); - color: var(--white); } @@ -557,10 +551,6 @@ hr { font-size: var(--main-size); } -.section-form-label { - margin-bottom: 1.62px; -} - .form-group { all: unset; @@ -569,6 +559,11 @@ hr { margin-bottom: 6px; } +.form-group textarea { + height: 7rem; + max-height: 100%; +} + .help-block { margin-bottom: 6px; } @@ -593,24 +588,6 @@ hr { margin-bottom: 6px; } -.section-form-options { - display: block !important; - margin-bottom: var(--unit-size); -} - -.section-form-textarea { - border-radius: var(--unit-size); - background-color: var(--translucent); - color: var(--white); - - width: 100%; - max-width: 100%; - height: calc(6 * var(--main-size)); - - border: 2px solid transparent; - resize: vertical; -} - /* PROFILE */ .profile { display: flex; diff --git a/public/assets/css/reset.css b/public/assets/css/reset.css index ce9aac4b53..0f9ac612ed 100644 --- a/public/assets/css/reset.css +++ b/public/assets/css/reset.css @@ -228,6 +228,8 @@ select, button, textarea, input { + display: inline-block; + overflow: hidden; font-size: inherit !important; color: var(--white); diff --git a/templates/right/view.html.twig b/templates/right/view.html.twig index 5b31d94986..fd5e90c735 100644 --- a/templates/right/view.html.twig +++ b/templates/right/view.html.twig @@ -21,25 +21,10 @@
- {{ form_start(post_form) }} - - {{ form_row(post_form.to, {'attr': {'class': 'section-form-scope'}}) }} - - {{ form_row(post_form.visibility, {'attr': {'class': 'section-form-scope'}}) }} - - {{ form_row(post_form.content, {'attr': {'class': 'section-form-textarea'}}) }} - - - - {{ form_row(post_form.post_note, {'attr': {'class': 'section-form-send'}}) }} - - {{ form_end(post_form) }} + {{ form(post_form) }}
- {% endif %} {% set current_path = app.request.get('_route') %}