From 6d65b16223c7f3c6bc634723c7ef02aeb838db58 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 22 Nov 2013 05:28:19 +0000
Subject: [PATCH] latest pixelegg changes

---
 addressbook/templates/default/edit.xet   |   2 +-
 addressbook/templates/default/search.xet |  28 ++---
 addressbook/templates/pixelegg/app.css   | 124 +++++++---------------
 addressbook/templates/pixelegg/app.less  | 129 ++++++++++-------------
 infolog/templates/default/edit.xet       |  18 ++--
 infolog/templates/pixelegg/app.css       |  87 ++++++++-------
 infolog/templates/pixelegg/app.less      | 100 +++++++++++-------
 mail/templates/pixelegg/app.css          |  75 +++++++++----
 mail/templates/pixelegg/app.less         |  64 ++++++++---
 9 files changed, 329 insertions(+), 298 deletions(-)

diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 574e43b9b1..3e379f342a 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -629,7 +629,7 @@
 				</row>
 				<row disabled="@hidebuttons" class="dialog-footer-toolbar">
 					<hbox>
-						<button label="Edit" id="button[edit]" class="button_edit" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]'),'_blank','dependent=yes,width=900,height=560,scrollbars=yes,status=yes'); return false;" image="edit" background_image="1"  />
+						<button label="Edit" id="button[edit]" class="button_edit" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]'),'_blank','dependent=yes,width=900,height=560,scrollbars=yes,status=yes'); return false;" image="edit" background_image="1"/>
 						<button label="Copy" id="button[copy]" class="button_copy" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]&amp;makecp=1'),'_blank','dependent=yes,width=900,height=560,scrollbars=yes,status=yes'); return false;" image="copy" background_image="1"/>
 						<button statustext="download this contact as vCard file" label="vCard" id="button[vcard]" image="vcard" background_image="1"/>
 						<button accesskey="s" label="Save" id="button[save]" class="button_save" image="save" background_image="1"/>
diff --git a/addressbook/templates/default/search.xet b/addressbook/templates/default/search.xet
index 10ec16763d..8b48e5328b 100644
--- a/addressbook/templates/default/search.xet
+++ b/addressbook/templates/default/search.xet
@@ -14,7 +14,7 @@
 					<file id="upload_photo" class="photo" statustext="Select a portrait format jpeg photo. It will be resized to 60 pixel width."/>
 				</row>
 				<row>
-					<button label="Ok" align="center" onclick="jQuery('table.uploadphoto').css('display','none'); return false;"/>
+					<button label="Ok" image="check" background_image="1" align="center" onclick="jQuery('table.uploadphoto').css('display','none'); return false;" />
 				</row>
 			</rows>
 		</grid>
@@ -486,7 +486,7 @@
 					<radio options="tel_other,&amp;hearts;" id="tel_prefer" statustext="select phone number as prefered way of contact"/>
 				</row>
 				<row>
-					<button label="Ok" onclick="set_style_by_class('table','editphones','display','none'); if (window.hidephones) hidephones(this.form); return false;" span="all" align="center"/>
+					<button label="Ok" image="more" background_image="1" onclick="set_style_by_class('table','editphones','display','none'); if (window.hidephones) hidephones(this.form); return false;" span="all" align="center"/>
 				</row>
 			</rows>
 		</grid>
@@ -585,7 +585,7 @@
 									<row>
 										<description/>
 										<description/>
-										<button label="More ..." onclick="set_style_by_class('table','editphones','display','inline'); if (window.showphones) showphones(this.form); return false;" accesskey="m"/>
+										<button label="More ..." onclick="set_style_by_class('table','editphones','display','inline'); if (window.showphones) showphones(this.form); return false;" accesskey="m" image="more" background_image="1"/>
 										<description/>
 									</row>
 								</rows>
@@ -625,14 +625,14 @@
 						</groupbox>
 					</vbox>
 				</row>
-				<row disabled="@hidebuttons" class="footer-toolbar">
+				<row disabled="@hidebuttons" class="dialog-footer-toolbar">
 					<hbox>
