Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

# Conflicts:
#	@salix/crud/src/crud.js
#	@salix/crud/src/customer/routes.js

@salix/app/src/app.js

@@ -5,5 +5,6 @@ import * as routes from './configroutes';
 import padding from './styles/layout.css'
 import margin from './styles/margin.scss'
 import layout from './styles/padding.scss'
+import background from './styles/background.scss'
 
 bootstrap();

@salix/app/src/styles/background.scss

@@ -0,0 +1,27 @@
+@import "colors";
+
+$bg-main: $color-green;
+$bg-minor: $color-orange;
+$bg-content: $color-light-grey;
+$bg-panel: $color-white;
+$bg-dark-bar: $color-black;
+$bg-dark-menu: $color-dark-grey;
+
+html [bg-main], .bg-main {
+  background-color: $bg-main;
+}
+html [bg-minor], .bg-minor {
+  background-color: $bg-minor;
+}
+html [bg-content], .bg-content {
+  background-color: $bg-content;
+}
+html [bg-panel], .bg-panel {
+  background-color: $bg-panel;
+}
+html [bg-dark-bar], .bg-dark-bar {
+   background-color: $bg-dark-bar;
+}
+html [bg-dark-menu], .bg-dark-menu {
+  background-color: darken($bg-dark-menu, 35%);
+}

@salix/app/src/styles/colors.scss

@@ -0,0 +1,7 @@
+
+$color-green: rgb(139,195,74);
+$color-orange: rgb(255,171,64);
+$color-dark-grey: #424242;
+$color-light-grey: gray;
+$color-white: white;
+$color-black: black;

@salix/app/src/styles/font-family.css

@@ -0,0 +1,24 @@
+@font-face {
+    font-family: roboto-italic;
+    src: url(./fonts/Roboto-Italic.ttf);
+}
+@font-face {
+    font-family: roboto-thin;
+    src: url(./fonts/Roboto-Thin.ttf);
+}
+@font-face {
+    font-family: roboto-regular;
+    src: url(./fonts/Roboto-Regular.ttf);
+}
+@font-face {
+    font-family: roboto-condensed-italic;
+    src: url(./fonts/Roboto-CondensedItalic.ttf);
+}
+@font-face {
+    font-family: roboto-bold;
+    src: url(./fonts/Roboto-Bold.ttf);
+}
+@font-face {
+    font-family: roboto-bold-condensed;
+    src: url(./fonts/Roboto-BoldCondensed.ttf);
+}

@salix/crud/src/crud.js

@@ -13,6 +13,8 @@ export {NAME as CUSTOMER_DESCRIPTOR,
 export {NAME as CUSTOMER_ACTIONS,
 	COMPONENT as CUSTOMER_ACTIONS_COMPONENT} from './customer/edit/actions';
 
+export {NAME as CUSTOMER_WEB_CLIENT_INDEX,
+	COMPONENT as CUSTOMER_WEB_CLIENT_INDEX_COMPONENT} from './customer/webclient';
 
 export {NAME as NAVIGATION_INDEX,
     COMPONENT as NAVIGATION_INDEX_COMPONENT} from './navigation/index';

@salix/crud/src/customer/routes.js

@@ -25,5 +25,14 @@
     module: 'crud',
     description: '',
     image: '',
+},
+{
+    url: '/customer/webclient',
+    state: 'customer-web-client',
+    template: '<customer-web-client vn-one></customer-web-client>',
+    module: 'crud',
+    description: '',
+    image: ''
 }
+
 ]

@salix/crud/src/customer/webclient/index.html

@@ -0,0 +1,14 @@
+<vn-vertical  full-height pad-medium>
+    <vn-one>
+        <h2>CLIENTE_acceso web</h2>
+    </vn-one>
+    <vn-two>
+        <vn-check label="Acceso web activo" name="accesoweb" model="customer.activo"></vn-check>
+    </vn-two>
+    <vn-three>
+        <vn-textfield label="USUARIO" model="customer.user"></vn-textfield>
+    </vn-three>
+    <vn-four>
+        <vn-button text="Generar Contraseña"  class="colored"></vn-button>
+    </vn-four>
+</vn-vertical>

@salix/crud/src/customer/webclient/index.js

@@ -0,0 +1,8 @@
+import template from './index.html';
+import {module} from '../../module';
+
+export const NAME = 'customerWebClient';
+export const COMPONENT = {
+    template: template
+};
+module.component(NAME, COMPONENT);