fixed accidental merge during testing

TonyGermaneri · Dec 3, 2016 · 603e17c · 603e17c
1 parent 725e340
commit 603e17c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -1381,10 +1381,10 @@ define([], function context() {
         }
         function attachCss() {
             var styleSheet, css = [
-                '.canvas-datagrid-scrollBox { overflow: auto; z-index: 1!important; }',
-                '.canvas-datagrid { box-sizing: border-box!important; padding: 0!important; background: <backgroundColor>;}',
-                '.canvas-datagrid-edit-input { box-sizing: content-box!important; outline: none; margin: 0; padding: 0 0 0 <editCellPaddingLeft>px;',
-                'font-size: <editCellFontSize>; font-family: <editCellFontFamily>; }',
+                '.canvas-datagrid-scrollBox { overflow: auto!important; z-index: 1!important; }',
+                '.canvas-datagrid { box-sizing: content-box!important; padding: 0!important; background: <backgroundColor>;}',
+                '.canvas-datagrid-edit-input { box-sizing: content-box!important; outline: none!important; margin: 0!important; padding: 0 0 0 <editCellPaddingLeft>px!important;',
+                'font-size: <editCellFontSize>!important; font-family: <editCellFontFamily>!important; }',
                 '.canvas-datagrid-context-menu-item { margin: <contextMenuItemMargin>; border-radius: <contextMenuItemBorderRadius>; }',
                 '.canvas-datagrid-context-menu-item:hover { background: <contextMenuHoverBackground>;',
                 ' color: <contextMenuHoverColor>; margin: <contextMenuItemMargin>; }',

diff --git a/sample/main.js b/sample/main.js
@@ -33,8 +33,8 @@ document.addEventListener('DOMContentLoaded', function () {
     document.body.style.background = 'black';
     document.body.style.margin = '0';
     function resize() {
-        parentNode.style.height = window.innerHeight - 100 + 'px';
-        parentNode.style.width = window.innerWidth - 100  + 'px';
+        parentNode.style.height = window.innerHeight + 'px';
+        parentNode.style.width = window.innerWidth  + 'px';
     }
     resize();
     window.addEventListener('resize', resize);