-						<button label="Edit" id="button[edit]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]'),'_blank','dependent=yes,width=850,height=460,scrollbars=yes,status=yes'); return false;"/>
-						<button label="Copy" id="button[copy]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]&amp;makecp=1'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/>
-						<button label="vCard" id="button[vcard]" statustext="download this contact as vCard file"/>
-						<button label="Save" id="button[save]" accesskey="s"/>
-						<button label="Apply" id="button[apply]"/>
-						<button label="Cancel" id="button[cancel]" onclick="if($cont[view]0) return true; self.close(); return false;"/>
+						<button label="Edit" image="edit" background_image="1" id="button[edit]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]'),'_blank','dependent=yes,width=850,height=460,scrollbars=yes,status=yes'); return false;"/>
+						<button label="Copy" image="copy" background_image="1" id="button[copy]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$cont[id]&amp;makecp=1'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/>
+						<button label="vCard" image="vcard" background_image="1" id="button[vcard]" statustext="download this contact as vCard file"/>
+						<button label="Save" image="save" background_image="1" id="button[save]" accesskey="s"/>
+						<button label="Apply" image="appy" background_image="1" id="button[apply]"/>
+						<button label="Cancel" image="cancel" background_image="1" id="button[cancel]" onclick="if($cont[view]0) return true; self.close(); return false;"/>
 					</hbox>
 					<button label="Delete" id="button[delete]" onclick="return confirm('Are you shure you want to delete this contact?');" align="right" tabindex="25"/>
 				</row>
@@ -650,7 +650,7 @@
 					<template id="addressbook.edit"/>
 					<description/>
 				</row>
-				<row>
+				<row class="dialog-operators">
 					<hbox span="all">
 						<menulist>
 							<menupopup label="Operator" id="operator" no_lang="1"/>
@@ -660,10 +660,10 @@
 						</menulist>
 					</hbox>
 				</row>
-				<row class="footer-toolbar">
+				<row class="dialog-footer-toolbar">
 					<hbox span="all">
-						<button label="Search" id="button[search]"/>
-						<button label="Cancel" id="button[cancel]"/>
+						<button label="Search" id="button[search]" image="search" background_image="1"/>
+						<button label="Cancel" id="button[cancel]" image="cancel" background_image="1"/>
 					</hbox>
 				</row>
 			</rows>
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index bd54c91ffc..94e7d453ae 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -127,48 +127,6 @@ fieldset.emailGroup {
 div#addressbook-index {
   min-height: 700px;
   height: auto !important;
-  /*###########################
- Favoriten dropdown Field
-*/
-  /*definition in layout_nextmatch.less */
-  /*    div#addressbook-index_favorite_wrapper{
-        
-        top: 0px;
-        width: auto;
-
-        img{width: 16px;}
-
-        
-        
-        .et2_dropdown {
-
-                  button#addressbook-index_favorite{
-                                width: 18px;
-                    
-                                img{
-                                        width: 16px; 
-                                        text-align: left;
-                                        position: relative;
-                                        right: 20px;
-                                    }
-                }
-
-
-                .ui-state-default,
-                .ui-widget-content .ui-state-default,
-                .ui-widget-header .ui-state-default {
-                    width: 18px;
-                    .background-color-25-gray;
-                    color: #000;
-                    background-image: none !important;
-
-                }
-
-
-
-        }
-
-    } // Favoriten*/
 }
 div#addressbook-index div.et2_hbox_left {
   padding: 1em;
@@ -223,7 +181,7 @@ div#addressbook-index div.et2_hbox_right select.et2_selectbox:focus {
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #bfbfbf;
+  border-color: #b4b4b4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -309,14 +267,6 @@ div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover {
   border-radius: 3px;
   border-top-left-radius: 20px;
 }
-div#addressbook-index div.filters {
-  padding: 0 0 1em 1em;
-  background-color: #f0f0f0;
-  border-width: 0 0 1px 0;
-  border-color: #d9d9d9;
-  background-image: none;
-  padding-bottom: 1.5em;
-}
 div#addressbook-index div.filters select#infolog-index_cat_id {
   width: 10%;
   margin-left: 1em;
@@ -327,33 +277,6 @@ div#addressbook-index div.filters select#infolog-index_filter {
 div#addressbook-index div.filters select#infolog-index_filter2 {
   width: 10%;
 }
-div#addressbook-index div.filters input#infolog-index_search {
-  height: 20px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-color: #bfbfbf;
-  -webkit-box-shadow: 1px 2px 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);
-  width: auto;
-  margin: 0.5em 0em 0.5em 0;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-div#addressbook-index div.filters input#infolog-index_search:hover {
-  -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-  -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-  box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-}
-div#addressbook-index div.filters input#infolog-index_search:focus {
-  outline: 0;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #bfbfbf;
-  -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
-  box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
-}
 div#addressbook-index .filters #addressbook-index_cat_id {
   width: 7%;
 }
