verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

eliminacion del style vn-empty, ahora se llama vn-auto

This commit is contained in:
Javi Gallego 2017-11-21 12:44:28 +01:00
parent 78eda1c70e
commit 52cbd1a870
6 changed files with 120 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/client/src/addresses/addresses.html
View File

@ -6,24 +6,24 @@
<vn-title vn-one>Addresses</vn-title> <vn-title vn-one>Addresses</vn-title>
</vn-horizontal> </vn-horizontal>
<vn-horizontal ng-repeat="i in index.model track by i.id" class="pad-medium-top" style="align-items: center;"> <vn-horizontal ng-repeat="i in index.model track by i.id" class="pad-medium-top" style="align-items: center;">
<vn-auto style="border-radius: .5em;" class="pad-small border-solid" <vn-one style="border-radius: .5em;" class="pad-small border-solid"
ng-class="{'bg-dark-item': i.isDefaultAddress,'bg-opacity-item': !i.isEnabled && !i.isDefaultAddress}"> ng-class="{'bg-dark-item': i.isDefaultAddress,'bg-opacity-item': !i.isEnabled && !i.isDefaultAddress}">
<vn-horizontal style="align-items: center;"> <vn-horizontal style="align-items: center;">
<vn-none pad-medium-h style="color:#FFA410;"> <vn-none pad-medium-h style="color:#FFA410;">
<i class="material-icons" ng-if="i.isDefaultAddress">star</i> <i class="material-icons" ng-if="i.isDefaultAddress">star</i>
<i class="material-icons pointer" ng-if="!i.isDefaultAddress&&i.isEnabled" vn-tooltip="Set as default" tooltip-position="left" ng-click="$ctrl.setDefault(i.id)">star_border</i> <i class="material-icons pointer" ng-if="!i.isDefaultAddress&&i.isEnabled" vn-tooltip="Set as default" tooltip-position="left" ng-click="$ctrl.setDefault(i.id)">star_border</i>
</vn-none> </vn-none>
<vn-auto> <vn-one>
<div><b>{{::i.consignee}}</b></div> <div><b>{{::i.consignee}}</b></div>
<div>{{::i.street}}</div> <div>{{::i.street}}</div>
<div>{{::i.city}}, {{::i.province}}</div> <div>{{::i.city}}, {{::i.province}}</div>
<div>{{::i.phone}}, {{::i.mobile}}</div> <div>{{::i.phone}}, {{::i.mobile}}</div>
</vn-auto> </vn-one>
<a vn-empty ui-sref="clientCard.addresses.edit({addressId: {{i.id}}})"> <a vn-auto ui-sref="clientCard.addresses.edit({addressId: {{i.id}}})">
<vn-icon-button icon="edit"></vn-icon-button> <vn-icon-button icon="edit"></vn-icon-button>
</a> </a>
</vn-horizontal> </vn-horizontal>
</vn-auto> </vn-one>
</vn-horizontal> </vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>

8
client/client/src/card/card.html
View File

@ -4,15 +4,15 @@
actions="$ctrl.client = edit.model" actions="$ctrl.client = edit.model"
options="mgEdit"> options="mgEdit">
</mg-ajax> </mg-ajax>
<vn-empty style="min-width: 18em; padding-left: 1em; padding-bottom: 1em;"> <vn-auto style="min-width: 18em; padding-left: 1em; padding-bottom: 1em;">
<vn-descriptor <vn-descriptor
client="$ctrl.client" client="$ctrl.client"
active="$ctrl.client.active" active="$ctrl.client.active"
class="display-block" > class="display-block" >
</vn-descriptor> </vn-descriptor>
<vn-left-menu></vn-left-menu> <vn-left-menu></vn-left-menu>
</vn-empty>
<vn-auto>
<vn-vertical style="max-width: 70em; margin: 0 auto;" ui-view></vn-vertical>
</vn-auto> </vn-auto>
<vn-one>
<vn-vertical style="max-width: 70em; margin: 0 auto;" ui-view></vn-vertical>
</vn-one>
</vn-horizontal> </vn-horizontal>

2
client/client/src/index/index.html
View File

@ -3,7 +3,7 @@
<div style="max-width: 40em; margin: 0 auto;"> <div style="max-width: 40em; margin: 0 auto;">
<vn-card> <vn-card>
<vn-horizontal pad-medium> <vn-horizontal pad-medium>
<vn-searchbar vn-auto <vn-searchbar vn-one
index="index" index="index"
on-search="$ctrl.search(index)" on-search="$ctrl.search(index)"
advanced="true" advanced="true"

4
client/route/src/card/card.html
View File

@ -4,7 +4,7 @@
actions="$ctrl.route = edit.model" actions="$ctrl.route = edit.model"
options="mgEdit"> options="mgEdit">
</mg-ajax> </mg-ajax>
<vn-empty style="min-width: 18em; padding-left: 1em; padding-bottom: 1em;"> <vn-one style="min-width: 18em; padding-left: 1em; padding-bottom: 1em;">
<vn-card> <vn-card>
<vn-vertical class="margin-medium" pad-medium-top pad-medium-bottom> <vn-vertical class="margin-medium" pad-medium-top pad-medium-bottom>
<vn-horizontal> <vn-horizontal>
@ -19,7 +19,7 @@
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-left-menu></vn-left-menu> <vn-left-menu></vn-left-menu>
</vn-empty> </vn-one>
<vn-auto> <vn-auto>
<vn-vertical style="max-width: 70em; margin: 0 auto;" ui-view></vn-vertical> <vn-vertical style="max-width: 70em; margin: 0 auto;" ui-view></vn-vertical>
</vn-auto> </vn-auto>

4
client/salix/src/components/app/app.html
View File

@ -1,12 +1,12 @@
<vn-vertical full-height class="bg-content"> <vn-vertical full-height class="bg-content">
<vn-topbar vn-empty> <vn-topbar vn-auto>
<a ui-sref="home" title="{{'Home' | translate}}"> <a ui-sref="home" title="{{'Home' | translate}}">
<img class="logo" src="./logo.svg" alt="Logo" ></img> <img class="logo" src="./logo.svg" alt="Logo" ></img>
</a> </a>
<vn-spinner enable="$root.loading"></vn-spinner> <vn-spinner enable="$root.loading"></vn-spinner>
<vn-main-menu></vn-main-menu> <vn-main-menu></vn-main-menu>
</vn-topbar> </vn-topbar>
<vn-vertical vn-auto ui-view scrollable class="main-view"> <vn-vertical vn-one ui-view scrollable class="main-view">
<vn-home></vn-home> <vn-home></vn-home>
</vn-vertical> </vn-vertical>
<vn-snackbar vn-id="snackbar"></vn-snackbar> <vn-snackbar vn-id="snackbar"></vn-snackbar>

4
client/salix/src/styles/layout.css
View File

@ -61,12 +61,8 @@ html [vn-twelve]{
flex-basis: 0.000000001px; flex-basis: 0.000000001px;
} }
html [vn-auto], vn-auto, .vn-auto { html [vn-auto], vn-auto, .vn-auto {
flex: 1;
flex-basis: auto; flex-basis: auto;
} }
html [vn-empty], vn-empty, .vn-empty {
display: block;
}
html [vn-none], vn-none, .vn-none { html [vn-none], vn-none, .vn-none {
flex: 1; flex: 1;
flex: none; flex: none;