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

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Daniel Herrero 2017-11-21 14:52:13 +01:00
parent 8af0959d08 26920bb124
commit cf4c208eea
4 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
<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-one style="border-radius: .5em;" class="pad-small border-solid" <vn-one border-radius 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;">

18
client/client/src/notes/notes.html
View File

@ -1,13 +1,19 @@
<vn-card ng-show="$ctrl.observations.length" pad-medium> <vn-card ng-show="$ctrl.observations.length" pad-medium>
<vn-vertical pad-large> <vn-vertical pad-large>
<vn-title>Notes</vn-title> <vn-title>Notes</vn-title>
<vn-horizontal ng-repeat="n in $ctrl.observations" margin-small-bottom style="align-items: center;"> <vn-one
<vn-auto style="border-radius: .3em;" class="pad-small border-solid"> ng-repeat="n in $ctrl.observations"
<div class="notes-date">{{::n.created | date:'dd/MM/yyyy HH:mm'}}</div> pad-small border-solid
<div class="notes-date">{{::n.employee.name}}</div> border-radius
<div>{{::n.text}}</div> margin-small-bottom style="align-items: center;">
</vn-auto> <vn-horizontal>
<vn-one >{{::n.employee.name}} {{::n.employee.surname}}</vn-one>
<vn-auto>{{::n.created | date:'dd/MM/yyyy HH:mm'}}</vn-auto>
</vn-horizontal> </vn-horizontal>
<vn-horizontal>
<b>{{::n.text}}</b>
</vn-horizontal>
</vn-one>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-float-button <vn-float-button

3
client/client/src/notes/style.css
View File

@ -1,3 +0,0 @@
.notes-date {
font-family: raleway-bold;
}

6
client/salix/src/styles/border.scss
View File

@ -43,3 +43,9 @@ html [border-dashed-right], .border-dashed-right {
html [border-dashed-bottom], .border-dashed-bottom { html [border-dashed-bottom], .border-dashed-bottom {
border-bottom: $border-thin dashed $border-color; border-bottom: $border-thin dashed $border-color;
} }
/* Border Radius */
html [border-radius], .border-radius {
border-radius: .3em;
}