From b29317711a5a4324d82712d655f41403fea4ddd3 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 19 Dec 2013 03:14:47 +0000 Subject: [PATCH] pixelegg changes from Wednesday --- addressbook/templates/pixelegg/app.css | 8 +- addressbook/templates/pixelegg/app.less | 6 +- admin/templates/pixelegg/app.css | 5 +- admin/templates/pixelegg/app.less | 10 +- mail/templates/pixelegg/app.css | 668 ++++++++++++++++++++++-- mail/templates/pixelegg/app.less | 85 ++- 6 files changed, 677 insertions(+), 105 deletions(-) diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index 0198012a84..0c42a91035 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -510,6 +510,9 @@ fieldset.emailGroup { background-color: inherit !important; } div.addressbook_edit_general_picture table.uploadphoto { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; background-color: #f0f0f0; width: auto; border-top: solid 1px #000000; @@ -952,7 +955,7 @@ fieldset.emailGroup { } .uploadphoto { background-color: #cdcdcd; - border: 2px solid black; + border: 1px solid black !important; display: none; left: 48px; padding: 4px; @@ -962,6 +965,9 @@ fieldset.emailGroup { table.uploadphoto { width: 360px !important; background-color: #cdcdcd !important; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; } .checkAllArrow { padding-right: 5px; diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index b186eb4ec0..8db8493dfd 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -376,11 +376,13 @@ div.addressbook_edit_general_picture { // Photo Upload - POPUP table.uploadphoto { + .rounded (3px); .background-color-10-gray; width: auto; .bordered(@gray-100, @gray-100, @gray-100, @gray-100); left: 30%; top: 289px; + } @@ -867,7 +869,7 @@ div.addressbook.edit.general{ .uploadphoto { background-color: @gray-20; - border: 2px solid black; + border: 1px solid black !important; display: none; left: 48px; padding: 4px; @@ -875,7 +877,7 @@ div.addressbook.edit.general{ top: 168px; } -table.uploadphoto {width: 360px !important; background-color: @gray-20 !important;} +table.uploadphoto {width: 360px !important; background-color: @gray-20 !important; .rounded (9px);} diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css index 48d8f96d5b..dc867c420d 100755 --- a/admin/templates/pixelegg/app.css +++ b/admin/templates/pixelegg/app.css @@ -64,7 +64,10 @@ img.admin_aclApp { /** * Give space to both contact view & infolog list */ - iframe#admin-index_iframe #admin-categories-index table.et2_grid #admin-categories-index_nm div.egwGridView_outer td.frame div.egwGridView_scrollarea { + iframe#admin-index_iframe { + background-color: yellow; + } + iframe#admin-index_iframe .egwGridView_scrollarea { min-height: 500px; } #addressbook-index { diff --git a/admin/templates/pixelegg/app.less b/admin/templates/pixelegg/app.less index 21d7ddbd25..0b21024bdb 100755 --- a/admin/templates/pixelegg/app.less +++ b/admin/templates/pixelegg/app.less @@ -40,6 +40,10 @@ iframe#admin-index_iframe{ + background-color: yellow; + + .egwGridView_scrollarea { min-height: 500px;} + #admin-categories-index{ table.et2_grid { @@ -50,7 +54,7 @@ iframe#admin-index_iframe{ td.frame { - div.egwGridView_scrollarea { min-height: 500px;} + } } @@ -62,6 +66,10 @@ iframe#admin-index_iframe{ } + + + + #addressbook-index { height: 100%; } diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index a842fc3ca0..d95b4a7c46 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -9,6 +9,559 @@ * @package mail * @version $Id$ */ +textarea { + font-family: monospace, sans-serif; + font-size: 110%; +} +.defaultProfile { + color: #000000; + font-weight: bold !important; +} +.quoted1 { + color: #660066; +} +.quoted2 { + color: #007777; +} +.quoted3 { + color: #990000; +} +.quoted4 { + color: #000099; +} +.quoted5 { + color: #bb6600; +} +tr.mail div { + cursor: default; + white-space: nowrap; +} +tr.mail a { + cursor: pointer; + white-space: nowrap; +} +tr.recent div, +tr.recent span, +tr.recent time, +tr.recent a, +tr.unseen div, +tr.unseen span, +tr.unseen time, +tr.unseen a { + color: #003075; + font-weight: bold; +} +tr.labelone div, +tr.labelone span, +tr.labelone time, +tr.labelone a { + color: #ff0080 !important; +} +tr.labeltwo div, +tr.labeltwo span, +tr.labeltwo time, +tr.labeltwo a { + color: #ff8000 !important; +} +tr.labelthree div, +tr.labelthree span, +tr.labelthree time, +tr.labelthree a { + color: #008000 !important; +} +tr.labelfour div, +tr.labelfour span, +tr.labelfour time, +tr.labelfour a { + color: #0000ff !important; +} +tr.labelfive div, +tr.labelfive span, +tr.labelfive time, +tr.labelfive a { + color: #8000ff !important; +} +tr.flagged div, +tr.flagged span, +tr.flagged time, +tr.flagged a { + color: #ff0000 !important; +} +tr.prio_high div, +tr.prio_high span, +tr.prio_high time, +tr.prio_high a { + color: #ac0000 !important; +} +tr.deleted div, +tr.deleted span, +tr.deleted time, +tr.deleted a { + color: silver; + text-decoration: line-through; +} +span.status_img { + display: inline-block; + width: 12px; + height: 12px; + background-repeat: no-repeat; + background-image: url(images/kmmsgread.png); +} +tr.deleted span.status_img { + background-image: url(images/kmmsgdel.png); +} +tr.unseen span.status_img { + background-image: url(images/kmmsgunseen.png); +} +tr.flagged_seen span.status_img { + background-image: url(images/read_flagged_small.png) !important; +} +tr.flagged_unseen span.status_img { + background-image: url(images/unread_flagged_small.png) !important; +} +tr.recent span.status_img { + background-image: url(images/kmmsgnew.png) !important; +} +tr.replied span.status_img { + background-image: url(images/kmmsgreplied.png) !important; +} +tr.forwarded span.status_img { + background-image: url(images/kmmsgforwarded.png) !important; +} +.subjectBold { + FONT-SIZE: 12px; + font-weight: bold; + font-family: Arial; +} +.subject { + FONT-SIZE: 12px; + font-family: Arial; +} +TR.sieveRowActive { + FONT-SIZE: 11px; + height: 20px; + padding: 0; + background: White; +} +A.sieveRowActive { + FONT-SIZE: 11px; + height: 14px; + padding: 0; +} +TR.sieveRowInActive { + FONT-SIZE: 11px; + height: 20px; + padding: 0; + background: White; + color: Silver; +} +A.sieveRowInActive { + FONT-SIZE: 11px; + height: 14px; + padding: 0; + color: Silver; +} +.bodyDIV { + position: absolute; + background-color: white; + top: 134px; + bottom: 0px; + width: 100%; + border-top: 1px solid #efefdf; +} +.bodyDIVAttachment { + bottom: 80px; +} +#attachmentSpanAllDIV { + background-color: #efefdf; + height: 260px; + overflow: auto; +} +#attachmentDIV { + position: fixed; + background-color: #efefdf; + bottom: 0px; + min-height: 80px; + max-height: 239px; + width: 100%; + border-top: 1px solid silver; + overflow: auto; +} +#popupattachmentDIV { + position: top; + background-color: #efefdf; + bottom: 0px; + min-height: 80px; + max-height: 239px; + width: 100%; + border-top: 1px solid silver; + overflow: auto; +} +pre { + white-space: pre-wrap; + /* Mozilla, since 1999 */ + white-space: -pre-wrap; + /* Opera 4-6 */ + white-space: -o-pre-wrap; + /* Opera 7 */ + width: 99%; +} +/* + avoid the vertical scrollbar within the sidebox section (triggered by the vertical dimension of the tree) +*/ +.divSidebox { + overflow: hidden; +} +.textSidebox { + overflow-x: hidden; + overflow-y: auto; +} +/* + avoid the vertical scrollbar within the actual tablecontainer (of the tree) +*/ +.containerTableStyle { + width: 100%; + overflow: hidden; +} +.dtree { + font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size: 11px; + color: #666; + white-space: nowrap; +} +.dtree div { + width: 100%; +} +.dtree img { + border: 0px; + vertical-align: middle; +} +.dtree a { + color: #333; + text-decoration: none; +} +.dtree a.node, +.dtree a.nodeSel { + white-space: nowrap; + padding: 1px 2px 1px 2px; +} +.dtree a.node:hover, +.dtree a.nodeSel:hover { + color: #333; + text-decoration: underline; +} +.dtree a.nodeSel { + background-color: #c0d2ec; +} +.dtree .clip { + overflow: hidden; +} +.dtree table, +.dtree tr, +.dtree td { + border: none; +} +.dtree table { + overflow: hidden; + width: 100%; + display: table-row; +} +.dtree tbody, +.dtree tr, +.dtree td, +.dtree span { + width: 100%; + overflow: hidden; +} +.useEllipsis { + text-overflow: ellipsis; + width: 250px; + white-space: nowrap; + overflow: hidden; + word-wrap: break-word; + float: left; +} +.useEllipsis:after { + content: " ..."; +} +#mail-index { + position: relative; +} +.mail-index_quotabox { + position: absolute; + top: 8px; + right: 74px; + width: 200px !important; + z-index: 99; +} +.mail_DisplayNone { + display: none !important; +} +.mail-index_quotaDisplayNone { + display: none !important; +} +.mail-index_QuotaGreen, +.mail-index_QuotaYellow, +.mail-index_QuotaRed { + height: 12px !important; + width: 100px !important; +} +.mail-index_QuotaGreen > div { + background-color: green !important; + height: 11px !important; +} +.mail-index_QuotaYellow > div { + background-color: yellow !important; + height: 11px !important; +} +.mail-index_QuotaRed > div { + background-color: red !important; + height: 11px !important; +} +/* + influence the tree display and scrolling behavior +*/ +#mail-tree_target { + min-height: 35px; + max-height: 450px; + display: block; + display: -moz-inline-stack; + display: -moz-box; + width: 100%; + overflow: hidden; + overflow-y: auto; + z-index: 100; +} +/* + we need the the image displayed with our buttons on the left side +*/ +input[type=button] { + background-position: left; +} +#mail-index_messageIFRAME { + width: 100%; + height: 100%; + border: 0; +} +#mail-index_button\[mailcreate\] { + width: 99%; + text-align: left; + font-weight: bold; + padding-left: 25px; + background-image: url(images/write_mail.png) !important; + background-position: left; + background-repeat: no-repeat; +} +#mail-compose_button\[send\] { + text-align: left; + font-weight: bold; + padding-left: 30px; + width: 80px; + margin: 0px !important; + background-image: url(images/mail_send.png) !important; + background-position: left; + background-repeat: no-repeat; +} +.mailDisplay, +#mail-index_mailPreview { + overflow: hidden; + position: relative; + background-color: white; +} +.maildisplayAllAdresses { + max-height: 245px !important; + overflow: scroll; + overflow-x: hidden; +} +#mail-compose_fileselector { + width: 245px !important; +} +#mail-compose_toolbar { + padding: 0px !important; +} +#mail-compose_toolbar > button { + padding: .2em .4em; +} +#mail-compose_toolbar > img { + width: 16px; + padding: 0px; + height: 16px !important; +} +#mail-compose_toolbar > button > span > img { + width: 16px; + padding: 0px; + height: 16px !important; +} +#mail-compose_toolbar > button { + padding: .2em .4em; +} +#mail-display_toolbar > button > span { + padding: .2em .4em; +} +#mail-display_toolbar > button > span > img { + width: 16px; + padding: 0px; + height: 16px !important; +} +#mail-display_toolbar .et2_button_icon { + width: 16px; + height: 16px; +} +#mail-index_mailPreviewIcons { + position: absolute; + right: 0; + top: 0; +} +#mail-index_toolbar { + padding: 0px; +} +#mail-index_toolbar > button > span { + padding: .2em .4em; +} +#mail-index_toolbar > button > span > img { + width: 16px; + padding: 0px; + height: 16px !important; +} +#mail-index_mailPreviewContainer { + position: absolute; + border: 1px solid silver; + top: 9em; + bottom: 0; + left: 3px; + right: 0; +} +#mail-index_previewAttachmentArea { + background-color: #efefdf; + max-height: 3em; + max-width: 50%; + position: absolute; + overflow: scroll; + overflow-x: hidden; + right: 0; + top: 25px; + border: 1px solid red; + opacity: 1; + -moz-opacity: 1; + filter: alpha(opacity=100); + display: inline-block !important; +} +#mail-index_previewAttachmentArea.noContent { + border: 0px !important; + display: none !important; +} +.mailDisplayContainer, +.mailDisplayAttachments { + display: block; + display: -moz-inline-stack; + display: -moz-box; + /*width: 99%;*/ + overflow: hidden; + overflow-y: auto; + left: 8px; + right: 8px; +} +.mailDisplayContainer { + position: fixed; + overflow: hidden; + overflow-y: auto; + border: 1px solid silver; + top: 120px; +} +.mailDisplayContainerFixedHeight { + bottom: 123px; +} +.mailDisplayContainerFullHeight { + bottom: .1em; +} +.mailDisplayBody { + height: 100%; + width: 100%; + background-color: white; + padding: 0px; + margin: 0px; +} +.mailDisplayAttachments { + background-color: #efefdf; + height: 121px; + position: fixed; + bottom: .1em; + border: 1px solid red; + opacity: 1; + -moz-opacity: 1; + filter: alpha(opacity=100); +} +/* +#divGenTime { + background-color:#efefdf; + max-height: 10%; + position: fixed; + bottom: 1px; + border: 1px solid red; + border-top: 1px solid black; + left: 3px; + right: 3px; + opacity: 1; + -moz-opacity:1: + filter: Alpha(opacity=100); +} +*/ +div.mail-display > div:first-parent > div.first-parent { + height: 99%; +} +.mailDisplayHeaders { + overflow: hidden; + right: 8px; +} +.mailDisplayHeaderSection { + position: absolute; + top: 12px; +} +div.mailDisplayHeaders > div:first-parent { + overflow: hidden; +} +div.mailDisplayHeaders > span:first-child, +div.mailComposeHeaders > span:first-child, +div.mailPreviewHeaders > span:first-child { + width: 7em; + display: inline-block; +} +#mail-display_toolbar { + display: inline-flex; +} +div.mailComposeHeaders > span:first-child { + width: 8em; +} +div.mailDisplayHeaders > span:first-child, +div.mailComposeHeaders > span:first-child, +div.mailComposeBody, +div.mailPreviewHeaders > * { + margin-left: 3px; +} +div.mailPreviewHeaders div.mail_extraEmails { + display: inline-block; + max-height: 1em; + max-width: 50%; + padding: 5px; + overflow: hidden; + text-overflow: ellipsis; +} +div.mailPreviewHeaders div.mail_extraEmails.visible { + position: absolute; + left: 7em; + display: block; + max-height: 8em; + min-width: 30em; + z-index: 1; + overflow-y: auto; + background-color: white; +} +.mail_extraEmails > a { + display: inline; +} +.mail_extraEmails.visible > a { + display: list-item; +} #popupMainDiv { padding: 5px; } @@ -35,6 +588,12 @@ div#mail-index { margin: 0 1% 0 0 !important; } +div#mail-index div#mail-index_nm div.nextmatch_header div.filters select { + margin-top: 8px; +} +div#mail-index div#mail-index_nm div.nextmatch_header div.filters input#mail-index_search { + height: 20px !important; +} div#mail-index div#mail-index_nm tr.mail td img { height: 16px; } @@ -54,8 +613,29 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersDate div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject { width: 100%; } +/*############################################## +# # # +# # # +# # # +# # # +# # # +# # # +# # # +# Side # # +# bar # # +# # # +# # # +# # # +# # # +# # # +############################################## */ .egw_fw_ui_category_content { - /*new mail in FOlder*/ + /*new mail in FOlder + span.standartTreeRow b {color: @egw_color_2_a;} + + + +*/ } .egw_fw_ui_category_content #mail-index_buttonmailcreate { margin-left: 0px; @@ -86,6 +666,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje content: "+"; font-size: 1.5em; color: #ffc200; + line-height: 1.1em; } .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:hover, .egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:hover { @@ -111,9 +692,11 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje .egw_fw_ui_category_content .dtree { font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, Verdana, sans-serif; } -.egw_fw_ui_category_content span.standartTreeRow b { - color: #0c5da5; -} +/* ################################################################################## + * E-Mail Dialog "Compose" + * + * ################################################################################## + */ /*########################################### # # # # @@ -132,11 +715,6 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje # # # # ##############################################*/ -/* ################################################################################## - * E-Mail Dialog "Compose" - * - * ################################################################################## - */ #mail-compose { width: 870px; padding: 5px; @@ -153,9 +731,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje vertical-align: middle; padding: 2px; 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); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -183,9 +761,12 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje #mail-compose .mail-compose_toolbar .mail-compose_fileselector #mail-compose_uploadForCompose { font-size: 0.7em; border: 1px solid rgba(0, 0, 0, 0.15); - -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); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; color: #000000; padding-left: 30px !important; background-position: 6px center !important; @@ -224,9 +805,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje height: 20px; padding: 3px 2px; 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); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -244,9 +825,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje height: 20px; padding: 3px 2px; 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); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -268,9 +849,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje height: 20px; padding: 3px 2px; 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); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -282,9 +863,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje height: 20px; padding: 3px 2px; 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); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -357,9 +938,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje } #mail-display .mailDisplayHeaderSection #mail-display_toolbar button { 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); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -903,9 +1484,9 @@ input[type=button] { 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); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -923,13 +1504,13 @@ input[type=button] { } #mail-index_toolbar button:active { background-color: #808080; - -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); border: 1px solid rgba(0, 0, 0, 0.9); -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); + -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); + box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); } #mail-index_toolbar button:focus { border: none; @@ -987,21 +1568,6 @@ input[type=button] { top: 120px; bottom: 100px; } -/* -#divGenTime { - background-color:#efefdf; - max-height: 10%; - position: fixed; - bottom: 1px; - border: 1px solid red; - border-top: 1px solid black; - left: 3px; - right: 3px; - opacity: 1; - -moz-opacity:1: - filter: Alpha(opacity=100); -} -*/ .mailDisplayHeaders { overflow: hidden; } diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index f183cbf073..7b81834df8 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -12,7 +12,7 @@ @import (reference) "../../../pixelegg/less/def_buttons.less"; @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; - +@import (less) "../default/app.css"; #popupMainDiv{ padding: 5px; .et2_grid{ @@ -83,27 +83,20 @@ div#mail-index{ div.filters{ // Fläche - + select {margin-top: 8px;} select#mail-index_filter{ - // height: 35px; } - select#mail-index_filter2{ - // height: 35px; - } + select#mail-index_filter2{ } // Suchfeld input#mail-index_search{ - // height: 35px; - // top: 8px; - // font-size: 1.5em; + height: 20px !important; } // Suchknopf button.et2_button { - // top: 8px; - // position: relative; } } // Ende Filter @@ -185,8 +178,23 @@ div#mail-index{ -// ################################################################################# -// Sidebox + +/*############################################## +# # # +# # # +# # # +# # # +# # # +# # # +# # # +# Side # # +# bar # # +# # # +# # # +# # # +# # # +# # # +############################################## */ .egw_fw_ui_category_content{ @@ -234,13 +242,21 @@ div#mail-index{ } - /*new mail in FOlder*/ + /*new mail in FOlder span.standartTreeRow b {color: @egw_color_2_a;} - + +*/ } // Ende Sidebox +/* ################################################################################## + * E-Mail Dialog "Compose" + * + * ################################################################################## + */ + + /*########################################### # # # # @@ -261,11 +277,7 @@ div#mail-index{ ##############################################*/ -/* ################################################################################## - * E-Mail Dialog "Compose" - * - * ################################################################################## - */ + #mail-compose{ // gesamtbreite width: 870px; @@ -1167,32 +1179,7 @@ input[type=button] { top: 120px; bottom: 100px; } -//.mailDisplayAttachments { -// background-color:#efefdf; -// max-height: 10%; -// position: fixed; -// bottom: 26px; -// border: 1px solid red; -// border-bottom: 0px; -// opacity: 1; -// -moz-opacity:1; -//// filter: Alpha(opacity=100); -//} -/* -#divGenTime { - background-color:#efefdf; - max-height: 10%; - position: fixed; - bottom: 1px; - border: 1px solid red; - border-top: 1px solid black; - left: 3px; - right: 3px; - opacity: 1; - -moz-opacity:1: - filter: Alpha(opacity=100); -} -*/ + .mailDisplayHeaders { overflow: hidden; } @@ -1219,6 +1206,6 @@ div.mailDisplayHeaders > span:first-child, div.mailComposeHeaders > span:first-c height: auto; width: 24px; } - } - -// \ No newline at end of file +} + +// \ No newline at end of file