From a71d0ed8bc39f425580b697dd13b7258aa2dbf6a Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 21 Nov 2017 14:22:30 +0100
Subject: [PATCH 1/2] border radius en scss

---
 client/client/src/notes/style.css   |  3 -
 client/salix/src/styles/border.scss | 96 +++++++++++++++--------------
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/client/client/src/notes/style.css b/client/client/src/notes/style.css
index 4d0f8eba7..e69de29bb 100644
--- a/client/client/src/notes/style.css
+++ b/client/client/src/notes/style.css
@@ -1,3 +0,0 @@
-.notes-date {
-    font-family: raleway-bold;
-}
\ No newline at end of file
diff --git a/client/salix/src/styles/border.scss b/client/salix/src/styles/border.scss
index 3eb08176d..bd046c559 100644
--- a/client/salix/src/styles/border.scss
+++ b/client/salix/src/styles/border.scss
@@ -1,45 +1,51 @@
-@import "colors";
-
-$border-color: #AAA;
-$border-thin: 1px;
-$border-thick: 2px;
-
-html [border-none], .border-none {
-    border: 0;
-}
-
-/* Solid border */
-
-html [border-solid], .border-solid {
-    border: $border-thin solid $border-color;
-}
-html [border-solid-top], .border-solid-top {
-    border-top: $border-thin solid $border-color;
-}
-html [border-solid-left], .border-solid-left {
-    border-left: $border-thin solid $border-color;
-}
-html [border-solid-right], .border-solid-right {
-    border-right: $border-thin solid $border-color;
-}
-html [border-solid-bottom], .border-solid-bottom {
-    border-bottom: $border-thin solid $border-color;
-}
-
-/* Dashed border */
-
-html [border-dashed], .border-dashed {
-    border: $border-thin dashed $border-color;
-}
-html [border-dashed-top], .border-dashed-top {
-    border-top: $border-thin dashed $border-color;
-}
-html [border-dashed-left], .border-dashed-left {
-    border-left: $border-thin dashed $border-color;
-}
-html [border-dashed-right], .border-dashed-right {
-    border-right: $border-thin dashed $border-color;
-}
-html [border-dashed-bottom], .border-dashed-bottom {
-    border-bottom: $border-thin dashed $border-color;
-}
+@import "colors";
+
+$border-color: #AAA;
+$border-thin: 1px;
+$border-thick: 2px;
+
+html [border-none], .border-none {
+    border: 0;
+}
+
+/* Solid border */
+
+html [border-solid], .border-solid {
+    border: $border-thin solid $border-color;
+}
+html [border-solid-top], .border-solid-top {
+    border-top: $border-thin solid $border-color;
+}
+html [border-solid-left], .border-solid-left {
+    border-left: $border-thin solid $border-color;
+}
+html [border-solid-right], .border-solid-right {
+    border-right: $border-thin solid $border-color;
+}
+html [border-solid-bottom], .border-solid-bottom {
+    border-bottom: $border-thin solid $border-color;
+}
+
+/* Dashed border */
+
+html [border-dashed], .border-dashed {
+    border: $border-thin dashed $border-color;
+}
+html [border-dashed-top], .border-dashed-top {
+    border-top: $border-thin dashed $border-color;
+}
+html [border-dashed-left], .border-dashed-left {
+    border-left: $border-thin dashed $border-color;
+}
+html [border-dashed-right], .border-dashed-right {
+    border-right: $border-thin dashed $border-color;
+}
+html [border-dashed-bottom], .border-dashed-bottom {
+    border-bottom: $border-thin dashed $border-color;
+}
+
+/* Border Radius */
+
+html [border-radius], .border-radius {
+    border-radius: .3em;
+}
\ No newline at end of file

From 26920bb1240238327db0f2f413fcf9fbac0f0472 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 21 Nov 2017 14:22:59 +0100
Subject: [PATCH 2/2] =?UTF-8?q?adaptacion=20de=20border=20radius=20y=20not?=
 =?UTF-8?q?es=20con=20nuevo=20dise=C3=B1o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/client/src/addresses/addresses.html |  2 +-
 client/client/src/notes/notes.html         | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/client/src/addresses/addresses.html b/client/client/src/addresses/addresses.html
index 0b44f7946..c79d56ff7 100644
--- a/client/client/src/addresses/addresses.html
+++ b/client/client/src/addresses/addresses.html
@@ -6,7 +6,7 @@
                 <vn-title vn-one>Addresses</vn-title>
             </vn-horizontal>
             <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}">
                     <vn-horizontal style="align-items: center;">
                         <vn-none pad-medium-h style="color:#FFA410;">
diff --git a/client/client/src/notes/notes.html b/client/client/src/notes/notes.html
index ecea1d668..5eefb9981 100644
--- a/client/client/src/notes/notes.html
+++ b/client/client/src/notes/notes.html
@@ -1,13 +1,19 @@
 <vn-card ng-show="$ctrl.observations.length" pad-medium>
     <vn-vertical pad-large>
         <vn-title>Notes</vn-title>
-        <vn-horizontal ng-repeat="n in $ctrl.observations" margin-small-bottom style="align-items: center;">
-            <vn-auto style="border-radius: .3em;" class="pad-small border-solid">
-                <div class="notes-date">{{::n.created | date:'dd/MM/yyyy HH:mm'}}</div>
-                <div class="notes-date">{{::n.employee.name}}</div>
-                <div>{{::n.text}}</div>
-            </vn-auto>
-        </vn-horizontal>
+        <vn-one 
+                ng-repeat="n in $ctrl.observations" 
+                pad-small border-solid
+                border-radius
+                margin-small-bottom style="align-items: center;">
+            <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>
+                <b>{{::n.text}}</b> 
+            </vn-horizontal>
+        </vn-one>
     </vn-vertical>
 </vn-card>
 <vn-float-button