@@ -372,7 +295,10 @@ div#addressbook-index table.egwGridView_outer {
 #egw_fw_sidemenu select {
   margin-top: -5px;
 }
+/* ##################################################### */
+/* ##################################################### */
 /*State: Address selected*/
+/*ADD AREA*/
 #infolog-index_infolog-index-header_right .et2_box_widget {
   background-color: #0b5fa4 !important;
   color: #FFF;
@@ -385,8 +311,9 @@ div#addressbook-index table.egwGridView_outer {
   -moz-border-radius-topleft: 20px;
   border-radius: 3px;
   border-top-left-radius: 20px;
-  height: 32px;
+  height: auto;
   color: #ffffff;
+  font-size: 0.9em;
 }
 #infolog-index_infolog-index-header_right .et2_box_widget:before {
   content: "+";
@@ -406,6 +333,14 @@ div#addressbook-index table.egwGridView_outer {
   border-radius: 3px;
   border-top-left-radius: 20px;
 }
+#infolog-index_infolog-index-header_right .et2_box_widget span.et2_label {
+  color: #ffffff;
+  font-size: 0.9em;
+  padding-right: 11px;
+}
+#infolog-index_infolog-index-header_right .et2_box_widget img.et2_button {
+  margin-top: -15px;
+}
 /*State: address edit*/
 div#addressbook-edit,
 div#addressbook-search {
@@ -554,6 +489,20 @@ div#addressbook-edit fieldset.phoneGroup legend,
 div#addressbook-search fieldset.phoneGroup legend {
   text-transform: uppercase;
 }
+div#addressbook-edit fieldset.phoneGroup .fixedHeight,
+div#addressbook-search fieldset.phoneGroup .fixedHeight,
+div#addressbook-edit fieldset.phoneGroup .telNumbers,
+div#addressbook-search fieldset.phoneGroup .telNumbers {
+  height: auto;
+}
+div#addressbook-edit fieldset.phoneGroup .telNumbers,
+div#addressbook-search fieldset.phoneGroup .telNumbers {
+  white-space: nowrap;
+}
+div#addressbook-edit fieldset.phoneGroup td.telNumbers input,
+div#addressbook-search fieldset.phoneGroup td.telNumbers input {
+  width: 90%;
+}
 div#addressbook-edit fieldset.phoneGroup * img,
 div#addressbook-search fieldset.phoneGroup * img {
   display: none !important;
@@ -589,6 +538,10 @@ div#addressbook-search fieldset.emailGroup a.et2_url.url {
   background-size: 15px 15px;
   background-image: none;
 }
+div#addressbook-edit fieldset.emailGroup td input,
+div#addressbook-search fieldset.emailGroup td input {
+  width: 90%;
+}
 div#addressbook-edit fieldset.emailGroup * img,
 div#addressbook-search fieldset.emailGroup * img {
   display: none !important;
@@ -692,13 +645,6 @@ div.addressbook.edit.general table img:nth-child(2) {
   color: red;
   font-style: italic;
 }
-.fixedHeight,
-.telNumbers {
-  height: 30px;
-}
-.telNumbers {
-  white-space: nowrap;
-}
 .leftPad5 {
   padding-left: 5px;
 }
@@ -717,7 +663,7 @@ div.addressbook.edit.general table img:nth-child(2) {
   width: 60px;
 }
 .uploadphoto {
-  background-color: #FFFFFF;
+  background-color: #cdcdcd;
   border: 2px solid black;
   display: none;
   left: 48px;
@@ -725,6 +671,10 @@ div.addressbook.edit.general table img:nth-child(2) {
   position: absolute;
   top: 168px;
 }
+table.uploadphoto {
+  width: 360px !important;
+  background-color: #cdcdcd !important;
+}
 .checkAllArrow {
   padding-right: 5px;
 }
diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less
index 0dca6707fe..3638a69c29 100755
--- a/addressbook/templates/pixelegg/app.less
+++ b/addressbook/templates/pixelegg/app.less
@@ -80,59 +80,17 @@ div#addressbook-index{
             &:hover {.Complete_Button_add_hover;}
 
         }
