From b10012f4dad9cf6cd0b085ac6be32ab80a072892 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 8 Jul 2021 15:03:59 +0200 Subject: [PATCH] minor swing --- .../public/modules/bootstrap/_custom.scss | 14 +++++----- .../Resources/public/scss/chillmain.scss | 5 ++++ .../Resources/views/Person/edit.html.twig | 28 +++++++++---------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss index ae7d3d40b..908cefc53 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss @@ -30,12 +30,6 @@ h1, h2, .h1, .h2 { } form { - fieldset { - margin-top: 1em; - & > legend { - @include title_in_form; - } - } /* avoid useless html in first level of the custom fields row loop in forms * (better should to improve the loop) */ @@ -49,6 +43,12 @@ form { } } } + fieldset { + margin-top: 1em; + & > legend { + @include title_in_form; + } + } label { display: inline; &.required:after { @@ -224,7 +224,7 @@ div.banner { div.header-details { div.row > div:first-child { @media (min-width: 576px) { - margin-left: 1.5em; + //margin-left: 1.5em; } } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index 2aed2258b..b1011de96 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -15,6 +15,11 @@ * Specific rules */ +.custom_field_no_data, +.chill-no-data-statement { + font-style: italic; +} + // styles communs pour tous les bandeaux div.banner { .id-number { diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig index fd6baa846..9a30b8fcc 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig @@ -92,31 +92,31 @@

{{ 'Contact information'|trans }}

{%- if form.email is defined -%} -
- {{ form_row(form.email, {'label': 'Email'}) }} -
-
- {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }} -
+
+ {{ form_row(form.email, {'label': 'Email'}) }} +
+
+ {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }} +
{%- endif -%} {%- if form.phonenumber is defined -%} - {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }} + {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }} {%- endif -%} {%- if form.mobilenumber is defined -%} -
- {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }} -
-
- {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }} -
+
+ {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }} +
+
+ {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }} +
{%- endif -%} {%- if form.otherPhoneNumbers is defined -%} {{ form_widget(form.otherPhoneNumbers) }} {{ form_errors(form.otherPhoneNumbers) }} {%- endif -%} {%- if form.contactInfo is defined -%} - {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }} + {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }} {%- endif -%}
{%- endif -%}