From 307cac1e034291085b414059960dc68b3a2816eb Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Fri, 20 Dec 2013 09:35:46 +0000 Subject: [PATCH] pixelegg changes from 19.Dez --- addressbook/templates/pixelegg/app.css | 79 ++++++++++++++++++++-- addressbook/templates/pixelegg/app.less | 86 ++++++++++++++++++++---- calendar/templates/pixelegg/app.css | 19 ++++-- calendar/templates/pixelegg/app.less | 6 +- importexport/templates/pixelegg/app.css | 39 +++++++++++ importexport/templates/pixelegg/app.less | 53 ++++++++++++++- infolog/templates/pixelegg/app.css | 47 ++++++++++++- infolog/templates/pixelegg/app.less | 25 ++++++- mail/templates/pixelegg/app.css | 8 +-- mail/templates/pixelegg/app.less | 4 +- 10 files changed, 328 insertions(+), 38 deletions(-) diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index 0c42a91035..437c8cbd50 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -428,6 +428,10 @@ fieldset.emailGroup { #addressbook-edit tr.dialog-footer-toolbar label.et2_label { top: 0px !important; } + button[id="addressbook-edit_button[delete]"] { + float: right; + margin-top: -37px; + } /*#######################################################*/ /*State: Address selected*/ /*Layout*/ @@ -467,11 +471,6 @@ fieldset.emailGroup { /*# #*/ /*# #*/ /*#################################################################*/ - /*#addressbook-edit .et2_tabbox { - max-width: 100%; - min-width: 530px; - width: 550px -}*/ /*#######################################################*/ /* Tab Generell */ .leftPad5 { @@ -661,6 +660,22 @@ fieldset.emailGroup { div#addressbook-search fieldset.phoneGroup .telNumbers { height: auto; } + div#addressbook-edit fieldset.phoneGroup table.et2_grid, + div#addressbook-search fieldset.phoneGroup table.et2_grid { + margin-left: -7px; + } + div#addressbook-edit fieldset.phoneGroup table.et2_grid tr:nth-child(even), + div#addressbook-search fieldset.phoneGroup table.et2_grid tr:nth-child(even) { + background: #ffffff; + } + div#addressbook-edit fieldset.phoneGroup table.et2_grid tr:nth-child(odd), + div#addressbook-search fieldset.phoneGroup table.et2_grid tr:nth-child(odd) { + background: #ebebeb; + } + div#addressbook-edit fieldset.phoneGroup table.et2_grid td, + div#addressbook-search fieldset.phoneGroup table.et2_grid td { + padding: 3px 0px; + } div#addressbook-edit fieldset.phoneGroup table.et2_grid td.telNumbers, div#addressbook-search fieldset.phoneGroup table.et2_grid td.telNumbers { width: 155px; @@ -694,6 +709,18 @@ fieldset.emailGroup { div#addressbook-search fieldset.emailGroup table.et2_grid { margin-left: -7px; } + div#addressbook-edit fieldset.emailGroup table.et2_grid tr:nth-child(even), + div#addressbook-search fieldset.emailGroup table.et2_grid tr:nth-child(even) { + background: #ffffff; + } + div#addressbook-edit fieldset.emailGroup table.et2_grid tr:nth-child(odd), + div#addressbook-search fieldset.emailGroup table.et2_grid tr:nth-child(odd) { + background: #ebebeb; + } + div#addressbook-edit fieldset.emailGroup table.et2_grid td, + div#addressbook-search fieldset.emailGroup table.et2_grid td { + padding: 3px 0px; + } div#addressbook-edit fieldset.emailGroup td, div#addressbook-search fieldset.emailGroup td { /* a.et2_url:after { @@ -755,6 +782,35 @@ fieldset.emailGroup { width: 200px !important; padding-top: 1em; } + #addressbook-edit_addressbook-edit-general td.addressbook_edit_general_left table.et2_grid { + margin-left: 2px; + /* tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} */ + } + #addressbook-edit_addressbook-edit-general td.addressbook_edit_general_left table.et2_grid td { + padding: 5px 0px 5px 3px; + } + #addressbook-edit_addressbook-edit-general td.addressbook_edit_general_left table.et2_grid div#addressbook-edit_addressbook-edit-name table.et2_grid { + background-color: #b4b4b4; + border-top: solid 1px #b4b4b4; + border-left: solid 1px #b4b4b4; + border-right: solid 1px #b4b4b4; + border-bottom: solid 1px #b4b4b4; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + margin-left: 2px; + border-top: 1px solid #b4b4b4 !important; + } + #addressbook-edit_addressbook-edit-general td.addressbook_edit_general_left table.et2_grid div#addressbook-edit_addressbook-edit-name table.et2_grid tr:nth-child(even) { + background: #ffffff; + } + #addressbook-edit_addressbook-edit-general td.addressbook_edit_general_left table.et2_grid div#addressbook-edit_addressbook-edit-name table.et2_grid tr:nth-child(odd) { + background: #ebebeb; + } + #addressbook-edit_addressbook-edit-general td.addressbook_edit_general_left table.et2_grid div#addressbook-edit_addressbook-edit-name table.et2_grid td { + padding: 5px 0px 5px 3px; + } div#addressbook-edit_addressbook-edit-cats { overflow: scroll; } @@ -786,6 +842,19 @@ fieldset.emailGroup { padding-left: 1em; } /*################## Tab 4 Details ###############################*/ + #addressbook-edit_addressbook-edit-details table.et2_grid { + margin-left: 2px; + border-top: 1px solid #b4b4b4 !important; + } + #addressbook-edit_addressbook-edit-details table.et2_grid tr:nth-child(even) { + background: #ffffff; + } + #addressbook-edit_addressbook-edit-details table.et2_grid tr:nth-child(odd) { + background: #ebebeb; + } + #addressbook-edit_addressbook-edit-details table.et2_grid td { + padding: 5px 0px 5px 3px; + } /*################## Tab 5 Verknüpfungen ###############################*/ #addressbook-edit_addressbook-edit-links .th, #addressbook-search_addressbook-edit-links .th { diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index 8db8493dfd..fd8eb9a48f 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -274,6 +274,15 @@ div#addressbook-index{ #addressbook-edit tr.dialog-footer-toolbar label.et2_label {top: 0px !important;} +// Button delete +button[id="addressbook-edit_button[delete]"]{ + float: right; + margin-top: -37px; + +} + + + /*#######################################################*/ /*State: Address selected*/ @@ -325,16 +334,6 @@ td.addressbook_edit_right_td { /*# #*/ /*#################################################################*/ -/*#addressbook-edit .et2_tabbox { - max-width: 100%; - min-width: 530px; - width: 550px -}*/ - - - -//table.et2_grid .addressbook_edit_general {width: 80% !important;} - /*#######################################################*/ /* Tab Generell */ @@ -495,7 +494,13 @@ div#addressbook-search{ height: auto; } - + table.et2_grid { + margin-left: -7px; + tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} + td {padding: 3px 0px;} + } + table.et2_grid td.telNumbers{ width: 155px; input { width: 140px !important; } @@ -528,7 +533,12 @@ div#addressbook-search{ legend { text-transform: uppercase;} - table.et2_grid {margin-left: -7px;} + table.et2_grid { + margin-left: -7px; + tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} + td {padding: 3px 0px;} + } td { input {width: 82%;} @@ -583,6 +593,41 @@ div#addressbook-search{ // background-color: red !important; padding-top: 1em; } + + td.addressbook_edit_general_left { + + + // table Addressfield + table.et2_grid{ + + margin-left: 2px; +/* tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} */ + td {padding: 5px 0px 5px 3px;} + + + // Edit Name + div#addressbook-edit_addressbook-edit-name{ + + table.et2_grid{ + + background-color: @gray-30; + .bordered (@gray-30,@gray-30,@gray-30,@gray-30); + .rounded (5px); + + margin-left: 2px; + border-top: 1px solid @gray-30 !important; + tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} + td {padding: 5px 0px 5px 3px;} + } + + } + + } + + } + } @@ -645,7 +690,20 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;} } /*################## Tab 4 Details ###############################*/ - + #addressbook-edit_addressbook-edit-details { + + table.et2_grid{ + margin-left: 2px; + border-top: 1px solid @gray-30 !important; + tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} + td {padding: 5px 0px 5px 3px;} + } + + + + + } /*################## Tab 5 Verknüpfungen ###############################*/ // Verknüpfungen @@ -956,4 +1014,4 @@ table.uploadphoto {width: 360px !important; background-color: @gray-20 !importan } -// \ No newline at end of file +// \ No newline at end of file diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index cd9f94ee27..59ccf3983b 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -36,6 +36,17 @@ img.sideboxstar:hover { -moz-border-radius: 3px; border-radius: 3px; } +img.sideboxstar:active { + background-color: #808080; + 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); + background-color: #00b500 !important; +} .chzn-container { max-width: 85% !important; margin-top: 0em; @@ -313,10 +324,10 @@ div#calendar-edit .et2_tabcntr { overflow: auto; } div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(even) { - background: #e6e6e6; + background: #ffffff; } div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(odd) { - background: #ffffff; + background: #ebebeb; } div#calendar-edit #calendar-edit_calendar-edit-general { display: block; @@ -786,10 +797,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget max-height: 400px; } .calendar_calDayTodos .calendar_calDayTodosTable table tr:nth-child(even) { - background: #e6e6e6; + background: #ffffff; } .calendar_calDayTodos .calendar_calDayTodosTable table tr:nth-child(odd) { - background: #ffffff; + background: #ebebeb; } .calendar_calDayTodos .calendar_calDayTodosTable table td { padding: 3px; diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 80ae46e85b..b7dea54f44 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -26,12 +26,12 @@ img.sideboxstar { .dimension_width_height_xs; .Complete_Button_Icon_normal; + .rounded (3px); padding: 3px; margin: 1px; - &:hover { - .Complete_Button_Icon_hover; - } + &:hover{.Complete_Button_Icon_hover ;} + &:active{.Complete_Button_Icon_active ; background-color: @color-positive-action-active !important;} } .chzn-container { diff --git a/importexport/templates/pixelegg/app.css b/importexport/templates/pixelegg/app.css index 1a4b7e101d..49a1b5f74d 100755 --- a/importexport/templates/pixelegg/app.css +++ b/importexport/templates/pixelegg/app.css @@ -49,3 +49,42 @@ div.preview .content { #importexport-export_dialog { margin: 1em; } +#importexport-export_dialog img { + height: 24px; +} +#importexport-export_dialog .et2_tabcntr { + height: 354px; +} +/* Tab General*/ +#importexport-export_dialog_importexport-export_dialog-general_tab_content { + width: 400px; +} +#importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid tr:nth-child(even) { + background: #e6e6e6; +} +#importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid tr:nth-child(odd) { + background: #ffffff; +} +#importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid td { + padding: 0.5em; +} +/* Tab Auswahl*/ +#importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid tr:nth-child(even) { + background: #e6e6e6; +} +#importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid tr:nth-child(odd) { + background: #ffffff; +} +#importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid td { + padding: 0.5em; +} +/* Tab Optionen*/ +#importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid tr:nth-child(even) { + background: #e6e6e6; +} +#importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid tr:nth-child(odd) { + background: #ffffff; +} +#importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid td { + padding: 0.5em; +} diff --git a/importexport/templates/pixelegg/app.less b/importexport/templates/pixelegg/app.less index 6028d204f5..e57adb27a7 100755 --- a/importexport/templates/pixelegg/app.less +++ b/importexport/templates/pixelegg/app.less @@ -19,4 +19,55 @@ /* Dialog Import Export */ -#importexport-export_dialog {margin: 1em;} \ No newline at end of file +#importexport-export_dialog { + margin: 1em; + + + img {.dimension_height_m;} + + .et2_tabcntr {height: 354px;} + +} + +/* Tab General*/ + #importexport-export_dialog_importexport-export_dialog-general_tab_content { + + width: 400px; + + table.et2_grid { + tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} + td {padding: 0.5em;} + + } + + } + +/* Tab Auswahl*/ +#importexport-export_dialog_importexport-export_dialog-selection_tab { + + table.et2_grid { + tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} + td {padding: 0.5em;} + + } + + +} + +/* Tab Optionen*/ +#importexport-export_dialog_importexport-export_dialog-options_tab{ + table.et2_grid { + tr:nth-child(even) {background: @color-even;} + tr:nth-child(odd) {background: @color-odd;} + td {padding: 0.5em;} + + } + + +} + + + +// \ No newline at end of file diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index dbcf8636ee..40f35c1581 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -139,10 +139,11 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { -moz-border-radius-topleft: 20px; border-radius: 3px; border-top-left-radius: 20px; - -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); height: 39px; + /*img#infolog-index_add[id="task"] {background-color: @gray-0; }*/ } #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:before, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget:before { @@ -153,6 +154,7 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget .infolog_headertext, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget .infolog_headertext { color: #FFF !important; + font-size: 11px; } #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:hover, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget:hover { @@ -161,6 +163,45 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); background-color: #66a1d2 !important; } +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget img, +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget img { + background-color: #f0f0f0; + -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; + border-radius: 3px; + width: 16px; + height: 16px; + margin-right: 0.5em; + padding: 2px; + margin-top: -2px; + vertical-align: middle; +} +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget img:hover, +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget img:hover { + background-color: #b3b3b3 !important; + -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.5); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget img:active, +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget img:active { + background-color: #808080; + 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); +} #infolog-index #infolog-index_nm .nextmatch_header div#infolog-index_favorite_wrapper ul#infolog-index_favorite_menu { border-color: #b4b4b4; background-color: #ffffff; diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index f4c1ec80dc..5bc77b8e4e 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -106,9 +106,30 @@ span#favorite_sidebox_infolog{ height: 39px; // hieght of add-item - .infolog_headertext{color: #FFF !important;} + .infolog_headertext{color: #FFF !important; font-size: 11px;} - &:hover {.box_shadow_standard_light_hover; background-color: @egw_color_blue_lightest !important;} + + &:hover {.box_shadow_standard_light_hover; background-color: @egw_color_blue_lightest !important;} + + + /*img#infolog-index_add[id="task"] {background-color: @gray-0; }*/ + + // IMG + img { + + .Complete_Button_Icon_normal; + .dimension_width_height_s; + margin-right: 0.5em; + padding: 2px; + margin-top: -2px; + vertical-align: middle; + + &:hover{.Complete_Button_Icon_hover ;} + &:active{.Complete_Button_Icon_active ;} + + } + + } diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index d95b4a7c46..82203badab 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -589,10 +589,10 @@ 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; + margin-top: 6px; } div#mail-index div#mail-index_nm div.nextmatch_header div.filters input#mail-index_search { - height: 20px !important; + /*height: 20px !important;*/ } div#mail-index div#mail-index_nm tr.mail td img { height: 16px; @@ -1493,7 +1493,7 @@ input[type=button] { border-radius: 3px; } #mail-index_toolbar button:hover { - background-color: #b3b3b3 !important; + background-color: #cccccc; -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); @@ -1503,7 +1503,7 @@ input[type=button] { border-radius: 3px; } #mail-index_toolbar button:active { - background-color: #808080; + background-color: #b3b3b3 !important; border: 1px solid rgba(0, 0, 0, 0.9); -webkit-border-radius: 3px; -moz-border-radius: 3px; diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index 7b81834df8..bfec8ac810 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -83,7 +83,7 @@ div#mail-index{ div.filters{ // Fläche - select {margin-top: 8px;} + select {margin-top: 6px;} select#mail-index_filter{ } @@ -92,7 +92,7 @@ div#mail-index{ // Suchfeld input#mail-index_search{ - height: 20px !important; + /*height: 20px !important;*/ } // Suchknopf