+        
+        
+
+        
+        
 
     } // rechte Box
 
-/*###########################
- Favoriten dropdown Field
-*/
-    
-    /*definition in layout_nextmatch.less */
 
-/*    div#addressbook-index_favorite_wrapper{
-        
-        top: 0px;
-        width: auto;
-
-        img{width: 16px;}
-
-        
-        
-        .et2_dropdown {
-
-                  button#addressbook-index_favorite{
-                                width: 18px;
-                    
-                                img{
-                                        width: 16px; 
-                                        text-align: left;
-                                        position: relative;
-                                        right: 20px;
-                                    }
-                }
-
-
-                .ui-state-default,
-                .ui-widget-content .ui-state-default,
-                .ui-widget-header .ui-state-default {
-                    width: 18px;
-                    .background-color-25-gray;
-                    color: #000;
-                    background-image: none !important;
-
-                }
-
-
-
-        }
-
-    } // Favoriten*/
 
             div.filters {
-                        .nm_filters_rectangle;
-                        
-                        padding-bottom: 1.5em;
-
 
                 // 1 Filter
                 select#infolog-index_cat_id {width: 10%; margin-left: 1em;}
@@ -145,15 +103,7 @@ div#addressbook-index{
 
                 // Suchfeld
                 input#infolog-index_search {
-                    height: 20px;
-                    .Complete_Button_input;
-                    &:hover{
-                        .Complete_Button_input_hover;
-                    }
-                    &:focus{
-                        .Complete_Button_input_focus;
-                    }
-                }
+                  }
 
 
                 // Suchen Button
@@ -202,11 +152,6 @@ div#addressbook-index{
     // Bilder für Favoriten
 
     img.sideboxstar {
-        //	   background-image: url("../../../phpgwapi/templates/idots/images/orange-ball.png");
-        //				background-repeat: no-repeat;
-        //			    display: inline-block;
-        //			    margin: 0 1px;
-        //			    padding: 1px;
 
     }
 
@@ -215,24 +160,36 @@ div#addressbook-index{
 }
 
 
+/* ##################################################### */
+
 
 // Dialog Addressbuch bearbeiten und alle weiteren
-// #####################################################
+
+
+/* ##################################################### */
 
 /*State: Address selected*/
 
+
+/*ADD AREA*/
    #infolog-index_infolog-index-header_right{
        
        .et2_box_widget{
                 .Complete_Button_add;
-                height: 32px;
+                height: auto;
                 .color-0-gray; // white
-
+                font-size: 0.9em;
+                
                 &:hover {.Complete_Button_add_hover;}
+                
+                span.et2_label {color: @gray-0; font-size: 0.9em;padding-right: 11px;}
+                img.et2_button {margin-top: -15px;}
+                
                 }
-        }
+ }
 
-        
+
+ 
 /*State: address edit*/        
 
 
@@ -344,6 +301,19 @@ div#addressbook-search{
         .border_radius_button_normal;
         legend { text-transform: uppercase;}
 
+        // Phonenumber Input Fields
+        .fixedHeight, .telNumbers {
+            height: auto;
+        }
+        .telNumbers {
+            white-space: nowrap;
+        }
+
+        td.telNumbers{
+
+            input {width: 90%; }
+
+        }
 
 
 
@@ -376,7 +346,10 @@ div#addressbook-search{
         a.et2_url {margin-left: -40px;}
         a.et2_url.url {background-size: 15px 15px; background-image: none;}
 
-
+        td {
+            input {width: 90%;}
+        }
+        
     }
 
     fieldset.emailGroup * img {display: none !important; width: 20px;} // Bilder ausblenden
@@ -524,13 +497,12 @@ div.addressbook.edit.general{
     color: red;
     font-style: italic;
 }
-.fixedHeight, .telNumbers {
-    height: 30px;
 
-}
-.telNumbers {
-    white-space: nowrap;
-}
+
+
+
+
+
 .leftPad5 {
     padding-left: 5px;
 }
@@ -546,8 +518,10 @@ div.addressbook.edit.general{
 }
 .photo img {
 }
