From 1da1ac2fd803f79702eeb951a255d7e2955217c6 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 28 Jun 2017 17:53:19 +0200
Subject: [PATCH] Fix extra right margin on mail right splitter

---
 mail/templates/default/app.css   | 5 +++++
 mail/templates/mobile/app.css    | 8 +++++---
 mail/templates/pixelegg/app.css  | 8 +++++---
 mail/templates/pixelegg/app.less | 7 +------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index ff1d6a844d..b20b52de8d 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -281,6 +281,10 @@ pre {
 #mail-index {
 	position: relative
 }
+/*Keeps the scrollbar in the window in Firefox*/
+#mail-index	table.egwGridView_outer {
+	-moz-margin-end: 10px;
+}
 .mail-index_quotabox {
 	display: inline-block;
 }
@@ -492,6 +496,7 @@ div.mail-compose_fileselector {
 }
 #mail-index_toolbar {
 	padding: 0px;
+	height: 35px;
 }
 #mail-index_toolbar > button > span {
 	padding: .2em .4em;
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index a71e0085e2..867ae31aaa 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -289,6 +289,10 @@ pre {
 #mail-index {
   position: relative;
 }
+/*Keeps the scrollbar in the window in Firefox*/
+#mail-index table.egwGridView_outer {
+  -moz-margin-end: 10px;
+}
 .mail-index_quotabox {
   display: inline-block;
 }
@@ -506,6 +510,7 @@ div.mail-compose_fileselector {
 }
 #mail-index_toolbar {
   padding: 0px;
+  height: 35px;
 }
 #mail-index_toolbar > button > span {
   padding: .2em .4em;
@@ -938,9 +943,6 @@ body {
 #mail-index div#mail-index_nm div.nextmatch_header div.filters select {
   margin-top: 9px;
 }
-#mail-index div#mail-index_nm .egwGridView_outer {
-  margin-right: 10px;
-}
 #mail-index div#mail-index_nm tr.mail td img {
   max-height: 50px;
   -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 303800e3e4..6a94edc0af 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -277,6 +277,10 @@ pre {
 #mail-index {
   position: relative;
 }
+/*Keeps the scrollbar in the window in Firefox*/
+#mail-index table.egwGridView_outer {
+  -moz-margin-end: 10px;
+}
 .mail-index_quotabox {
   display: inline-block;
 }
@@ -494,6 +498,7 @@ div.mail-compose_fileselector {
 }
 #mail-index_toolbar {
   padding: 0px;
+  height: 35px;
 }
 #mail-index_toolbar > button > span {
   padding: .2em .4em;
@@ -926,9 +931,6 @@ body {
 #mail-index div#mail-index_nm div.nextmatch_header div.filters select {
   margin-top: 9px;
 }
-#mail-index div#mail-index_nm .egwGridView_outer {
-  margin-right: 10px;
-}
 #mail-index div#mail-index_nm tr.mail td img {
   max-height: 50px;
   -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index b206403638..aaa8b4ca16 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -76,12 +76,7 @@ body {
 				select {margin-top: 9px;}
 			} // Ende Filter
 		} // Ende Header
-
-		// Keeps the scrollbar in the window in Firefox
-		.egwGridView_outer {
-			margin-right: 10px;
-		}
-
+		
 		// Bilder in den Listen
 		tr.mail td img {
 			max-height: 50px;