From e5acab5fb9ecbae63746ce844dad74fef14f00d9 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 14 Jan 2014 16:04:20 +0000 Subject: [PATCH] pixelegg changes from tuesday --- addressbook/templates/pixelegg/app.css | 2 +- addressbook/templates/pixelegg/app.less | 2 +- calendar/templates/pixelegg/app.css | 18 +++--- .../templates/pixelegg/images/navbar.svg | 30 ++++----- .../templates/pixelegg/images/navbar.svg | 18 +++--- infolog/templates/pixelegg/app.css | 9 ++- infolog/templates/pixelegg/app.less | 20 +++++- infolog/templates/pixelegg/images/navbar.svg | 21 +++--- mail/templates/pixelegg/app.css | 64 +++++++++++++++---- mail/templates/pixelegg/app.less | 62 +++++++++++++----- .../templates/pixelegg/images/navbar.svg | 31 ++++----- .../templates/pixelegg/images/navbar.svg | 31 +++++---- .../templates/pixelegg/images/navbar.svg | 17 +++-- 13 files changed, 204 insertions(+), 121 deletions(-) diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index 74ab957f97..627c73b8df 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -584,7 +584,7 @@ fieldset.emailGroup { top: 0px !important; } button[id="addressbook-edit_button[delete]"] { - position: absolute; + /*position: absolute;*/ right: 0.5em; } /*#######################################################*/ diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index 3f125c4d22..1a900147cf 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -394,7 +394,7 @@ div#addressbook-index{ // Button delete button[id="addressbook-edit_button[delete]"]{ - position: absolute; + /*position: absolute;*/ right: 0.5em; } diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 5f64564171..33b87436f1 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -1355,10 +1355,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -1367,6 +1367,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; width: 16px; height: 16px; } @@ -1647,10 +1648,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -1659,6 +1660,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; } #delete_series { top: 100px; diff --git a/etemplate/templates/pixelegg/images/navbar.svg b/etemplate/templates/pixelegg/images/navbar.svg index 86794afac8..c7e89c8d97 100755 --- a/etemplate/templates/pixelegg/images/navbar.svg +++ b/etemplate/templates/pixelegg/images/navbar.svg @@ -4,24 +4,24 @@ - - - - - - - + + + diff --git a/filemanager/templates/pixelegg/images/navbar.svg b/filemanager/templates/pixelegg/images/navbar.svg index 7886292ce2..847bced8b7 100755 --- a/filemanager/templates/pixelegg/images/navbar.svg +++ b/filemanager/templates/pixelegg/images/navbar.svg @@ -4,15 +4,13 @@ - - + + diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index 3f58fec60b..9e0d541f15 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -277,14 +277,14 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { height: 25px; } #infolog-index #infolog-index_nm .nextmatch_header div.filters select#infolog-index_cat_id { - width: 10%; + /*width: 10%;*/ margin-left: 1em; } #infolog-index #infolog-index_nm .nextmatch_header div.filters select#infolog-index_filter { - width: 10%; + /*width: 10%;*/ } #infolog-index #infolog-index_nm .nextmatch_header div.filters select#infolog-index_filter2 { - width: 10%; + /*width: 10%;*/ } #infolog-index #infolog-index_nm .nextmatch_header div.filters input#infolog-index_search { /* .Complete_Button_input; @@ -349,6 +349,9 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { .infolog_fixedHeight { height: auto; } +div#infolog-edit_info_contact input.ui-autocomplete-input { + width: 100%; +} .searchParent input.ui-autocomplete-input { width: 95% !important; } diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index 712d1396eb..25f2d33ded 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -195,13 +195,19 @@ span#favorite_sidebox_infolog{ div.filters { // 1 Filter - select#infolog-index_cat_id {width: 10%; margin-left: 1em;} + select#infolog-index_cat_id { + /*width: 10%;*/ + margin-left: 1em;} // 2 Filter - select#infolog-index_filter {width: 10%;} + select#infolog-index_filter { + /*width: 10%;*/ + } // 3 Filter - select#infolog-index_filter2 {width: 10%;} + select#infolog-index_filter2 { + /*width: 10%;*/ + } // Suchfeld input#infolog-index_search { @@ -323,6 +329,14 @@ select#infolog-edit_info_type {} span#infolog-edit_info_number{} //Kontakt +div#infolog-edit_info_contact{ + + input.ui-autocomplete-input { + width: 100%; +} + + +} label.et2_label {} // Eingabe via Select + Input diff --git a/infolog/templates/pixelegg/images/navbar.svg b/infolog/templates/pixelegg/images/navbar.svg index bab068cccd..31c2ee2ed6 100755 --- a/infolog/templates/pixelegg/images/navbar.svg +++ b/infolog/templates/pixelegg/images/navbar.svg @@ -4,16 +4,15 @@ - - + + diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index dfaa6672b5..1ff94e91b3 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -596,9 +596,13 @@ div#mail-index div#mail-index_nm div.nextmatch_header div.filters input#mail-ind div#mail-index div#mail-index_nm tr.mail td img { height: 16px; } +div#mail-index div.splitter-bar, +div#mail-index div.splitter-bar-horizontal { + background-color: #ffc200; +} div#mail-index div#mail-index_mailPreview { margin: 0; - background-color: #bfbfbf; + background-color: #fafafa; } div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersFrom { width: 50%; @@ -654,6 +658,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje padding-left: 25px; text-align: left; width: 93%; + background-color: #0c5da5; } .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:before, .egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:before { @@ -667,9 +672,16 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + -webkit-border-radius: 3px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius: 3px; + -moz-border-radius-topleft: 10px; + border-radius: 3px; + border-top-left-radius: 10px; } -.egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:focus, -.egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:focus { +.egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:active, +.egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:active { + background-color: #1aa200 !important; -webkit-border-radius: 3px; -webkit-border-top-left-radius: 10px; -moz-border-radius: 3px; @@ -688,7 +700,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: rgba(103, 159, 210, 0.1); } /* ################################################################################## * E-Mail Dialog "Compose" @@ -818,10 +830,10 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -830,6 +842,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -1525,12 +1538,17 @@ input[type=button] { width: 24px !important; height: 24px !important; background-color: #e6e6e6; - /*.Complete_Button_Icon_normal;*/ - /* &:hover { - .Complete_Button_Icon_hover; - background-color: @color_positive_action_hover; - }*/ - /*&:focus {border: none;}*/ +} +#mail-index_toolbar button img[src$="svg"] { + background-color: #8a8a8a; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZTZlNmU2IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMDAwMDAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #e6e6e6, #000000); + background-image: -ms-linear-gradient(top, #e6e6e6, #000000); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e6e6e6), to(#000000)); + background-image: -webkit-linear-gradient(top, #e6e6e6, #000000); + background-image: -o-linear-gradient(top, #e6e6e6, #000000); + background-image: linear-gradient(top, #e6e6e6, #000000); + background-repeat: repeat-x; } #mail-index_toolbar button span { padding: 0; @@ -1594,10 +1612,23 @@ input[type=button] { #mail-index_toolbar button[id*="toolbar-tracker"]:active { background-color: #ffc200; } +/*AN / To*/ +div.mailPreviewHeaders div.mail_extraEmails { + display: inline-block; + max-height: 1.3em; + max-width: 50%; + overflow: hidden; + text-overflow: ellipsis; +} +div.mailPreviewHeaders div.mail_extraEmails img.et2_button_icon { + width: 24px; + height: 24px; +} #mail-index_previewAttachmentArea { background-color: #f0f0f0; border-color: #e6e6e6; border: 1px solid rgba(0, 0, 0, 0.15); + max-height: 2.6em; } #mail-index_previewAttachmentArea img { width: 16px; @@ -1609,6 +1640,11 @@ input[type=button] { #mail-index_previewAttachmentArea.noContent { border: 0px !important; } +/* Button after field*/ +#mail-index_mailPreviewHeadersAttachments img.et2_button_icon { + width: 24px; + height: 24px; +} .mailDisplayContainer, .mailDisplayAttachments { display: block; diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index 7dd72e7b28..836783eb61 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -119,15 +119,20 @@ div#mail-index{ // Splitterbar div.splitter-bar, - div.splitter-bar-horizontal {} + div.splitter-bar-horizontal { + background-color: @color_splitter_bar; + } // Ansicht der Emails div#mail-index_mailPreview{ -// padding: 3px; + margin: 0; - .background_color_25_gray; + .background_color_5_gray; + + + // From div#mail-index_mailPreviewHeadersFrom{ width: 50%; @@ -220,14 +225,18 @@ div#mail-index{ padding-left: 25px; text-align: left; width: 93%; + background-color: @egw_color_2_a; &:hover { .box_shadow_standard_light_hover; - } + .border_radius_button_lefttop ; + } - &:focus { - .border_radius_button_lefttop ; - .box_shadow_standard_light_inset; + &:active { + background-color: @color_positive_action_active !important; + .border_radius_button_lefttop ; + .box_shadow_standard_light_inset; + } } @@ -1201,14 +1210,11 @@ input[type=button] { button { .dimension_width_height_m !important; background-color: @gray_10; - /*.Complete_Button_Icon_normal;*/ -/* &:hover { - .Complete_Button_Icon_hover; - background-color: @color_positive_action_hover; - }*/ - - /*&:focus {border: none;}*/ + img[src$="svg"]{ + .gradient_vertical (@gray_10, @gray_100); + } + span { padding: 0; @@ -1257,6 +1263,23 @@ input[type=button] { +/*AN / To*/ +div.mailPreviewHeaders div.mail_extraEmails { + display: inline-block; + max-height: 1.3em; + max-width: 50%; + overflow: hidden; + text-overflow: ellipsis; + + img.et2_button_icon { + + .dimension_width_height_m; + + } +} + + + // Anhänge an Email #mail-index_previewAttachmentArea { @@ -1264,9 +1287,10 @@ input[type=button] { .background_color_10_gray; border-color: @gray_10; .border_normal; + max-height: 2.6em; // filter: Alpha(opacity=100); - img {width: 16px; height: 16px;} + img {.dimension_width_height_s;} td{padding: 2px;} } @@ -1274,6 +1298,14 @@ input[type=button] { border:0px !important; } +/* Button after field*/ +#mail-index_mailPreviewHeadersAttachments{ + + + img.et2_button_icon {.dimension_width_height_m;} + +} + .mailDisplayContainer, .mailDisplayAttachments { diff --git a/notifications/templates/pixelegg/images/navbar.svg b/notifications/templates/pixelegg/images/navbar.svg index 742f38e004..f6cb56e3b2 100755 --- a/notifications/templates/pixelegg/images/navbar.svg +++ b/notifications/templates/pixelegg/images/navbar.svg @@ -3,19 +3,20 @@ - - + + + + diff --git a/preferences/templates/pixelegg/images/navbar.svg b/preferences/templates/pixelegg/images/navbar.svg index 78d7fdc3be..b9e89eeaf8 100755 --- a/preferences/templates/pixelegg/images/navbar.svg +++ b/preferences/templates/pixelegg/images/navbar.svg @@ -4,20 +4,19 @@ - - - + + diff --git a/resources/templates/pixelegg/images/navbar.svg b/resources/templates/pixelegg/images/navbar.svg index 1966aecf3f..8eb30e59b2 100755 --- a/resources/templates/pixelegg/images/navbar.svg +++ b/resources/templates/pixelegg/images/navbar.svg @@ -4,14 +4,13 @@ - - + +