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 4a569084f..ec2bfae95 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -87,6 +87,7 @@ div.flex-table { div.item-row { display: flex; flex-direction: row; + &:not(:first-child) { margin-top: 0.5em; border-top: 1px dotted $gray-900; @@ -100,13 +101,13 @@ div.flex-table { } &:last-child { flex-grow: 1; flex-shrink: 1; flex-basis: auto; + display: flex; justify-content: flex-end; - ul.record_actions { - margin: 0; - align-self: flex-start; flex-grow: 1; flex-shrink: 0; flex-basis: auto; + align-self: flex-start; + margin: 0; li { margin-right: 5px; } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss index 6be613ea3..ada9bce9d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss @@ -1,10 +1,12 @@ -/// complete and overwrite flex-table in chillmain.scss +/// overwrite flex-table +div.list-with-period { + div.flex-table div.item-row div.item-col:first-child { flex-basis: 33%; } +} + +/// div.list-with-period, div.list-household-members { - div.comment { - // for the comment for household-members - } div.periods { div.header, div.list-content { @@ -13,7 +15,7 @@ div.list-household-members { } div.header { position: relative; - a.sc-button { + a.btn { position: absolute; width: 30px; height: 30px; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue index eb611c9c1..9399f9245 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue @@ -22,8 +22,8 @@ class="item-bloc" v-bind:key="conc.person.id" > -
-
+
+
@@ -33,7 +33,7 @@
-
+
  • diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue index b55b6247c..e153373a1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue @@ -1,7 +1,7 @@