diff --git a/public/build.json b/public/build.json index f25bd3d674..62037e6f4a 100644 --- a/public/build.json +++ b/public/build.json @@ -138,7 +138,7 @@ }, { "public/js/slickgrid.min.js": [ - "lib/public/js/lib/slickgrid/jquery.event.drag.min.js", + "lib/public/js/lib/slickgrid/jquery.event.drag.js", "lib/public/js/lib/slickgrid/plugins/slick.cellrangedecorator.js", "lib/public/js/lib/slickgrid/plugins/slick.cellrangeselector.js", "lib/public/js/lib/slickgrid/plugins/slick.cellselectionmodel.js", diff --git a/public/js/lib/slickgrid/jquery.event.drag.min.js b/public/js/lib/slickgrid/jquery.event.drag.js old mode 100644 new mode 100755 similarity index 99% rename from public/js/lib/slickgrid/jquery.event.drag.min.js rename to public/js/lib/slickgrid/jquery.event.drag.js index 1cda0e2166..f2c1d57e6d --- a/public/js/lib/slickgrid/jquery.event.drag.min.js +++ b/public/js/lib/slickgrid/jquery.event.drag.js @@ -178,7 +178,7 @@ drag = $special.drag = { case !dd.dragging && 'touchmove': event.preventDefault(); case !dd.dragging && 'mousemove': - // drag tolerance, x² + y² = distance² + // drag tolerance, x≤ + y≤ = distance≤ if ( Math.pow( event.pageX-dd.pageX, 2 ) + Math.pow( event.pageY-dd.pageY, 2 ) < Math.pow( dd.distance, 2 ) ) break; // distance tolerance not reached event.target = dd.target; // force target from "mousedown" event (fix distance issue) diff --git a/public/js/lib/slickgrid/slick-default-theme.css b/public/js/lib/slickgrid/slick-default-theme.css index 3752fae91b..094259e1c9 100644 --- a/public/js/lib/slickgrid/slick-default-theme.css +++ b/public/js/lib/slickgrid/slick-default-theme.css @@ -6,17 +6,16 @@ classes should alter those! */ .slick-header-columns { - background: url('../lib/js/lib/slickgrid/images/header-columns-bg.gif') repeat-x center bottom; + background-color: #f2f2f2; border-bottom: 1px solid silver; } .slick-header-column { - background: url('../lib/js/lib/slickgrid/images/header-columns-bg.gif') repeat-x center bottom; border-right: 1px solid silver; } .slick-header-column:hover, .slick-header-column-active { - background: white url('../lib/js/lib/slickgrid/images/header-columns-over-bg.gif') repeat-x center bottom; + background-color: #f5f5f5; } .slick-headerrow { @@ -46,8 +45,7 @@ classes should alter those! } .slick-cell { - padding-left: 4px; - padding-right: 4px; + padding: 0px 4px; } .slick-group { @@ -90,6 +88,10 @@ classes should alter those! background: #fafafa; } +.slick-row.odd .slick-cell { + background-color: #f9f9f9; +} + .slick-row.ui-state-active { background: #F5F7D7; }