From d6d825ebf16fcc027944e8d89ec442758ed5bb33 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Thu, 19 Sep 2019 10:52:23 +0200
Subject: [PATCH] fixed automerge

---
 modules/client/front/address/index/index.html | 81 ++++++++-----------
 1 file changed, 35 insertions(+), 46 deletions(-)

diff --git a/modules/client/front/address/index/index.html b/modules/client/front/address/index/index.html
index b396b9da6..7abf9e676 100644
--- a/modules/client/front/address/index/index.html
+++ b/modules/client/front/address/index/index.html
@@ -18,52 +18,41 @@
                 ng-class="{
                     'item-hightlight': $ctrl.isDefaultAddress(address), 
                     'item-disabled': !address.isActive && !$ctrl.isDefaultAddress(address)
-                }"
-                translate-attr="{title: 'Edit address'}"
-                border-radius>
-                <vn-none
-                    pad-small-right
-                    ng-click="$ctrl.onStarClick($event)">
-                    <vn-icon-button
-                        icon="star"
-                        ng-if="$ctrl.isDefaultAddress(address)">
-                    </vn-icon-button>
-                    <vn-icon-button
-                        ng-if="!address.isActive && !$ctrl.isDefaultAddress(address)"
-                        icon="star_border"
-                        vn-tooltip="Active first to set as default">
-                    </vn-icon-button>
-                    <vn-icon-button
-                        ng-if="address.isActive && !$ctrl.isDefaultAddress(address)"
-                        icon="star_border"
-                        vn-tooltip="Set as default"
-                        ng-click="$ctrl.setDefault(address)">
-                    </vn-icon-button>
-                </vn-none>
-                <vn-one 
-                    style="overflow: hidden; min-width: 14em;">
-                    <div class="ellipsize"><b>{{::address.nickname}}</b></div>
-                    <div class="ellipsize" name="street">{{::address.street}}</div>
-                    <div class="ellipsize">{{::address.city}}, {{::address.province.name}}</div>
-                    <div class="ellipsize">
-                        {{::address.phone}}<span ng-if="::address.mobile">, </span>
-                        {{::address.mobile}}
-                    </div>
-                    <vn-check
-                        vn-one label="Is equalizated"
-                        field="address.isEqualizated"
-                        disabled="true">
-                    </vn-check>
-                </vn-one>
-                <vn-vertical
-                    vn-one
-                    ng-if="address.observations.length"
-                    border-solid-left
-                    pad-medium-h
-                    style="height: 6em; overflow: auto;">
-                    <vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'pad-small-top': $index}">
-                        <b>{{::observation.observationType.description}}:</b> 
-                        <span>{{::observation.description}}</span>
+                }">
+                <vn-horizontal style="align-items: center;">
+                    <vn-none pad-medium-h>
+                        <vn-icon-button
+                            icon="star"
+                            ng-if="$ctrl.isDefaultAddress(address)">
+                        </vn-icon-button>
+                        <vn-icon-button
+                            ng-if="!address.isActive && !$ctrl.isDefaultAddress(address)"
+                            icon="star_border"
+                            vn-tooltip="Active first to set as default">
+                        </vn-icon-button>                               
+                        <vn-icon-button
+                            ng-if="address.isActive && !$ctrl.isDefaultAddress(address)"
+                            icon="star_border"
+                            vn-tooltip="Set as default"
+                            ng-click="$ctrl.setDefault(address)">
+                        </vn-icon-button>
+                    </vn-none>
+                    <vn-one border-solid-right>
+                        <vn-horizontal>
+                            <vn-one>
+                                <div><b>{{::address.nickname}}</b></div>
+                                <div name="street">{{::address.street}}</div>
+                                <div>{{::address.city}}, {{::address.province}}</div>
+                                <div>{{::address.phone}}, {{::address.mobile}}</div>
+                            </vn-one>
+                            <vn-one>
+                                <vn-check
+                                    vn-one label="Is equalizated"
+                                    field="address.isEqualizated"
+                                    disabled="true">
+                                </vn-check> 
+                            </vn-one>
+                        </vn-horizontal>
                     </vn-one>
                     <vn-vertical vn-one pad-medium-h>
                         <vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'pad-small-top': $index}">