+
+// Dialog Upload photo
 .uploadphoto {
-    background-color: #FFFFFF;
+    background-color: @gray-20;
     border: 2px solid black;
     display: none;
     left: 48px;
@@ -555,6 +529,13 @@ div.addressbook.edit.general{
     position: absolute;
     top: 168px;
 }
+
+table.uploadphoto {width: 360px !important; background-color: @gray-20 !important;}
+
+
+
+
+
 .checkAllArrow {
     padding-right: 5px;
 }
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index 99ccdfe895..7c7ae0bd9f 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -174,7 +174,7 @@
 					<description/>
 					<description/>
 				</row>
-				<row height="28">
+				<row height="28" class="dialog-header">
 					<description value="Type" for="info_type"/>
 					<hbox options="0,0">
 						<menulist>
@@ -183,7 +183,7 @@
 					</hbox>
 					<textbox type="integer" id="info_number" readonly="true" span="2" class="infolog_infoId"/>
 				</row>
-				<row class="row" valign="top">
+				<row class="row dialog-header" valign="top">
 					<description value="Contact" for="info_from"/>
 					<vbox options="0,0" span="2">
 						<hbox options="0,0">
@@ -195,7 +195,7 @@
 					<description value="Phone/Email" for="info_addr"/>
 					<textbox statustext="Custom contact-address, leave empty to use information from most recent link" id="info_addr" size="30" maxlength="255" class="inputFullWidth"/>
 				</row>
-				<row class="row">
+				<row class="row dialog-header">
 					<description value="Category" for="info_cat"/>
 					<menulist span="2">
 						<menupopup type="select-cat" statustext="select a category for this entry" id="info_cat" options="None"/>
@@ -204,7 +204,7 @@
 					<description value="Parent" font_style="1"/>
 					<link-entry id="info_id_parent" onchange="if(egw &amp;&amp; widget) { if(widget._oldValue) window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget._oldValue,false);window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget.getValue(),false);}" options="infolog" class="noWrap searchParent"/>
 				</row>
-				<row class="row">
+				<row class="row dialog-header">
 					<description value="Subject" for="info_subject"/>
 					<textbox statustext="a short subject for the entry" id="info_subject" size="80" maxlength="255" span="all" tabindex="1"/>
 				</row>
@@ -231,7 +231,7 @@
 				<row class="th" disabled="1">
 					<description value="Dates, Status, Access" span="all"/>
 				</row>
-				<row>
+				<row class="dialog-operators">
 					<description value="Startdate" for="info_startdate"/>
 					<date-time statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate" options=",2"/>
 					<description/>
@@ -239,7 +239,7 @@
 					<description value="Enddate" for="info_enddate"/>
 					<date-time statustext="til when should the ToDo or Phonecall be finished" id="info_enddate"/>
 				</row>
-				<row class="row">
+				<row class="row dialog-operators">
 					<description value="Status" for="info_status"/>
 					<menulist>
 						<menupopup statustext="@status_help" id="info_status" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
@@ -251,7 +251,7 @@
 						<menupopup type="select-percent" statustext="Percent completed" id="info_percent" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
 					</menulist>
 				</row>
-				<row class="row">
+				<row class="row dialog-operators">
 					<description value="Date completed" for="info_datecompleted"/>
 					<date-time statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
 					<description/>
@@ -259,7 +259,7 @@
 					<description value="Private" for="info_access"/>
 					<checkbox statustext="should this entry only be visible to you and people you grant privat access via the ACL" id="info_access" options="private,public"/>
 				</row>
-				<row class="row" disabled="!@info_owner">
+				<row class="row dialog-operators" disabled="!@info_owner">
 					<description value="Owner"/>
 					<vbox options="0,0">
 						<menulist>
@@ -277,7 +277,7 @@
 						<date-time id="info_datemodified" readonly="true"/>
 					</vbox>
 				</row>
-				<row>
+				<row class="dialog-footer-toolbar">
 					<hbox span="3">
 						<button statustext="Saves this entry" label="Save" id="button[save]" image="save" background_image="1"/>
 						<button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1"/>
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index c02d5a2e24..27f694656e 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -9,7 +9,7 @@
  * @package infolog
  * @version $Id$
  */
-/* $Id: app.css 44587 2013-11-18 19:57:38Z ralfbecker $ */
+/* $Id: app.css 44607 2013-11-19 22:02:37Z ralfbecker $ */
 .infolog_headertext {
   color: black;
   font-size: 120%;
@@ -93,6 +93,26 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar {
   border: 0px;
   background-size: contain;
 }
+/* #############################################################################
+// iframe
+// Rahmen + padding**/
+/*############################################
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #       iframge                 #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+##############################################
+*/
 #infolog-index {
   height: auto !important;
 }
@@ -143,7 +163,7 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar {
   background-color: #66a1d2 !important;
 }
 #infolog-index #infolog-index_nm .nextmatch_header div#infolog-index_favorite_wrapper ul#infolog-index_favorite_menu {
-  border-color: #bfbfbf;
+  border-color: #b4b4b4;
   background-color: #ffffff;
   color: #000000;
 }
