From e8786649e3163793ad8cec082d5eb412b77ff076 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 13 Mar 2015 12:05:15 +0000
Subject: [PATCH] Fix couple of glitches in mobile theme: - Fix extra gap
 between topmenu icons - Shows no print button - Resize sidebox

---
 pixelegg/css/mobile.css                     | 44 ++++++++------------
 pixelegg/css/mobile.less                    | 46 +++++++++------------
 pixelegg/templates/pixelegg/head_mobile.tpl |  2 -
 3 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index dee8be6f16..47c50a5a0d 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -6335,22 +6335,6 @@ a.textSidebox {
   #egw_fw_basecontainer #egw_fw_top_toolbar div.egw_fw_ui_tabs_header span h1 {
     display: none;
   }
-  #egw_fw_basecontainer div#egw_fw_logout {
-    left: 310px;
-    top: 20px;
-    width: 24px;
-    height: 24px;
-    background-size: 24px 24px;
-    z-index: 1;
-  }
-  #egw_fw_basecontainer div#egw_fw_print {
-    left: 268px;
-    top: 20px;
-    width: 24px;
-    height: 24px;
-    background-size: 24px 24px;
-    z-index: 1;
-  }
   #egw_fw_basecontainer .egw_fw_top_toolbar > div:hover {
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
     -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -6381,7 +6365,7 @@ a.textSidebox {
     box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items {
-    width: 250px;
+    width: 280px;
     display: inline;
     float: left;
     position: fixed;
@@ -6397,13 +6381,23 @@ a.textSidebox {
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul li {
     display: -webkit-inline-box;
     display: -moz-inline-box;
-    padding-right: 0.5em;
+    padding: 2px;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul li:hover {
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
     box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   }
+  #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_logout:before {
+    content: "";
+    background-image: url(../images/logout.png);
+    background-repeat: no-repeat;
+    width: 32px;
+    height: 32px;
+    background-size: 30px 30px;
+    display: inline-block;
+    background-position: center;
+  }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home:before {
     content: " ";
     background-image: url(../images/topmenu_items/mobile/home.png);
@@ -6422,6 +6416,7 @@ a.textSidebox {
     height: 32px;
     background-size: 32px 32px;
     display: inline-block;
+    background-position: center;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs:active {
     -webkit-transform: rotate(180deg);
@@ -6435,6 +6430,7 @@ a.textSidebox {
     background-size: 32px 32px;
     background-image: url(../images/topmenu_items/mobile/access.png);
     display: inline-block;
+    background-position: center;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_cats:before {
     background-image: url(../images/topmenu_items/mobile/category.png);
@@ -6444,6 +6440,7 @@ a.textSidebox {
     height: 32px;
     background-size: 32px 32px;
     display: inline-block;
+    background-position: center;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password:before {
     background-image: url(../images/topmenu_items/mobile/password.png);
@@ -6453,6 +6450,7 @@ a.textSidebox {
     height: 32px;
     background-size: 32px 32px;
     display: inline-block;
+    background-position: center;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_manual:before {
     background-image: url(../images/topmenu_items/mobile/help.png);
@@ -6471,11 +6469,7 @@ a.textSidebox {
     height: 32px;
     background-size: 32px 32px;
     display: inline-block;
-  }
-  #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_search:active {
-    transform: scale(-2);
-    -webkit-transform: scale(-2);
-    -webkit-transition: 1s ease;
+    background-position: center;
   }
   .egw_fw_ui_tabs_header {
     margin: 0px 0 0 0;
@@ -6963,9 +6957,7 @@ a.textSidebox {
   .sidebar-toggle #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active h1 {
     display: none;
   }
-  .sidebar-toggle #egw_fw_logout,
-  .sidebar-toggle #egw_fw_topmenu_items,
-  .sidebar-toggle #egw_fw_print {
+  .sidebar-toggle #egw_fw_topmenu_items {
     display: none !important;
   }
   .tabs-header-portrait-collapsed {
diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index 874876402d..970b7aa78f 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -132,25 +132,7 @@
 				}
 			}
 		}
-		//FW Logout
-		div#egw_fw_logout{
-			left: 310px;
-			top: 20px;
-			width: 24px;
-			height: 24px;
-			background-size: 24px 24px;
-			z-index: 1;
-		}
 
-		//FW Print
-		div#egw_fw_print{
-			left: 268px;
-			top: 20px;
-			width: 24px;
-			height: 24px;
-			background-size: 24px 24px;
-			z-index: 1;
-		}
 		.egw_fw_top_toolbar>div:hover{
 			-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 			-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -184,7 +166,7 @@
 			box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 		}
 		div#egw_fw_topmenu_items{
-			width: 250px;
+			width: 280px;
 			display: inline;
 			float: left;
 			position: fixed;
@@ -198,13 +180,25 @@
 				li{
 					display: -webkit-inline-box;
 					display: -moz-inline-box;
-					padding-right: 0.5em;
+					padding:2px;
 					&:hover {
 						-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 						-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
 						box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
 					}
 				}
+				a#topmenu_logout{
+					&:before {
+						content: "";
+						background-image: url(../images/logout.png);
+						background-repeat: no-repeat;
+						width: 32px;
+						height: 32px;
+						background-size: 30px 30px;
+						display: inline-block;
+						background-position: center;
+					}
+				}
 				a#topmenu_home:before {
 					content: " ";
 					background-image: url(../images/topmenu_items/mobile/home.png);
@@ -224,6 +218,7 @@
 						height: 32px;
 						background-size: 32px 32px;
 						display: inline-block;
+						background-position: center;
 					}
 					&:active {
 						-webkit-transform:rotate(180deg);
@@ -239,6 +234,7 @@
 					background-size: 32px 32px;
 					background-image: url(../images/topmenu_items/mobile/access.png);
 					display: inline-block;
+					background-position: center;
 				}
 
 				a#topmenu_cats:before {
@@ -249,6 +245,7 @@
 					height: 32px;
 					background-size: 32px 32px;
 					display: inline-block;
+					background-position: center;
 				}
 				a#topmenu_password:before {
 					background-image: url(../images/topmenu_items/mobile/password.png);
@@ -258,6 +255,7 @@
 					height: 32px;
 					background-size: 32px 32px;
 					display: inline-block;
+					background-position: center;
 				}
 
 				a#topmenu_manual:before {
@@ -279,11 +277,7 @@
 						height: 32px;
 						background-size: 32px 32px;
 						display: inline-block;
-					}
-					&:active {
-						transform: scale(-2);
-						-webkit-transform:scale(-2);
-						-webkit-transition: 1s ease;
+						background-position: center;
 					}
 				}
 			}
@@ -717,7 +711,7 @@
 				}
 			}
 		}
-		#egw_fw_logout, #egw_fw_topmenu_items, #egw_fw_print{
+		#egw_fw_topmenu_items {
 			display:none !important;
 		}
 	}
diff --git a/pixelegg/templates/pixelegg/head_mobile.tpl b/pixelegg/templates/pixelegg/head_mobile.tpl
index 39161be2a6..0413f66f71 100644
--- a/pixelegg/templates/pixelegg/head_mobile.tpl
+++ b/pixelegg/templates/pixelegg/head_mobile.tpl
@@ -28,8 +28,6 @@
 		{hook_after_navbar}
 		<div id="egw_fw_basecontainer">
 			<div id="egw_fw_top_toolbar">
-				<div id="egw_fw_logout" title="{title_logout}" data-logout-url="{link_logout}"></div>
-				<div id="egw_fw_print" title="{title_print}"></div>
 				<div id="egw_fw_topmenu_items">{topmenu_items}</div>
 				<div id="egw_fw_menu" title="{title_menu}">
 					<audio id="egw_fw_menuAudioTag" autobuffer="autobuffer">