From 81726e0a09beebac9942fc79013be90e25fdee87 Mon Sep 17 00:00:00 2001 From: Dani Herrero Date: Tue, 11 Jul 2017 08:59:12 +0200 Subject: [PATCH] columnHeader change icon, style --- .../column-header.html} | 4 ++-- .../column-header.js} | 10 ++++----- client/core/src/components.js | 2 +- client/core/src/grid-header/style.scss | 6 ++--- .../production-table/production-table.html | 22 +++++++++---------- 5 files changed, 22 insertions(+), 22 deletions(-) rename client/core/src/{colum-header/colum-header.html => column-header/column-header.html} (68%) rename client/core/src/{colum-header/colum-header.js => column-header/column-header.js} (84%) diff --git a/client/core/src/colum-header/colum-header.html b/client/core/src/column-header/column-header.html similarity index 68% rename from client/core/src/colum-header/colum-header.html rename to client/core/src/column-header/column-header.html index 8472abe53..435057a19 100644 --- a/client/core/src/colum-header/colum-header.html +++ b/client/core/src/column-header/column-header.html @@ -4,8 +4,8 @@ {{::$ctrl.text}} - - + + diff --git a/client/core/src/colum-header/colum-header.js b/client/core/src/column-header/column-header.js similarity index 84% rename from client/core/src/colum-header/colum-header.js rename to client/core/src/column-header/column-header.js index ad9c57aad..b153f0987 100644 --- a/client/core/src/colum-header/colum-header.js +++ b/client/core/src/column-header/column-header.js @@ -1,6 +1,6 @@ import {module} from '../module'; -export default class ColumHeader { +export default class ColumnHeader { constructor() { this.order = undefined; this.mouseIsOver = false; @@ -22,10 +22,10 @@ export default class ColumHeader { return showArrow; } } -ColumHeader.$inject = []; +ColumnHeader.$inject = []; -module.component('vnColumHeader', { - template: require('./colum-header.html'), +module.component('vnColumnHeader', { + template: require('./column-header.html'), bindings: { field: '@?', text: '@?', @@ -34,6 +34,6 @@ module.component('vnColumHeader', { require: { gridHeader: '^^vnGridHeader' }, - controller: ColumHeader, + controller: ColumnHeader, transclude: true }); diff --git a/client/core/src/components.js b/client/core/src/components.js index 9e7b27ede..5694ae8f7 100644 --- a/client/core/src/components.js +++ b/client/core/src/components.js @@ -17,7 +17,7 @@ import './snackbar/snackbar'; import './tooltip/tooltip'; import './icon-menu/icon-menu'; import './drop-down/drop-down'; -import './colum-header/colum-header'; +import './column-header/column-header'; import './grid-header/grid-header'; import './multi-check/multi-check'; diff --git a/client/core/src/grid-header/style.scss b/client/core/src/grid-header/style.scss index 742c8e7d5..cc983dcf1 100644 --- a/client/core/src/grid-header/style.scss +++ b/client/core/src/grid-header/style.scss @@ -7,12 +7,12 @@ vn-grid-header { white-space: nowrap; justify-content: center; vn-none{ - min-width: 16px; + min-width: 17px; } } vn-icon{ - line-height: 16px; - font-size: 16px; + line-height: 17px; + font-size: 17px; margin: 0; padding: 0; display: inline; diff --git a/client/production/src/production-table/production-table.html b/client/production/src/production-table/production-table.html index 111b530c9..42a9e45ac 100644 --- a/client/production/src/production-table/production-table.html +++ b/client/production/src/production-table/production-table.html @@ -1,18 +1,18 @@ - + - - - - - - - - - - + + + + + + + + + +