@@ -162,14 +182,6 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar {
   margin-left: 21px;
   height: 25px;
 }
-#infolog-index #infolog-index_nm .nextmatch_header div.filters {
-  padding: 0 0 1em 1em;
-  background-color: #f0f0f0;
-  border-width: 0 0 1px 0;
-  border-color: #d9d9d9;
-  background-image: none;
-  padding-bottom: 1.5em;
-}
 #infolog-index #infolog-index_nm .nextmatch_header div.filters select#infolog-index_cat_id {
   width: 10%;
   margin-left: 1em;
@@ -181,31 +193,13 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar {
   width: 10%;
 }
 #infolog-index #infolog-index_nm .nextmatch_header div.filters input#infolog-index_search {
-  height: 20px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-color: #bfbfbf;
-  -webkit-box-shadow: 1px 2px 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);
-  width: auto;
-  margin: 0.5em 0em 0.5em 0;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-#infolog-index #infolog-index_nm .nextmatch_header div.filters input#infolog-index_search:hover {
-  -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-  -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-  box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-}
-#infolog-index #infolog-index_nm .nextmatch_header div.filters input#infolog-index_search:focus {
-  outline: 0;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #bfbfbf;
-  -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
-  box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
+  /*                    .Complete_Button_input;
+                    &:hover{
+                        .Complete_Button_input_hover;
+                    }
+                    &:focus{
+                        .Complete_Button_input_focus;
+                    }*/
 }
 #infolog-index #infolog-index_nm table.egwGridView_outer thead tr th.optcol .selectcols {
   margin-top: 1.5%;
@@ -221,9 +215,28 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar {
   height: 16px;
   width: 16px;
 }
+/*###########################################
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                   dialog                  #
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#    buttons                                #
+#                                           #
+#                                           #
+##############################################*/
+/*Input beschränken*/
 #infolog-edit {
-  width: 800px;
-  padding: 5px;
+  margin: 0;
+  padding: 0.5em;
 }
 #infolog-edit input {
   max-width: 300px;
diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less
index 968c3a9c1e..80d1a655bf 100755
--- a/infolog/templates/pixelegg/app.less
+++ b/infolog/templates/pixelegg/app.less
@@ -21,14 +21,10 @@
 
 span#favorite_sidebox_infolog{
 
