From 1f86e3afc751fc9827a8d2b802c1e89506b15010 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 23 Oct 2015 17:08:40 +0000
Subject: [PATCH] remove fixed height from categories

---
 admin/templates/default/categories.index.xet |  2 +-
 admin/templates/pixelegg/app.css             |  4 +++-
 admin/templates/pixelegg/app.less            |  9 ++++-----
 pixelegg/css/mobile.css                      | 14 ++++++--------
 pixelegg/css/pixelegg.css                    |  5 +----
 pixelegg/less/etemplate2.less                |  5 +----
 6 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/admin/templates/default/categories.index.xet b/admin/templates/default/categories.index.xet
index 7312447376..12c387d8eb 100644
--- a/admin/templates/default/categories.index.xet
+++ b/admin/templates/default/categories.index.xet
@@ -68,7 +68,7 @@
 			</columns>
 			<rows>
 				<row>
-					<nextmatch id="nm" options="admin.categories.index.rows" span="all" header_right="admin.categories.index.right"/>
+					<nextmatch id="nm" options="admin.categories.index.rows" span="all" header_row="admin.categories.index.right"/>
 				</row>
 			</rows>
 		</grid>
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index 961f467d6a..4b83dbe027 100755
--- a/admin/templates/pixelegg/app.css
+++ b/admin/templates/pixelegg/app.css
@@ -33,11 +33,13 @@
  */
   iframe#admin-index_iframe {
     background-color: transparent;
-    /*.egwGridView_scrollarea { min-height: 500px;}*/
   }
   iframe#admin-index_iframe #admin-categories-index {
     padding: 10px;
   }
+  iframe#admin-index_iframe #admin-categories-index #admin-categories-index_add {
+    margin-top: -2px;
+  }
   iframe#admin-index_iframe table.egwGridView_grid tr td {
     color: #000;
   }
diff --git a/admin/templates/pixelegg/app.less b/admin/templates/pixelegg/app.less
index 0632bfb979..8136ceb446 100755
--- a/admin/templates/pixelegg/app.less
+++ b/admin/templates/pixelegg/app.less
@@ -58,13 +58,12 @@ iframe#admin-index_iframe{
 
      background-color: transparent;
 
-     /*.egwGridView_scrollarea { min-height: 500px;}*/
-
-
-
-
     #admin-categories-index{
 
+		#admin-categories-index_add {
+			margin-top: -2px;
+		}
+
         padding: 10px;
 
         table.et2_grid {
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 093e9ad14c..df566eeb1f 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -1318,9 +1318,6 @@
   iframe#admin-index_iframe {
     background-color: yellow;
   }
-  #admin-categories-index div.egwGridView_scrollarea {
-    min-height: 500px;
-  }
   table.egwGridView_grid img {
     /*filter grey*/
     /*filter grey*/
@@ -2196,6 +2193,7 @@ body {
  * @package pixelegg
  * @version $Id$
  */
+@import-once "def_colors.less";
 #socialMedia {
   position: relative;
   bottom: 20px;
@@ -4273,7 +4271,7 @@ td.message span.message {
   text-decoration: none;
   height: 32px;
   /*font-size: 1.1em;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 1.5em;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@@ -4297,7 +4295,7 @@ td.message span.message {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
   padding-right: 20px;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   content: " ";
   background-image: url(../images/topmenu_items/home.png);
   background-repeat: no-repeat;
@@ -4693,7 +4691,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@@ -4865,7 +4863,7 @@ td.message span.message {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 15px;
   line-height: 1em;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   background-image: url(../images/arrow_left.png);
   background-repeat: no-repeat;
   background-position: left center;
@@ -7059,7 +7057,7 @@ span.egw_tutorial_title {
     margin: 5px 0px 3px 5px;
     padding: 0px 0px 0px 15px;
     line-height: 1em;
-    font-size: 12.1px;
+    font-size: 12.100000000000001px;
     background-image: url(../images/arrow_left.png);
     background-repeat: no-repeat;
     background-position: left center;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 67037f8dad..b887db46f9 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -1307,9 +1307,6 @@
   iframe#admin-index_iframe {
     background-color: yellow;
   }
-  #admin-categories-index div.egwGridView_scrollarea {
-    min-height: 500px;
-  }
   table.egwGridView_grid img {
     /*filter grey*/
     /*filter grey*/
@@ -4683,7 +4680,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index acd637fefc..e35b0dedd1 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -1009,7 +1009,7 @@ button#admin-categories-index_add {
 
                                                     a{color: @gray_100;}
                                     }
-									
+
 
                                         a{
 
@@ -1265,9 +1265,6 @@ iframe#admin-index_iframe{
 
 
 
-        div.egwGridView_scrollarea { min-height: 500px;}
-
-
         table.et2_grid {
 
             #admin-categories-index_nm {