diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index 627c73b8df..9db8a66638 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -337,12 +337,12 @@ fieldset.emailGroup { box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } div#addressbook-index div.et2_hbox_right button#addressbook-index_add { - /*.Complete_Button_add;*/ width: 32px; height: 32px; border: 1px solid rgba(0, 0, 0, 0.15); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); padding: 0.5em; + background-color: #0c5da5 !important; } div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before { content: "+"; @@ -352,6 +352,9 @@ fieldset.emailGroup { padding-left: 0.1em; padding-right: 4em; } + div#addressbook-index div.et2_hbox_right button#addressbook-index_add:active { + background-color: #1aa200; + } div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover { background-color: #66a1d2 !important; color: #ffc200; @@ -365,6 +368,9 @@ fieldset.emailGroup { border-radius: 3px; border-top-left-radius: 10px; } + div#addressbook-index div.et2_hbox_right button#addressbook-index_add:active { + background-color: #1aa200 !important; + } div#addressbook-index div.filters select#infolog-index_cat_id { width: 10%; margin-left: 1em; diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index 1a900147cf..a847fb1196 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -118,26 +118,13 @@ div#addressbook-index{ // hinzufügen button#addressbook-index_add{ - /*.Complete_Button_add;*/ - .dimension_width_height_l; - border: 1px solid rgba(0, 0, 0, 0.15); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); - padding: 0.5em; - - - &:before { - content: "+"; - font-size: 2em; - color: @egw_color_1; - line-height: 0.6em; - padding-left: 0.1em; - padding-right: 4em; - } - - - &:hover {.Complete_Button_add_hover;} + + .Complete_Button_add_only_plus; + &:hover {.Complete_Button_add_only_plus_hover;} + &:active {background-color: @color_positive_action_active !important;} } + diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index d85d90bda6..a91a2cb15c 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -644,10 +644,13 @@ div.calendar { font-weight: bold; /* Pressing it will take you to the current date */ text-align: center; - background: #679fd2; + background-color: #679fd2; color: #000; padding: 2px; } +.calendar thead .title:hover { + background-color: #ffffff !important; +} .calendar thead .headrow { /* Row containing navigation buttons */ background-color: #ffc200; @@ -671,15 +674,18 @@ div.calendar { .calendar thead .hilite { /* How do the buttons in header appear when hover */ background-color: #ffffff; + -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); color: #000; - border: 1px solid; + border: 0px solid; border-color: #828282; padding: 1px; } .calendar thead .active { /* Active (pressed) buttons in header */ background_color: #408dd2; - padding: 2px 0px 0px 2px; + /*padding: 2px 0px 0px 2px;*/ } .calendar tbody .day { /* Cells containing month days dates */ @@ -760,6 +766,7 @@ div.calendar { color: #445; border-top: 1px solid #556; padding: 1px; + height: 30px; } .calendar tfoot .hilite { /* Hover style for buttons in footer */ diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 51ede406d7..7f5aadb760 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -127,9 +127,11 @@ div.calendar { position: relative; } .title { /* This holds the current "month, year" */ font-weight: bold; /* Pressing it will take you to the current date */ text-align: center; - background: @egw_color_2_e; + background-color: @egw_color_2_e; color: #000; padding: 2px; + + &:hover {background-color: @gray_0 !important;} } .headrow { /* Row containing navigation buttons */ .background_table_cal_head; @@ -154,15 +156,16 @@ div.calendar { position: relative; } .hilite { /* How do the buttons in header appear when hover */ .background_color_0_gray; + .box_shadow_standard_light_inset; color: #000; - border: 1px solid; + border: 0px solid; border-color: @gray_50; padding: 1px; } .active { /* Active (pressed) buttons in header */ background_color: @egw_color_2_d; - padding: 2px 0px 0px 2px; + /*padding: 2px 0px 0px 2px;*/ } } // thead @@ -260,6 +263,7 @@ div.calendar { position: relative; } color: #445; border-top: 1px solid #556; padding: 1px; + height: 30px; } .hilite { /* Hover style for buttons in footer */ diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css index 504a9f0d73..c5a4920bb6 100755 --- a/filemanager/templates/pixelegg/app.css +++ b/filemanager/templates/pixelegg/app.css @@ -201,24 +201,18 @@ div.filemanager_navigation > label { margin-right: 0.2em; } div.filemanager_navigation > label > input { - width: 85%; + width: 95%; } #filemanager-index .et2_file { - /*background-color: @egw_color_blue_lighter !important;*/ - color: #FFF; - text-shadow: none; - /* height: auto;*/ - background-image: none !important; - /*.border_radius_button_lefttop;*/ - color: #fff; - height: auto; - width: 55%; + /*background-color: @egw_color_2_a;*/ } #filemanager-index .et2_file:before { content: "+"; - font-size: 1.5em; + font-size: 2em; color: #ffc200; - line-height: 1.1em; + line-height: 0.6em; + padding-left: 0.1em; + padding-right: 0em; } #filemanager-index .et2_file:hover { background-color: #66a1d2 !important; @@ -233,14 +227,20 @@ div.filemanager_navigation > label > input { border-radius: 3px; border-top-left-radius: 10px; } -#filemanager-index .et2_file:before { - font-size: 1.5em; - padding-right: 0.5em; - padding-left: 0.5em; +#filemanager-index .et2_file:active { + background-color: #1aa200 !important; } -#filemanager-index .et2_file #filemanager-index_upload { - border: none; - width: 86%; +#filemanager-index .et2_file input#filemanager-index_upload { + width: 250px; + /*.Complete_Button_add_only_plus;*/ + /*.dimension_width_height_s;*/ + /*background-color: @egw_color_2_a;*/ + /*position: relative; top: 7px;*/ + /*background-image: url(images/gradient01.png);*/ + /*input {display: none;}*/ +} +#filemanager-index .et2_file div.progress { + width: 0px; } #filemanager-index #filemanager-index_tarp { width: 32px !important; diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less index 2942f010b1..0837bd462a 100644 --- a/filemanager/templates/pixelegg/app.less +++ b/filemanager/templates/pixelegg/app.less @@ -103,23 +103,42 @@ div.filemanager_navigation > label { div.filemanager_navigation > label > input { - width: 85%; + width: 95%; } #filemanager-index{ .et2_file{ - .Complete_Button_add; + /*background-color: @egw_color_2_a;*/ + &:before { + content: "+"; + font-size: 2em; + color: @egw_color_1_a; + line-height: 0.6em; + padding-left: 0.1em; + padding-right: 0em; + } + + &:hover {.Complete_Button_add_only_plus_hover;} + &:active {background-color: @color_positive_action_active !important;} - color: #fff; - height: auto; - width: 55%; - &:hover { .Complete_Button_add_hover;} - &:before{ font-size: 1.5em; padding-right: 0.5em; padding-left: 0.5em;} + input#filemanager-index_upload { + + width: 250px; + + /*.Complete_Button_add_only_plus;*/ + /*.dimension_width_height_s;*/ + /*background-color: @egw_color_2_a;*/ + /*position: relative; top: 7px;*/ + /*background-image: url(images/gradient01.png);*/ + + /*input {display: none;}*/ + + + } - - #filemanager-index_upload {border: none; width: 86%;} + div.progress {width: 0px;} diff --git a/filemanager/templates/pixelegg/images/gradient01.png b/filemanager/templates/pixelegg/images/gradient01.png new file mode 100755 index 0000000000..111cd7fbf3 Binary files /dev/null and b/filemanager/templates/pixelegg/images/gradient01.png differ diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index 54f051764d..ea10271b46 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -164,15 +164,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 img, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget img { - background-color: #0c5da5; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); - background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); - background-image: linear-gradient(top, #0c5da5, #0c5da5); - background-repeat: repeat-x; + /*.gradient_vertical (@egw_color_2_a, @egw_color_2_a);*/ /*.background_color_10_gray;*/ -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -220,7 +212,7 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { -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); - background-color: #0c5da5 !important; + background-color: rgba(12, 93, 165, 0.8) !important; -webkit-border-radius: 3px; -webkit-border-top-left-radius: 10px; -moz-border-radius: 3px; @@ -249,15 +241,7 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { -ms-transform: scale(1.5); transform: scale(1.5); margin: 0.5em; - background-color: #0c5da5; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); - background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); - background-image: linear-gradient(top, #0c5da5, #0c5da5); - background-repeat: repeat-x; + background: #ffffff; } #infolog-index #infolog-index_nm .nextmatch_header div#infolog-index_favorite_wrapper ul#infolog-index_favorite_menu { border-color: #b4b4b4; @@ -352,8 +336,11 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { .infolog_fixedHeight { height: auto; } -div#infolog-edit_info_contact input.ui-autocomplete-input { - width: 100%; +div#infolog-edit_info_contact input.ui-autocomplete-input span.ui-icon-close { + background-color: #ffffff; + background-size: contain; + background-position: 5px 5px; + top: 9px !important; } .searchParent input.ui-autocomplete-input { width: 95% !important; diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index 25f2d33ded..426eebff09 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -117,7 +117,7 @@ span#favorite_sidebox_infolog{ // IMG img { - .gradient_vertical (@egw_color_2_a, @egw_color_2_a); + /*.gradient_vertical (@egw_color_2_a, @egw_color_2_a);*/ .Complete_Button_Icon_normal; .dimension_width_height_s; margin-left: 0.5em; @@ -138,13 +138,13 @@ span#favorite_sidebox_infolog{ /*MouseOver*/ &:hover { .box_shadow_standard_light_hover; - background-color: @egw_color_2_a !important; + background-color: fade(@egw_color_2_a, 80%) !important; .border_radius_button_lefttop; .dimension_height_l; &:before {content: ""; font-size: 1em;padding-left: 5px;} /*Text*/ span {visibility: hidden; display: none;}; - img {.scale; margin: 0.5em; .gradient_vertical (@egw_color_2_a, @egw_color_2_a);} + img {.scale; margin: 0.5em; background: @gray_0;} } } } @@ -332,7 +332,14 @@ span#infolog-edit_info_number{} div#infolog-edit_info_contact{ input.ui-autocomplete-input { - width: 100%; + + span.ui-icon-close { + background-color: @gray_0; + background-size: contain; + background-position: 5px 5px; + top: 9px !important; + } + } diff --git a/infolog/templates/pixelegg/images/navbar.svg b/infolog/templates/pixelegg/images/navbar.svg index 63e8cfca18..90316257eb 100755 --- a/infolog/templates/pixelegg/images/navbar.svg +++ b/infolog/templates/pixelegg/images/navbar.svg @@ -1,19 +1,21 @@ - - - + - - + + + + + diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index 6dfeab026c..42fa6eda52 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -939,7 +939,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje width: 8em; font-size: 0.8em; text-align: right; - padding-left: 5px; + padding-right: 5px; } #mail-compose .mailComposeHeaders div, #mail-compose .mailComposeHeadersSection div { diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index ed5f917776..a91a3a858b 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -453,7 +453,7 @@ div#mail-index{ margin: 2px 0; width: 98%; - span { width: 8em; font-size: 0.8em; text-align: right; padding-left: 5px;} + span { width: 8em; font-size: 0.8em; text-align: right; padding-right: 5px;} div{ max-width: 770px; } diff --git a/preferences/templates/pixelegg/app.css b/preferences/templates/pixelegg/app.css index d9920a57cd..69be1e1e10 100755 --- a/preferences/templates/pixelegg/app.css +++ b/preferences/templates/pixelegg/app.css @@ -103,7 +103,7 @@ tr.prefRow > td { position: absolute; display: none; width: 98%; - background-color: rgba(103, 159, 210, 0.1); + background-color: #679fd2; padding: 5px; margin-top: 5px; border: 1px solid rgba(0, 0, 0, 0.15); @@ -113,7 +113,7 @@ tr.prefRow > td { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - color: #ffffff !important; + color: #000000 !important; } tr.prefRow:hover .prefHelp { display: block; diff --git a/preferences/templates/pixelegg/app.less b/preferences/templates/pixelegg/app.less index 5b57699dd7..22d68a2466 100755 --- a/preferences/templates/pixelegg/app.less +++ b/preferences/templates/pixelegg/app.less @@ -55,7 +55,7 @@ tr.prefRow > td { position: absolute; display: none; width: 98%; - background-color: @color_hint; + background-color: @egw_color_2_e; padding: 5px; margin-top: 5px; @@ -63,7 +63,7 @@ tr.prefRow > td { .border_normal; .box_shadow_standard_light; .rounded (3px); - color: @gray_0 !important; + color: @gray_100 !important; } diff --git a/resources/templates/pixelegg/app.css b/resources/templates/pixelegg/app.css new file mode 100755 index 0000000000..7bde706d3d --- /dev/null +++ b/resources/templates/pixelegg/app.css @@ -0,0 +1,52 @@ +/** + * EGroupware: CSS with less preprocessor + * + * Ressources + * + * Please do NOT change app.css directly, instead change app.less and compile it! + * + * @link http://www.egroupware.org + * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License + * @author Stefan Reinhardt + * @package tracker + * @version $Id$ + */ +#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 { + font-size: 1.15em !important; +} +button#resources-show_add { + width: 32px; + height: 32px; + border: 1px solid rgba(0, 0, 0, 0.15); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); + padding: 0.5em; + background-color: #0c5da5 !important; + background-color: #0c5da5; +} +button#resources-show_add:before { + content: "+"; + font-size: 2em; + color: #ffc200; + line-height: 0.6em; + padding-left: 0.1em; + padding-right: 4em; +} +button#resources-show_add:active { + background-color: #1aa200; +} +button#resources-show_add:hover { + background-color: #66a1d2 !important; + color: #ffc200; + -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; +} +button#resources-show_add:active { + background-color: #1aa200 !important; +} diff --git a/resources/templates/pixelegg/app.less b/resources/templates/pixelegg/app.less new file mode 100755 index 0000000000..d61adb3c01 --- /dev/null +++ b/resources/templates/pixelegg/app.less @@ -0,0 +1,49 @@ +/** + * EGroupware: CSS with less preprocessor + * + * Ressources + * + * Please do NOT change app.css directly, instead change app.less and compile it! + * + * @link http://www.egroupware.org + * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License + * @author Stefan Reinhardt + * @package tracker + * @version $Id$ + */ + +@import (reference) "../../../pixelegg/less/def_buttons.less"; +@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; + + +//****************************************************************** +// sidebar +#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 {font-size: 1.15em !important;} + + + + + +//********************************** +// main + +// hinzufügen + button#resources-show_add{ + .Complete_Button_add_only_plus; + background-color: @egw_color_2_a; + + &:hover {.Complete_Button_add_only_plus_hover;} + &:active {background-color: @color_positive_action_active !important;} + + } +// main + + + + + + + + +// Dialog Tracker bearbeiten und alle weiteren +// \ No newline at end of file diff --git a/resources/templates/pixelegg/images/navbar.svg b/resources/templates/pixelegg/images/navbar.svg index dd5fae9fe5..a2eab3ac1b 100755 --- a/resources/templates/pixelegg/images/navbar.svg +++ b/resources/templates/pixelegg/images/navbar.svg @@ -1,17 +1,18 @@ - - - + - - + + + + diff --git a/timesheet/templates/default/edit.xet b/timesheet/templates/default/edit.xet index 709e045cde..335aa74d3f 100644 --- a/timesheet/templates/default/edit.xet +++ b/timesheet/templates/default/edit.xet @@ -128,7 +128,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -168,7 +168,7 @@ - + diff --git a/timesheet/templates/pixelegg/app.css b/timesheet/templates/pixelegg/app.css index e692877379..f47c5e0509 100755 --- a/timesheet/templates/pixelegg/app.css +++ b/timesheet/templates/pixelegg/app.css @@ -16,26 +16,29 @@ } #timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget, #timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget { - background-color: #0b5fa4; + /*background-color: @egw_color_blue_lighter !important;*/ color: #FFF; text-shadow: none; + /* height: auto;*/ background-image: none !important; + /*.border_radius_button_lefttop;*/ -webkit-border-radius: 3px; - -webkit-border-top-left-radius: 20px; + -webkit-border-top-left-radius: 10px; -moz-border-radius: 3px; - -moz-border-radius-topleft: 20px; + -moz-border-radius-topleft: 10px; 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); + border-top-left-radius: 10px; + -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: 35px; } #timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:before, #timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget:before { content: "+"; - font-size: 2em; + font-size: 1.5em; color: #ffc200; + line-height: 1.1em; } #timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget .infolog_headertext, #timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget .infolog_headertext { @@ -43,9 +46,45 @@ } #timesheet-index .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:hover, #timesheet-index .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget:hover { - -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); + -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); +} +#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add { + width: 32px; + height: 32px; + border: 1px solid rgba(0, 0, 0, 0.15); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); + padding: 0.5em; + background-color: #0c5da5 !important; + background-color: #0c5da5; +} +#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:before { + content: "+"; + font-size: 2em; + color: #ffc200; + line-height: 0.6em; + padding-left: 0.1em; + padding-right: 4em; +} +#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:active { + background-color: #1aa200; +} +#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:hover { + background-color: #66a1d2 !important; + color: #ffc200; + -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; +} +#timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button#timesheet-index_add:active { + background-color: #1aa200 !important; } #timesheet-index .nextmatch_header #timesheet-index_timesheet-index-add button[id*="timesheet-index_favorite"] img { height: 16px; diff --git a/timesheet/templates/pixelegg/app.less b/timesheet/templates/pixelegg/app.less index 7b384f8c01..3315aa4b8f 100755 --- a/timesheet/templates/pixelegg/app.less +++ b/timesheet/templates/pixelegg/app.less @@ -10,8 +10,8 @@ * @version $Id$ */ -@import (reference) "../../../phpgwapi/templates/default/def_buttons.less"; -@import (reference) "../../../phpgwapi/templates/default/def_design_pattern_color_font_shadow.less"; +@import (reference) "../../../pixelegg/less/def_buttons.less"; +@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; // iframe @@ -52,6 +52,15 @@ // rechte Box #timesheet-index_timesheet-index-add{ + + button#timesheet-index_add{ + .Complete_Button_add_only_plus; + background-color: @egw_color_2_a; + + &:hover {.Complete_Button_add_only_plus_hover;} + &:active {background-color: @color_positive_action_active !important;} + + } diff --git a/timesheet/templates/pixelegg/images/navbar.svg b/timesheet/templates/pixelegg/images/navbar.svg index ed53a3b01e..cafd8ec846 100755 --- a/timesheet/templates/pixelegg/images/navbar.svg +++ b/timesheet/templates/pixelegg/images/navbar.svg @@ -1,25 +1,22 @@ - - - - - + - - + + + + + +