From 22829aa218e2df52dee5f902bdba8c5b3bd39cf4 Mon Sep 17 00:00:00 2001 From: Dani Herrero Date: Tue, 11 Jul 2017 14:28:53 +0200 Subject: [PATCH] =?UTF-8?q?nuevos=20iconos=20de=20m=C3=B3dulos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/client/routes.json | 2 +- client/production/routes.json | 2 +- client/production/src/locale/es.json | 1 + client/salix/src/components/home/home.html | 13 ++++---- client/salix/src/components/home/style.scss | 28 ++++++++++-------- .../src/components/main-menu/main-menu.html | 18 ++++------- .../salix/src/components/main-menu/style.scss | 24 +++++++++------ services/nginx/.gitignore | 3 +- services/nginx/static/images/icon_client.png | Bin 0 -> 13350 bytes .../nginx/static/images/icon_production.png | Bin 0 -> 8068 bytes 10 files changed, 49 insertions(+), 42 deletions(-) create mode 100644 services/nginx/static/images/icon_client.png create mode 100644 services/nginx/static/images/icon_production.png diff --git a/client/client/routes.json b/client/client/routes.json index 488c6c1048..fc931bd3fc 100644 --- a/client/client/routes.json +++ b/client/client/routes.json @@ -1,7 +1,7 @@ { "module": "client", "name": "Clients", - "icon": "person", + "icon": "/static/images/icon_client.png", "validations" : true, "routes": [ { diff --git a/client/production/routes.json b/client/production/routes.json index a99b910a37..77c111ab82 100644 --- a/client/production/routes.json +++ b/client/production/routes.json @@ -1,7 +1,7 @@ { "module": "production", "name": "Production", - "icon": "group_work", + "icon": "/static/images/icon_production.png", "validations" : false, "routes": [ { diff --git a/client/production/src/locale/es.json b/client/production/src/locale/es.json index 32bd658972..0cf5acba55 100644 --- a/client/production/src/locale/es.json +++ b/client/production/src/locale/es.json @@ -1,5 +1,6 @@ { "Finder" : "Localizador", + "Production" : "Producción", "Error: No tickets selected!" : "Error: ¡No hay tickets seleccionados!", "Error: Action not implemented!" : "Error: ¡Acción no implementada!", "State" : "Estado", diff --git a/client/salix/src/components/home/home.html b/client/salix/src/components/home/home.html index ddb636ee41..c79a78a778 100644 --- a/client/salix/src/components/home/home.html +++ b/client/salix/src/components/home/home.html @@ -3,15 +3,18 @@
- - + + + + + + +

- - - + \ No newline at end of file diff --git a/client/salix/src/components/home/style.scss b/client/salix/src/components/home/style.scss index 732f8752a5..135f5d461e 100644 --- a/client/salix/src/components/home/style.scss +++ b/client/salix/src/components/home/style.scss @@ -19,11 +19,23 @@ vn-home { .vn-module{ display: flex; flex: none; - padding: 2em; margin: 10px; - border-radius: 4px; - box-sizing: border-box; - transition: opacity 0.7s ease; + background-color: #FF9300; + color: white; + + overflow:hidden; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + + .home__icon{ + width: 150px; + height: 150px; + img { + max-width: 50%; + margin-top: 20px; + } + } h4{ text-transform: capitalize; font-size: 16pt; @@ -40,14 +52,6 @@ vn-home { opacity: 0.7; } - &.Clients{ - background-color: #ffa410; - color: #ffffff; - } - &.Production{ - background-color: #95d600; - color: #ffffff; - } } } diff --git a/client/salix/src/components/main-menu/main-menu.html b/client/salix/src/components/main-menu/main-menu.html index 075b91ef79..a85bebb7c3 100644 --- a/client/salix/src/components/main-menu/main-menu.html +++ b/client/salix/src/components/main-menu/main-menu.html @@ -4,18 +4,10 @@ -