From 491241398a60cd1b73fa6c935b2dcc173b14ea1c Mon Sep 17 00:00:00 2001 From: Dani Herrero Date: Thu, 8 Jun 2017 10:05:11 +0200 Subject: [PATCH] localizador y tooltip arreglo estilos --- client/core/src/tooltip/style.css | 5 ++--- client/core/src/tooltip/tooltip.js | 2 +- client/production/src/index/index.html | 26 +++++++++++++------------- client/production/src/index/index.js | 1 + client/production/src/index/style.scss | 4 +++- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/client/core/src/tooltip/style.css b/client/core/src/tooltip/style.css index a85131357..943a92c9c 100644 --- a/client/core/src/tooltip/style.css +++ b/client/core/src/tooltip/style.css @@ -7,10 +7,9 @@ background-color: #fff; padding: 15px; max-width: 250px; - color: #222; + color: #424242; z-index: 999; - border: 2px solid #A7A7A7; - border-radius: 5px; + border: 1px solid #A7A7A7; text-align: justify; } diff --git a/client/core/src/tooltip/tooltip.js b/client/core/src/tooltip/tooltip.js index e84836f6e..1ea5df24a 100644 --- a/client/core/src/tooltip/tooltip.js +++ b/client/core/src/tooltip/tooltip.js @@ -7,7 +7,7 @@ function tooltip($document, $compile) { restrict: 'A', scope: true, link: function(scope, element, attrs) { - var tip = $compile('
{{ text }}
')(scope); + var tip = $compile('
{{ text }}
')(scope); var tipClassName = 'tooltip'; var tipActiveClassName = 'tooltip-show'; diff --git a/client/production/src/index/index.html b/client/production/src/index/index.html index 9d9a62bf6..49c24f3bf 100644 --- a/client/production/src/index/index.html +++ b/client/production/src/index/index.html @@ -1,5 +1,5 @@ - + Localizador @@ -50,27 +50,27 @@ - + - + - + - {{::item.id}} - {{::item.agency.id}} - {{::item.employee.name}} - {{::item.hour}} - {{::item.state.name}} - {{::item.lines}} - {{::item.meters}} - {{::item.boxes}} + {{ticket.id}} + {{ticket.agency.id}} + {{ticket.employee.name}} + {{ticket.hour}} + {{ticket.state.name}} + {{ticket.lines}} + {{ticket.meters}} + {{ticket.boxes}} : - {{index.model.length}} + {{$ctrl.tickets.length}} diff --git a/client/production/src/index/index.js b/client/production/src/index/index.js index 73a40ed8b..a901c863c 100644 --- a/client/production/src/index/index.js +++ b/client/production/src/index/index.js @@ -5,6 +5,7 @@ export default class ProductionIndex { constructor() { this.model = {}; this.checkAll = false; + this.tickets = []; } search(index) { index.filter.search = this.model.search; diff --git a/client/production/src/index/style.scss b/client/production/src/index/style.scss index b4013d510..0571afb44 100644 --- a/client/production/src/index/style.scss +++ b/client/production/src/index/style.scss @@ -3,7 +3,9 @@ vn-production-index { height: 20px; padding: 0 6px; } - + .icon-square{ + height: 36px; + } .list-header{ border-bottom: 3px solid #9D9D9D; font-weight: bold;