-
-
     .favorites{
-
         li {
             a div.ui-icon-heart{
                 background-image: none;
-
             }
             
         img.sideboxstar{
@@ -40,17 +36,32 @@ span#favorite_sidebox_infolog{
 
     }
 
-
-
 }
 
-// #############################################################################
+/* #############################################################################
 // iframe
+// Rahmen + padding**/
 
-// Rahmen + padding
+/*############################################
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #       iframge                 #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+##############################################
+*/
 
 .egw_fw_content_browser_div{
-    //	.box_shadow_dialog;
+    	
 }
 
 
@@ -60,8 +71,6 @@ span#favorite_sidebox_infolog{
 
     table.et2_grid {border-top: 0px;}
 
-
-
     #infolog-index_nm{
         min-height: 900px;
 
@@ -73,6 +82,9 @@ span#favorite_sidebox_infolog{
             div.ui-helper-clearfix,
             div.ui-helper-reset{
 
+                
+                
+           // ################################################################     
            // right Box with add item
 
                 div.et2_hbox_right{
@@ -80,25 +92,25 @@ span#favorite_sidebox_infolog{
                     margin-right: 0em;
 
                     div.et2_box_widget{
-                    background-color: @egw_color_blue_lighter !important;
-                    color: #FFF;
-                    text-shadow: none;
-                    height: 35px;
-                    background-image: none !important;
-                    .border_radius_button_lefttop;
-
-                    &:before {content: "+";font-size: 2em;color: @egw_color_1;}
-
+                        background-color: @egw_color_blue_lighter !important;
+                        color: #FFF;
+                        text-shadow: none;
+                        height: 35px;
+                        background-image: none !important;
                         .border_radius_button_lefttop;
-                        .box_shadow_standard_light;
 
-                        height: 39px; // hieght of add-item
+                        &:before {content: "+";font-size: 2em;color: @egw_color_1;}
 
-                        .infolog_headertext{color: #FFF !important;}
+                            .border_radius_button_lefttop;
+                            .box_shadow_standard_light;
 
-                        &:hover {.box_shadow_standard_light_hover; background-color: @egw_color_blue_lightest !important;}
+                            height: 39px; // hieght of add-item
 
+                            .infolog_headertext{color: #FFF !important;}
 
+                            &:hover {.box_shadow_standard_light_hover; background-color: @egw_color_blue_lightest !important;}
+
+                         
                     }
                 }
 
@@ -116,7 +128,7 @@ span#favorite_sidebox_infolog{
                 // Liste
                 ul#infolog-index_favorite_menu{
 
-                    .border-color-25-gray;
+                    border-color: @gray-30;
                     .background-color-0-gray;
                     .color-100-gray;
                     li{
@@ -146,11 +158,7 @@ span#favorite_sidebox_infolog{
 
 
             div.filters {
-                        .nm_filters_rectangle;
-                        
-                        padding-bottom: 1.5em;
-
-
+                      
                 // 1 Filter
                 select#infolog-index_cat_id {width: 10%; margin-left: 1em;}
 
@@ -162,14 +170,14 @@ span#favorite_sidebox_infolog{
 
                 // Suchfeld
                 input#infolog-index_search {
-                    height: 20px;
-                    .Complete_Button_input;
+
+/*                    .Complete_Button_input;
                     &:hover{
                         .Complete_Button_input_hover;
                     }
                     &:focus{
                         .Complete_Button_input_focus;
-                    }
+                    }*/
                 }
 
 
@@ -219,11 +227,31 @@ span#favorite_sidebox_infolog{
 // #############################################################################
 // Dialog infolog
 
-// Input beschränken
+/*###########################################
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                   dialog                  #
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#    buttons                                #
+#                                           #
+#                                           #
+##############################################*/
+
+/*Input beschränken*/
 
 #infolog-edit{
-    width: 800px;
-    padding: 5px;
+    margin: 0;
+    padding: 0.5em;
+    
     input{ max-width: 300px; }
 
     .et2_tabheader{
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 993382da8c..012d8c941e 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -9,35 +9,44 @@
  * @package mail
  * @version $Id$
  */
-div#mail-index div#mail-index_mailSplitter {
+/*##############################################
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #       iframge                 #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+##############################################
+*/
+div#mail-index div#mail-index_mail {
   margin: 0 1% 0 0 !important;
 }
-div#mail-index div#mail-index_mailSplitter div#mail-index_nm div.nextmatch_header div.filters {
-  padding: 0 0 0 1em;
-  background-color: #f0f0f0;
-  margin-bottom: 3px;
-  margin: 0em;
-  border-width: 0 0 1px 0;
-  border-color: #d9d9d9;
-  background-image: none;
-}
-div#mail-index div#mail-index_mailSplitter div#mail-index_nm tr.mail td img {
+div#mail-index div#mail-index_mail div#mail-index_nm tr.mail td img {
   height: 16px;
 }
-div#mail-index div#mail-index_mailSplitter div#mail-index_mailPreview {
+div#mail-index div#mail-index_mail div#mail-index_mailPreview {
+  padding: 3px;
   margin: 5px 0;
   background-color: #bfbfbf;
 }
-div#mail-index div#mail-index_mailSplitter div#mail-index_mailPreview div#mail-index_mailPreviewHeadersFrom {
+div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersFrom {
   width: 50%;
 }
-div#mail-index div#mail-index_mailSplitter div#mail-index_mailPreview div#mail-index_mailPreviewHeadersTo {
+div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersTo {
   width: 50%;
 }
-div#mail-index div#mail-index_mailSplitter div#mail-index_mailPreview div#mail-index_mailPreviewHeadersDate {
+div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersDate {
   width: 50%;
 }
-div#mail-index div#mail-index_mailSplitter div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject {
+div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject {
   width: 100%;
 }
 .egw_fw_ui_category_content #mail-index_buttonmailcreate {
@@ -45,7 +54,7 @@ div#mail-index div#mail-index_mailSplitter div#mail-index_mailPreview div#mail-i
 }
 .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate],
 .egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"] {
