diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index a98c5c391..e5d11c246 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -260,6 +260,8 @@ table.table-bordered { background-color: $gray-200; color: $gray-800; font-size: 90%; + box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px; + border-radius: 5px !important; p { margin-bottom: 0.75rem !important; diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index 221f4a147..bf4ad8463 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -8,11 +8,11 @@ .pop-item { border-radius: 10px !important; - box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px; - padding:2rem; - margin-left: auto; - margin-right: auto; - width: 97%; + box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px !important; + padding:1.7rem; + // margin-left: auto; + // margin-right: auto; + // width: 97%; } div.flex-bloc, @@ -44,6 +44,18 @@ div.flex-table { display: flex; @include border-collapse; padding: 1em; + border-radius: 5px !important; + box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px, rgba(0, 0, 0, 0.24) 0px 1px 2px, rgba(0, 0, 0, 0.24) 0px 1px 2px !important; + margin-left: auto; + margin-right: auto; + margin-top: .5rem; + width: 97%; + &:last-child { + margin-bottom: 1rem; + } + &:first-child { + margin-top:1rem; + } div.item-row { display: flex; diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss index a3f6d6116..20c6c6322 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss @@ -70,7 +70,7 @@ div.notification-show { box-shadow: rgba(0, 0, 0, 0.25) 0px 0.0625em 0.0625em, rgba(0, 0, 0, 0.25) 0px 0.125em 0.5em, rgba(255, 255, 255, 0.1) 0px 0px 0px 1px inset; padding: 1.5rem; border-radius: 5px; - border-left: $chill-yellow 5px solid; + border-left: $chill-yellow 10px solid; p:first-child { margin-bottom: 1rem; &::before { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index fba0516a7..4fd5789aa 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -226,16 +226,35 @@ div.banner { div.household-resume { display: flex; flex-direction: row; - align-items: center; + align-items: flex-start; + justify-content: space-between; + padding-left: 1rem; + padding-right:1rem; div.col-address { font-size: 120%; - padding-left: 1em; - + padding: 1rem; + border-radius: 5px; + border: 1px dotted tint-color($chill-accourse-context, 10%); + border-left: 1px dotted tint-color($chill-accourse-context, 10%); + border-right: 1px dotted tint-color($chill-accourse-context, 10%); + div.address-box { + width: 100%; + justify-content: flex-start; + align-items: flex-start; + display: flex; + i { + font-size: 200%; + margin-right: 2rem; + margin-top: 2rem; + margin-left: 1rem; + } + } } div.col-comment { //padding: 0; margin-bottom: 1rem; + width: 50%; display: flex; flex-direction: column; > * > * { diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index 7ba2235a6..2f3ca8722 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -19,12 +19,14 @@

{{ 'Address'|trans }}

- - {% if address is empty %} -

{{ 'household.Household does not have any address currently'|trans }}

- {% else %} - {{ address|chill_entity_render_box({'multiline': true, 'extended_infos': true }) }} - {% endif %} +
+ + {% if address is empty %} +

{{ 'household.Household does not have any address currently'|trans }}

+ {% else %} + {{ address|chill_entity_render_box({'multiline': true, 'extended_infos': true }) }} + {% endif %} +
-
- {% if form is null %} - {% set currentComposition = household.currentComposition %} - {% if currentComposition is not null %} -
-
- {{ currentComposition.householdCompositionType.label|localize_translatable_string }} -
-

- {{ 'household_composition.numberOfChildren children in household'|trans({'numberOfChildren': currentComposition.numberOfChildren}) }} -

-

- {{ 'household_composition.Since'|trans({'startDate': currentComposition.startDate}) }} -

-
    +
    + {% if form is null %} + {% set currentComposition = household.currentComposition %} + {% if currentComposition is not null %} +
    +
    + {{ currentComposition.householdCompositionType.label|localize_translatable_string }} +
    +

    + {{ 'household_composition.numberOfChildren children in household'|trans({'numberOfChildren': currentComposition.numberOfChildren}) }} +

    +

    + {{ 'household_composition.Since'|trans({'startDate': currentComposition.startDate}) }} +

    + +
    + {% else %} + - {% else %} -
    -

    - {{ 'household_composition.Currently no composition'|trans }} -

    - -
    - {% endif %} - {% if household.waitingForBirth or not household.commentMembers.isEmpty() %} -
    - {% if household.waitingForBirth %} - - {% if household.waitingForBirthDate is not null %} - {{ 'household.Expecting for birth on date'|trans({ 'date': household.waitingForBirthDate|format_date('long') }) }} - {% else %} - {{ 'household.Expecting for birth'|trans }} - {% endif %} - {% endif %} - - {% if not household.commentMembers.isEmpty() %} - {{ household.commentMembers|chill_entity_render_box }} - {% endif %} -
    - {% endif %} - - {% if not household.commentMembers.isEmpty() %} - - {{ 'household.Edit comment and expecting birth'|trans }} - - {% else %} - - {{ 'household.New comment and expecting birth'|trans }} - - {% endif %} - - {% else %} - - {{ form_start(form) }} -
    - {{ form_widget(form.waitingForBirth) }}
    -
    - {{ form_widget(form.waitingForBirthDate) }} -
    -
    - {{ form_widget(form.commentMembers) }} -
    -
      -
    • - -
    • -
    - {{ form_end(form) }} {% endif %} -
    + {% if household.waitingForBirth or not household.commentMembers.isEmpty() %} +
    + {% if household.waitingForBirth %} + + {% if household.waitingForBirthDate is not null %} + {{ 'household.Expecting for birth on date'|trans({ 'date': household.waitingForBirthDate|format_date('long') }) }} + {% else %} + {{ 'household.Expecting for birth'|trans }} + {% endif %} + {% endif %} + + {% if not household.commentMembers.isEmpty() %} + {{ household.commentMembers|chill_entity_render_box }} + {% endif %} +
    + {% endif %} + + {% if not household.commentMembers.isEmpty() %} + + {{ 'household.Edit comment and expecting birth'|trans }} + + {% else %} + + {{ 'household.New comment and expecting birth'|trans }} + + {% endif %} + + {% else %} + + {{ form_start(form) }} +
    + {{ form_widget(form.waitingForBirth) }} +
    +
    + {{ form_widget(form.waitingForBirthDate) }} +
    +
    + {{ form_widget(form.commentMembers) }} +
    +
      +
    • + +
    • +
    + {{ form_end(form) }} + {% endif %} +

{{ 'household.Household members'|trans }}

@@ -153,7 +155,7 @@ {% endif %} {% if not (p == '_none' and members|length == 0 and old_members|length == 0) %} -
+
{% if p != '_none' %}

{{ p.label|localize_translatable_string }} {% if false == p.shareHousehold %}