From a11e9ec4ae94d6f05ffd80953b886cf261ea5f99 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 31 May 2016 12:56:38 -0600
Subject: [PATCH] Get column padding / spacing with scrollbar sorted out

---
 pixelegg/css/mobile.css          | 7 ++++---
 pixelegg/css/pixelegg.css        | 7 ++++---
 pixelegg/less/layout_raster.less | 1 -
 pixelegg/less/layout_table.less  | 9 +++++----
 pixelegg/mobile/fw_mobile.css    | 7 ++++---
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 28521c97ba..709b4fb6d3 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -3589,7 +3589,6 @@ td.message span.message {
 }
 .egwGridView_scrollarea {
   width: 100%;
-  overflow-y: scroll;
   overflow-x: hidden;
 }
 /**
@@ -5238,7 +5237,7 @@ table.egwGridView_outer thead {
 table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
-  padding: 3px 0 3px 4px;
+  padding: 3px 1px 3px 4px;
   border-color: #B4B4B4;
   border-left: 0px solid transparent;
   border-top: 0px solid transparent;
@@ -5353,10 +5352,12 @@ table.egwGridView_grid tbody tr.focused {
   background-repeat: repeat;
 }
 table.egwGridView_grid tbody td {
-  padding: 3px 0 3px 3px;
   border-bottom: 1px solid #E6E6E6;
   color: #000000;
 }
+table.egwGridView_grid tbody td .innerContainer {
+  padding: 3px 0 3px 3px;
+}
 table.egwGridView_grid tbody td table.customfields tbody {
   border-bottom: 0px;
 }
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index cba1bca223..1496ad6c58 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -3578,7 +3578,6 @@ td.message span.message {
 }
 .egwGridView_scrollarea {
   width: 100%;
-  overflow-y: scroll;
   overflow-x: hidden;
 }
 /**
@@ -5227,7 +5226,7 @@ table.egwGridView_outer thead {
 table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
-  padding: 3px 0 3px 4px;
+  padding: 3px 1px 3px 4px;
   border-color: #B4B4B4;
   border-left: 0px solid transparent;
   border-top: 0px solid transparent;
@@ -5342,10 +5341,12 @@ table.egwGridView_grid tbody tr.focused {
   background-repeat: repeat;
 }
 table.egwGridView_grid tbody td {
-  padding: 3px 0 3px 3px;
   border-bottom: 1px solid #E6E6E6;
   color: #000000;
 }
+table.egwGridView_grid tbody td .innerContainer {
+  padding: 3px 0 3px 3px;
+}
 table.egwGridView_grid tbody td table.customfields tbody {
   border-bottom: 0px;
 }
diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less
index 87845487d7..366ba29076 100644
--- a/pixelegg/less/layout_raster.less
+++ b/pixelegg/less/layout_raster.less
@@ -36,7 +36,6 @@
 
 .egwGridView_scrollarea {
     width: 100%;
-    overflow-y: scroll;
     overflow-x: hidden;
 }
 
diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less
index 9a003e71a6..a71ea3975e 100755
--- a/pixelegg/less/layout_table.less
+++ b/pixelegg/less/layout_table.less
@@ -80,7 +80,7 @@ table.egwGridView_outer{
                 background-position: -200px;
 
                 font-weight: normal;
-                padding: 3px 0 3px 4px;
+                padding: 3px 1px 3px 4px;
                 border-color: @gray_30;
                 border-left: 0px solid transparent;
                 border-top: 0px solid transparent;
@@ -222,11 +222,12 @@ table.egwGridView_grid{
 
      td {
 
-         // maybe problem width width + height calc
-        padding: 3px 0 3px 3px;
         border-bottom: 1px solid @gray_10;
         color: @gray_100;
-
+		.innerContainer {
+			// Needs to be innerContainer to avoid problem width width + height calc
+		   padding: 3px 0 3px 3px;
+		}
         // Custom fields
         table.customfields{
                 tbody{
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 45737618cc..ac09d43502 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -3600,7 +3600,6 @@ td.message span.message {
 }
 .egwGridView_scrollarea {
   width: 100%;
-  overflow-y: scroll;
   overflow-x: hidden;
 }
 /**
@@ -5249,7 +5248,7 @@ table.egwGridView_outer thead {
 table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
-  padding: 3px 0 3px 4px;
+  padding: 3px 1px 3px 4px;
   border-color: #B4B4B4;
   border-left: 0px solid transparent;
   border-top: 0px solid transparent;
@@ -5364,10 +5363,12 @@ table.egwGridView_grid tbody tr.focused {
   background-repeat: repeat;
 }
 table.egwGridView_grid tbody td {
-  padding: 3px 0 3px 3px;
   border-bottom: 1px solid #E6E6E6;
   color: #000000;
 }
+table.egwGridView_grid tbody td .innerContainer {
+  padding: 3px 0 3px 3px;
+}
 table.egwGridView_grid tbody td table.customfields tbody {
   border-bottom: 0px;
 }