-  background-color: #0b5fa4;
+  background-color: #0b5fa4 !important;
   color: #FFF;
   text-shadow: none;
   height: 35px;
@@ -92,8 +101,25 @@ div#mail-index div#mail-index_mailSplitter div#mail-index_mailPreview div#mail-i
 }
 .egw_fw_ui_category_content .dtree {
   font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
-  font-size: 87.5%;
 }
+/*###########################################
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                   dialog                  #
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#    buttons                                #
+#                                           #
+#                                           #
+##############################################*/
 /* ##################################################################################
  *       E-Mail Dialog "Compose"
  *
@@ -150,9 +176,9 @@ div#mail-index div#mail-index_mailSplitter div#mail-index_mailPreview div#mail-i
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   color: #000000;
   padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
   width: auto;
   height: 32px;
   background-image: url(images/attach.png) !important;
@@ -852,15 +878,18 @@ input[type=button] {
   left: 3px;
   right: 0;
 }
+/*Toolbar der Email*/
 #mail-index_toolbar {
   padding: 0px;
   background: none;
   margin: 5px 5px 0 0;
   border: none;
+  /* Elemente */
 }
 #mail-index_toolbar button {
   background: none;
   background-image: none;
+  padding: 0px !important;
   background-color: #f0f0f0;
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -909,8 +938,8 @@ input[type=button] {
   overflow: scroll;
   overflow-x: hidden;
   right: 7px;
-  top: 37px;
-  border-color: #f0f0f0;
+  top: 45px;
+  border-color: #e6e6e6;
   border: 1px solid rgba(0, 0, 0, 0.15);
   opacity: 1;
   -moz-opacity: 1;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 4315055f43..8ebc731d6f 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -13,7 +13,25 @@
 @import (reference) "../../../pixelegg/less/def_buttons.less";
 @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
 
-// iframe
+
+/*##############################################
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #       iframge                 #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+##############################################
+*/
+
 
 div#mail-index{
 
@@ -38,7 +56,7 @@ div#mail-index{
 
     // alles
 
-    div#mail-index_mailSplitter{
+    div#mail-index_mail{
 
         margin: 0 1% 0 0 !important;
 
@@ -55,7 +73,7 @@ div#mail-index{
                 // Filter
                 div.filters{
                     // Fläche
-                    .Rectangle_filters;
+                    
 
 
                     select#mail-index_filter{
@@ -207,6 +225,26 @@ div#mail-index{
 
 } // Ende Sidebox
 
+/*###########################################
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                   dialog                  #
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#    buttons                                #
+#                                           #
+#                                           #
+##############################################*/
+
+
 /* ##################################################################################
  *       E-Mail Dialog "Compose"
  *
@@ -1027,7 +1065,7 @@ input[type=button] {
     right: 0;
 }
 
-// Toolbar der Email
+ /*Toolbar der Email*/
 
 #mail-index_toolbar {
     padding: 0px;
@@ -1035,9 +1073,12 @@ input[type=button] {
     margin: 5px 5px 0 0;
     border: none;
 
+    
+    /* Elemente */
     button {
         background: none;
         background-image: none;
+        padding: 0px !important;
 
         .Complete_Button_Icon_normal;
 
@@ -1061,16 +1102,6 @@ input[type=button] {
 }
 
 
-//#mail-index_toolbar > button > span {
-//	padding: .2em .4em;
-//}
-//#mail-index_toolbar > button > span > img {
-//	width: 16px;
-//	padding: 0px;
-//	height: 16px !important;
-//}
-
-
 
 // Anhänge an Email
 
@@ -1083,8 +1114,8 @@ input[type=button] {
     overflow:scroll;
     overflow-x:hidden;
     right: 7px;
-    top: 37px;
-    .border-color-10-gray;
+    top: 45px;
+    border-color: @gray-10;
     .border_normal;
     opacity: 1;
     -moz-opacity:1;
@@ -1099,7 +1130,6 @@ input[type=button] {
 
 
 
-
 .mailDisplayContainer, .mailDisplayAttachments {
     display: block;
     display: -moz-inline-stack;