From 6349fa7f27de2055818b776e4a33fd177a2ef2c1 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Mon, 30 May 2016 18:25:39 +0200
Subject: [PATCH] Better alignment for items in sidebar

---
 pixelegg/css/mobile.css                  | 20 ++++++++++++--------
 pixelegg/css/pixelegg.css                | 20 ++++++++++++--------
 pixelegg/less/etemplate2.less            |  7 ++++---
 pixelegg/less/layout_raster_sidebar.less | 12 ++++++------
 pixelegg/mobile/fw_mobile.css            | 20 ++++++++++++--------
 5 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 08e1bac7bf..28521c97ba 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -782,11 +782,14 @@
     background-image: url(../images/personal.png);
     background-size: 12px 12px;
     background-position: 0 0;
+    margin-right: 9px;
+    margin-left: 2px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item a div.sideboxstar {
     width: 3px;
     height: 11px;
-    margin-left: 3px;
+    margin-left: 5px;
+    margin-right: 10px;
     background-image: url(../images/bullet.png);
     background-size: 12px 12px;
     background-position: 0 0;
@@ -795,7 +798,8 @@
   .sidebox-favorites ul.favorites li.ui-menu-item img {
     width: 12px;
     height: 12px;
-    margin-left: 4px;
+    margin-left: 5px;
+    margin-right: 10px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item [data-id="blank"] div.ui-icon-heart {
     background-image: url(../images/trash.png);
@@ -4045,7 +4049,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu {
   position: absolute;
-  top: 0px;
+  top: 3px;
   bottom: 4px;
   left: 4px;
   right: 8px;
@@ -4080,7 +4084,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header h1 {
   margin: 0 0 10px 0;
-  padding-top: 0.31em;
+  padding-top: 0.4em;
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
@@ -4121,7 +4125,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active img {
   padding-left: 9px;
-  padding-top: 6px;
+  padding-top: 7px;
   height: 18px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 {
@@ -4360,7 +4364,7 @@ td.message span.message {
   height: 30px;
   position: relative;
   z-index: 1;
-  top: 4px;
+  top: 5px;
   margin-top: 0;
   margin-bottom: -30px;
   float: right;
@@ -4392,8 +4396,8 @@ td.message span.message {
   position: absolute;
   left: 0;
   top: -9px;
-  width: 12px;
-  height: 3px;
+  width: 10px;
+  height: 2px;
   background-color: #606060;
   backface-visibility: hidden;
   border-radius: 2px;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 8fb10a2c98..cba1bca223 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -771,11 +771,14 @@
     background-image: url(../images/personal.png);
     background-size: 12px 12px;
     background-position: 0 0;
+    margin-right: 9px;
+    margin-left: 2px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item a div.sideboxstar {
     width: 3px;
     height: 11px;
-    margin-left: 3px;
+    margin-left: 5px;
+    margin-right: 10px;
     background-image: url(../images/bullet.png);
     background-size: 12px 12px;
     background-position: 0 0;
@@ -784,7 +787,8 @@
   .sidebox-favorites ul.favorites li.ui-menu-item img {
     width: 12px;
     height: 12px;
-    margin-left: 4px;
+    margin-left: 5px;
+    margin-right: 10px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item [data-id="blank"] div.ui-icon-heart {
     background-image: url(../images/trash.png);
@@ -4034,7 +4038,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu {
   position: absolute;
-  top: 0px;
+  top: 3px;
   bottom: 4px;
   left: 4px;
   right: 8px;
@@ -4069,7 +4073,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header h1 {
   margin: 0 0 10px 0;
-  padding-top: 0.31em;
+  padding-top: 0.4em;
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
@@ -4110,7 +4114,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active img {
   padding-left: 9px;
-  padding-top: 6px;
+  padding-top: 7px;
   height: 18px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 {
@@ -4349,7 +4353,7 @@ td.message span.message {
   height: 30px;
   position: relative;
   z-index: 1;
-  top: 4px;
+  top: 5px;
   margin-top: 0;
   margin-bottom: -30px;
   float: right;
@@ -4381,8 +4385,8 @@ td.message span.message {
   position: absolute;
   left: 0;
   top: -9px;
-  width: 12px;
-  height: 3px;
+  width: 10px;
+  height: 2px;
   background-color: #606060;
   backface-visibility: hidden;
   border-radius: 2px;
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 72200e15e2..be278d7c9b 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -732,13 +732,14 @@ div.header_row_right{
 
 
                                                 // Heart
-                                                div.ui-icon-heart {background-image: url(../images/personal.png); background-size: 12px 12px;background-position: 0 0;}
+                                                div.ui-icon-heart {background-image: url(../images/personal.png); background-size: 12px 12px;background-position: 0 0;margin-right:9px;margin-left:2px;}
 
                                                 // Bulltpoints
                                                 div.sideboxstar {
                                                                 width: 3px;
                                                                 height: 11px;
-                                                                margin-left: 3px;
+                                                                margin-left: 5px;
+																margin-right: 10px;
                                                                 background-image: url(../images/bullet.png);
                                                                 background-size: 12px 12px;
                                                                 background-position: 0 0;
@@ -748,7 +749,7 @@ div.header_row_right{
                                              }
 
                                        // Aktuelle Ansicht als Favorit
-                                       img {.dimension_width_height_xs; margin-left: 4px;}
+                                       img {.dimension_width_height_xs; margin-left: 5px;margin-right:10px;}
 
                                        // Filter aufheben
                                        [data-id="blank"]{
diff --git a/pixelegg/less/layout_raster_sidebar.less b/pixelegg/less/layout_raster_sidebar.less
index 3834a833dc..ee7e3e2e8f 100644
--- a/pixelegg/less/layout_raster_sidebar.less
+++ b/pixelegg/less/layout_raster_sidebar.less
@@ -35,7 +35,7 @@
     //SIDE AREA
     #egw_fw_sidemenu {
         position: absolute;
-        top: 0px;
+        top: 3px;
         bottom: 4px;
         left: 4px;
         right: 8px;
@@ -79,7 +79,7 @@
 
                                             h1 {
                                                 margin: 0 0 10px 0;
-                                                padding-top: 0.31em;
+                                                padding-top: 0.4em;
                                                 padding-left: 3em;
                                                 .color_40_gray;
                                                 /*font-size: 12px;*/
@@ -118,7 +118,7 @@
                 height: 33px;
 
 
-                img {padding-left: 9px; padding-top: 6px; height: 18px;}
+                img {padding-left: 9px; padding-top: 7px; height: 18px;}
 
                 h1 {text-transform: uppercase;font-size: 1.4em;.color_100_gray;padding-top: .8em;}
 
@@ -332,7 +332,7 @@
 		height: 30px;
 		position: relative;
 		z-index: 1;
-		top: 4px;
+		top: 5px;
 		margin-top: 0;
 		margin-bottom: -30px;
 		float: right;
@@ -353,8 +353,8 @@
 				position: absolute;
 				left: 0;
 				top: -9px;
-				width:12px;
-				height: 3px;
+				width:10px;
+				height: 2px;
 				background-color: #606060;
 				backface-visibility: hidden;
 				border-radius: 2px;
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index e45e5d089d..45737618cc 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -793,11 +793,14 @@
     background-image: url(../images/personal.png);
     background-size: 12px 12px;
     background-position: 0 0;
+    margin-right: 9px;
+    margin-left: 2px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item a div.sideboxstar {
     width: 3px;
     height: 11px;
-    margin-left: 3px;
+    margin-left: 5px;
+    margin-right: 10px;
     background-image: url(../images/bullet.png);
     background-size: 12px 12px;
     background-position: 0 0;
@@ -806,7 +809,8 @@
   .sidebox-favorites ul.favorites li.ui-menu-item img {
     width: 12px;
     height: 12px;
-    margin-left: 4px;
+    margin-left: 5px;
+    margin-right: 10px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item [data-id="blank"] div.ui-icon-heart {
     background-image: url(../images/trash.png);
@@ -4056,7 +4060,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu {
   position: absolute;
-  top: 0px;
+  top: 3px;
   bottom: 4px;
   left: 4px;
   right: 8px;
@@ -4091,7 +4095,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header h1 {
   margin: 0 0 10px 0;
-  padding-top: 0.31em;
+  padding-top: 0.4em;
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
@@ -4132,7 +4136,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active img {
   padding-left: 9px;
-  padding-top: 6px;
+  padding-top: 7px;
   height: 18px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 {
@@ -4371,7 +4375,7 @@ td.message span.message {
   height: 30px;
   position: relative;
   z-index: 1;
-  top: 4px;
+  top: 5px;
   margin-top: 0;
   margin-bottom: -30px;
   float: right;
@@ -4403,8 +4407,8 @@ td.message span.message {
   position: absolute;
   left: 0;
   top: -9px;
-  width: 12px;
-  height: 3px;
+  width: 10px;
+  height: 2px;
   background-color: #606060;
   backface-visibility: hidden;
   border-radius: 2px;