From 53eb8e553aa574c0550efbb84a4e705fbcc95626 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 28 Nov 2013 06:20:18 +0000 Subject: [PATCH] pixelegg changes from yesterday --- addressbook/templates/default/app.css | 2 +- addressbook/templates/pixelegg/app.css | 19 ++++++++++--------- addressbook/templates/pixelegg/app.less | 8 ++++---- etemplate/templates/default/etemplate2.css | 12 ------------ mail/templates/pixelegg/app.css | 1 - mail/templates/pixelegg/app.less | 2 +- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css index e106bc48ff..76359fd9d4 100644 --- a/addressbook/templates/default/app.css +++ b/addressbook/templates/default/app.css @@ -89,4 +89,4 @@ fieldset.emailGroup { } .image16 img { height: 16px; -} +} \ No newline at end of file diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index 424433ff24..224360444b 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -9,6 +9,16 @@ * @package addressbook * @version $Id$ */ +/** + * Give space to both contact view & infolog list + */ +.et2_container { + height: 50%; +} +.et2_container:only-child, +#addressbook-index { + height: 100%; +} .cursorHand { cursor: hand; } @@ -273,15 +283,6 @@ div#addressbook-index div.filters select#infolog-index_filter { div#addressbook-index div.filters select#infolog-index_filter2 { width: 10%; } -div#addressbook-index .filters #addressbook-index_cat_id { - width: 7%; -} -div#addressbook-index .filters #addressbook-index_filter { - width: 7%; -} -div#addressbook-index .filters #addressbook-index_filter2 { - width: 10%; -} div#addressbook-index table.egwGridView_outer { width: 99%; } diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index cae210b52b..a556228de3 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -9,7 +9,7 @@ * @package addressbook * @version $Id$ */ - + @import (reference) "../../../pixelegg/less/def_buttons.less"; @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; @import (less) "../default/app.css"; @@ -114,9 +114,9 @@ div#addressbook-index{ // Filter .filters{ - #addressbook-index_cat_id{width: 7%;} - #addressbook-index_filter{width:7%;} - #addressbook-index_filter2{width: 10%;} +// #addressbook-index_cat_id{width: 7%;} +// #addressbook-index_filter{width:7%;} +// #addressbook-index_filter2{width: 10%;} }// Filter diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css index b7ffba4351..394c415837 100644 --- a/etemplate/templates/default/etemplate2.css +++ b/etemplate/templates/default/etemplate2.css @@ -193,13 +193,6 @@ input[type=button]:focus { color: #202d52; outline: none; } -button.et2_button_with_image { - padding-left: 20px; - background-repeat: no-repeat; - background-position-x: 3px; - background-size: 16px; -} - /** * Drop down button */ @@ -640,11 +633,6 @@ ul.et2_link_string { background-position: bottom; background-repeat: repeat-x; } - -.et2_taglist_ro ul { - margin: 0px; - padding: 0px; -} /** * VFS widget(s) */ diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index 6dd9960634..d5d371b5af 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -39,7 +39,6 @@ div#mail-index div#mail-index_nm tr.mail td img { height: 16px; } div#mail-index div#mail-index_mailPreview { - padding: 3px; margin: 0; background-color: #bfbfbf; } diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index 5a6b5f8e93..4faf8dfeab 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -132,7 +132,7 @@ div#mail-index{ // Ansicht der Emails div#mail-index_mailPreview{ - padding: 3px; +// padding: 3px; margin: 0; .background-color-25-gray; // From