From da3fd08d298789e722dc85e29744c22d16ed1571 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 20 Feb 2014 19:42:52 +0000 Subject: [PATCH] pixelegg changes from today --- addressbook/templates/pixelegg/app.css | 11 +- addressbook/templates/pixelegg/app.less | 7 ++ infolog/templates/pixelegg/app.css | 3 + infolog/templates/pixelegg/app.less | 3 + mail/templates/pixelegg/app.css | 112 ++++++++++++++++++- mail/templates/pixelegg/app.less | 140 +++++++++++++++++++++++- 6 files changed, 267 insertions(+), 9 deletions(-) diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index d71c2f2e9c..95968b82af 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -334,10 +334,9 @@ fieldset.emailGroup { height: 24px; } div#addressbook-index div.et2_hbox_right button#addressbook-index_add { - height: 32px; width: 32px; border: 1px solid #0C5DA5; - margin: 2px; + margin: 6px 2px; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); padding: -0.5em; background-color: #e6e6e6 !important; @@ -1105,6 +1104,10 @@ fieldset.emailGroup { } /*################## Tab 7 Extra ###############################*/ /*seems to be ok*/ + #addressbook-edit_addressbook-edit-custom, + #addressbook-search_addressbook-edit-custom { + max-width: 560px; + } #addressbook-edit_addressbook-edit-custom .th, #addressbook-search_addressbook-edit-custom .th { height: 20px; @@ -1114,6 +1117,10 @@ fieldset.emailGroup { display: table-header-group; vertical-align: top; } + #addressbook-edit_addressbook-edit-custom table#addressbook-edit_custom_fields, + #addressbook-search_addressbook-edit-custom table#addressbook-edit_custom_fields { + max-width: 550px; + } /*################## Tab 8 Extra Privat###############################*/ /*seems to be ok*/ /*################## Tab 9 History ###############################*/ diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index a2c485f085..e86352e867 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -879,11 +879,18 @@ div#addressbook-edit_addressbook-edit-links { // Extra #addressbook-edit_addressbook-edit-custom, #addressbook-search_addressbook-edit-custom{ + + max-width: 560px; + .th{ height: 20px;} tbody{ display: table-header-group; vertical-align: top; } + + // Table Customfields + table#addressbook-edit_custom_fields{max-width: 550px;} + } /*################## Tab 8 Extra Privat###############################*/ /*seems to be ok*/ diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index 04eafd2729..ebe247dbec 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -325,6 +325,9 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { #infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid ul.et2_link_string li.et2_link { font-weight: normal; } +#infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid .infolog_fixedHeight { + height: 16px; +} #infolog-index #infolog-index_nm span.infolog_infoId { background-color: inherit; } diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index 070e13f42c..4000514cc3 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -267,6 +267,9 @@ span#favorite_sidebox_infolog{ li.et2_link {font-weight: normal;} } + + //Date fixed height + .infolog_fixedHeight{.dimension_height_s;} } diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index fca8584a16..a8a1e9fed7 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -564,6 +564,9 @@ div.mailDisplayHeaders div.mail_extraEmails.visible { div.mailComposeBody { white-space: normal !important; } +#mail-compose_mail_plaintext { + white-space: pre !important; +} div.mailPreviewHeaders div.mail_extraEmails { display: inline-block; max-height: 1.3em; @@ -795,7 +798,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje /* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/ } .egw_fw_ui_category_content .draggedOver { - background-color: #679fd2; + background-color: #0c5da5; } /* ################################################################################## * E-Mail Dialog "Compose" @@ -1578,6 +1581,113 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje #mail-display .mail_DisplayNone { display: none; } +/** +* et2_toolbar +*/ +.et2_toolbar { + background: none; + margin: 0 !important; + padding: 0 !important; +} +.et2_toolbar button { + margin: 1px; +} +.et2_toolbar-dropdown { + margin: 1px; + display: inline-block; + direction: ltr; + /* background: #E0E0E0 !important; + background-color: #E0E0E0 !important;*/ + background: #e6e6e6 !important; + background-color: #e6e6e6 !important; + /*border: 1px solid silver;*/ + border: 1px solid rgba(0, 0, 0, 0.15); + text-align: left; + font-weight: normal !important; + font-size: xx-small !important; +} +.et2_toolbar-dropdown button { + height: 100% !important; + border: none !important; + background: #e6e6e6 !important; + background-color: #e6e6e6 !important; + border-radius: 0 !important; + color: #101010 !important; + font-size: 9pt !important; + font-weight: normal !important; +} +.et2_toolbar-dropdown button:hover { + color: none !important; + border: none !important; + background-color: none !important; +} +.et2_toolbar-dropdown ul > li { + width: 100%; +} +.et2_toolbar-dropdown ul { + z-index: 1000; + position: absolute; +} +.et2_toolbar-dropdown-menulist button { + height: 100% !important; + border: none; + background: #e6e6e6 !important; + background-color: #e6e6e6 !important; +} +.et2_toolbar-dropdown-menulist button:nth-child(2) { + float: right; + padding: 0; +} +.et2_toolbar-dropdown-menulist ul { + z-index: 1000; + position: relative !important; +} +div.ui-toolbar-menulist { + position: absolute; + height: inherit !important; + z-index: 999 !important; + overflow: hidden !important; + /*border: solid black 1px;*/ + border: 1px solid rgba(0, 0, 0, 0.15); + padding: 0 !important; + margin-top: 3px !important; + min-width: 150px; +} +.ui-toolbar-menulist h { + padding-bottom: 7px; + margin: 0; +} +.ui-toolbar-menulist button { + margin: 0 !important; + text-align: left; + border-radius: 0 !important; + width: 100% !important; + white-space: nowrap; +} +.ui-toolbar-menulist div { + margin: 0 !important; + text-align: left; + border-radius: 0 !important; + width: 100% !important; + white-space: nowrap; + background-color: #e6e6e6 !important; + /*border: 1px solid silver;*/ + border: 1px solid rgba(0, 0, 0, 0.15); +} +.ui-toolbar-menulistHeader { + font-size: xx-small; + height: 100%; + margin-top: 2px; + direction: ltr; +} +.et2_toolbar_activeList { + position: relative; + float: right; + direction: rtl; +} +.et2_toolbar_actionlist { + float: left; +} /* ################################################################################## * Dialog: Subscripe Folder * diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index 55c02f0cd0..5c5158c2e2 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -768,14 +768,10 @@ div#mail-index{ // # # # # # # # # # #### // ############################################################ #toolbar-actionlist{ - - - + padding: 0px 3px; - span[data-group] {margin: 0px 40px 0 0;} - - button { + button { .Complete_Button_Icon_normal; height: 27px; [src*="svg"]{ @@ -844,6 +840,138 @@ div#mail-index{ } // Ende Display +// Toolbar ...from Hadi +/** +* et2_toolbar +*/ +.et2_toolbar { + background: none; + margin: 0 !important; + padding: 0 !important; + + button { + margin: 1px; +} +} + +.et2_toolbar-dropdown{ + margin: 1px; + display: inline-block; + direction: ltr; +/* background: #E0E0E0 !important; + background-color: #E0E0E0 !important;*/ + background: @gray_10 !important; + background-color: @gray_10 !important; + /*border: 1px solid silver;*/ + .border_normal; + text-align: left; + font-weight: normal !important; + font-size: xx-small !important; + + button{ + height: 100% !important; + border: none !important; + background: @gray_10 !important; + background-color: @gray_10 !important; + border-radius: 0 !important; + color:#101010 !important; + font-size: 9pt !important; + font-weight: normal !important; + //padding: 0 !important; + + &:hover{ + color: none !important; + border: none !important; + background-color: none !important; + } + + } + + ul> li{ width: 100% } + + ul{ + z-index: 1000; + position: absolute; + } + +} + +.et2_toolbar-dropdown-menulist { + button{ + height: 100% !important; + border: none; + background: @gray_10 !important; + background-color: @gray_10 !important; + + &:nth-child(2){ + float: right; + padding: 0; + } + + } + ul{ + z-index: 1000; + position: relative !important; + } + +} + + +div.ui-toolbar-menulist{ + position: absolute; + height: inherit !important; + z-index: 999 !important; + overflow: hidden !important; + /*border: solid black 1px;*/ + .border_normal; + padding: 0 !important; + margin-top: 3px !important; + min-width: 150px; +} +.ui-toolbar-menulist{ + + h { + padding-bottom: 7px; + margin: 0; + } + + button { + margin: 0 !important; + text-align: left; + border-radius: 0 !important; + width: 100% !important; + white-space: nowrap; + } + + div{ + margin: 0 !important; + text-align: left; + border-radius: 0 !important; + width: 100% !important; + white-space: nowrap; + background-color: @gray_10 !important; + /*border: 1px solid silver;*/ + .border_normal; + } + +} + +.ui-toolbar-menulistHeader{ + font-size: xx-small; + height:100%; + margin-top: 2px; + direction: ltr; +} +.et2_toolbar_activeList{ + position: relative; + float:right; + direction: rtl; +} +.et2_toolbar_actionlist{ + float:left; +} + + /* ################################################################################## * Dialog: Subscripe Folder *