diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 648a93da03..d952ca8732 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -268,6 +268,63 @@ background-color: #ffffff; } /** + * Link_entry_widget + */ + div.et2_link_to button { + border: 1px solid rgba(0, 0, 0, 0.15); + /*.box_shadow_standard_light;*/ + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color: #000000; + -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; + transition-duration: 0.5s; + -webkit-transition-timing-function: linear; + -moz-transition-timing-function: linear; + -o-transition-timing-function: linear; + transition-timing-function: linear; + background-color: #e6e6e6; + } + div.et2_link_to button:hover { + /*.background_color_20_gray;*/ + -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); + border: 1px solid rgba(0, 0, 0, 0.5); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + background-color: #1aa200 !important; + } + div.et2_link_to button:active { + /*.background_color_30_gray;*/ + 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: #1aa200; + background-color: #1aa200 !important; + } + div.et2_link_to input { + width: 72% !important; + } + div.et2_link_entry select { + width: 30% !important; + } + div.et2_link_entry input.ui-autocomplete-input { + width: 51% !important; + padding-bottom: 1px; + } + /** * Tabs widget */ .et2_tabflag { @@ -413,6 +470,9 @@ border-top-left-radius: 0px; /*.background-clip(padding-box);*/ } + .nextmatch_header > .filters select { + margin-top: 10px; + } .nextmatch_header > .filters .et2_label { /* font-size: 0.9em;*/ padding: 0.2em; @@ -2461,6 +2521,9 @@ a.textSidebox { border-left: solid 1px #9c9c9c; border-right: solid 1px #9c9c9c; } +#divAppboxHeader table img { + height: 16px; +} #divAppbox { background-color: #ffffff; padding: 5px; @@ -2570,11 +2633,12 @@ button.et2_button_with_image background-color[url$="svg"] { } /* ######################################################################################## * - * Button löschen / delete / => color-negative-action + * Button löschen / delete / => color-negative-action // red * ######################################################################################## */ input[type="submit"][id*="delete"], input[type="button"][id*="delete"], +input[id*="delete"], button[id="delete"], button[id="infolog-edit_button[delete]"], button[id="addressbook-edit_button[delete]"], @@ -2615,6 +2679,7 @@ button[id="timesheet-edit_button[delete]"] { } input[type="submit"][id*="delete"]:hover, input[type="button"][id*="delete"]:hover, +input[id*="delete"]:hover, button[id="delete"]:hover, button[id="infolog-edit_button[delete]"]:hover, button[id="addressbook-edit_button[delete]"]:hover, @@ -2652,6 +2717,7 @@ button[id="timesheet-edit_button[delete]"]:hover { } input[type="submit"][id*="delete"]:active, input[type="button"][id*="delete"]:active, +input[id*="delete"]:active, button[id="delete"]:active, button[id="infolog-edit_button[delete]"]:active, button[id="addressbook-edit_button[delete]"]:active, @@ -2689,7 +2755,7 @@ button[id="timesheet-edit_button[delete]"]:active { } /* ######################################################################################## * - * Button edit + save + apply + copy => color-positive-action + * Button edit + save + apply + copy => color-positive-action // green * ######################################################################################## */ button[id*="save"] img[url*="svg"], @@ -2716,6 +2782,48 @@ button[id*="edit_button[edit]"]:active { button#filemanager-select_button[ok]:active { background-color: #1aa200; } +#passwordchange { + background-image: url('../images/cancel.png') !important; + border: 1px solid rgba(0, 0, 0, 0.15); + /*.box_shadow_standard_light;*/ + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color: #000000; + -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; + transition-duration: 0.5s; + -webkit-transition-timing-function: linear; + -moz-transition-timing-function: linear; + -o-transition-timing-function: linear; + transition-timing-function: linear; + background-color: #e6e6e6; + padding-left: 30px !important; + background-position: 6px center !important; + background-repeat: no-repeat !important; + background-size: 20px auto !important; + width: auto; + height: 32px; +} +#passwordchange:hover { + background-color: #1aa200 !important; + -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); +} +#passwordchange:active { + background-color: #1aa200 !important; + -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); +} +/* ######################################################################################## + * /*ui-widget*/ /*edit series*/ button#series { @@ -2805,15 +2913,17 @@ button[id*="edit_button[add_alarm]"]:active { } /* ######################################################################################## * - * Button cancel / => color-cancel-action + * Button cancel / => color-cancel-action // yellow * ######################################################################################## */ button[id*="cancel"]:hover, +button[id*="importexport-wizardbox_button[previous]"]:hover, button#cancel:hover { background-color: #f5b301 !important; color: #000000; } button[id*="cancel"]:active, +button[id*="importexport-wizardbox_button[previous]"]:active, button#cancel:active { background-color: #fecc44 !important; color: #373737; @@ -2861,6 +2971,46 @@ button[id="cancel"]:active { -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); } +#passwordcancel { + background-image: url('../images/cancel.png') !important; + border: 1px solid rgba(0, 0, 0, 0.15); + /*.box_shadow_standard_light;*/ + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color: #000000; + -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; + transition-duration: 0.5s; + -webkit-transition-timing-function: linear; + -moz-transition-timing-function: linear; + -o-transition-timing-function: linear; + transition-timing-function: linear; + background-color: #e6e6e6; + padding-left: 30px !important; + background-position: 6px center !important; + background-repeat: no-repeat !important; + background-size: 20px auto !important; + width: auto; + height: 32px; +} +#passwordcancel:hover { + background-color: #f5b301 !important; + -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); +} +#passwordcancel:active { + background-color: #fecc44 !important; + -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); +} /* ######################################################################################## * * Button hinzufügen @@ -2980,6 +3130,18 @@ div.client_error_log tr.hidden td.stack > div { div.client_error_log tr td.stack > div { white-space: pre; } +/** +* table_passord_change +*/ +table.table_passord_change { + margin: 1em; +} +table.table_passord_change tr { + height: 50px; +} +table.table_passord_change td:first-child { + padding-right: 4em; +} /** * EGroupware: Stylite Pixelegg template * @@ -3108,7 +3270,6 @@ table.egwGridView_outer tbody td.frame { table.egwGridView_outer tbody td .et2_link { margin-left: 0px; color: #26537c; - font-weight: bold; } table.egwGridView_outer tbody td img { border: 1px solid transparent; @@ -4502,11 +4663,6 @@ div#calendar-container div.calendar table tbody tr.daysrow:hover { div#calendar-container div.calendar table tbody tr.rowhilite td { background-color: #ffc200; } -/* ########################################################################################################################################### - - - - /* ########################################################################################################################################### /* ########################################################################################################################################### * Main @@ -4517,12 +4673,18 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { padding: 0; width: auto; } +@media screen and (-webkit-min-device-pixel-ratio: 0) { + #egw_fw_main #egw_fw_tabs { + /*Chrome needs margin-top*/ + margin-top: 3px; + } +} #egw_fw_main #egw_fw_tabs { position: relative; background-color: transparent; float: left; width: 100%; - margin-top: 3px; + /*margin-top: 3px;*/ /*position: absolute;*/ /*top: 65px;*/ } @@ -4688,6 +4850,24 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { width: 100%; padding: 0 0 0 0; } +/* ########################################################################################################################################### +* ADMIN INDEX Tree +/* ########################################################################################################################################### +*/ +.standartTreeImage { + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(100%); + -o-filter: grayscale(100%); + filter: grayscale(100%); + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: gray; + /* IE 6-9 */ + width: 16px; + height: 16px; +} /*@import "../less/layout_nextmatch.less";*/ /** * Less-file for egroupware diff --git a/pixelegg/images/dialog_error.png b/pixelegg/images/dialog_error.png index 1de7a6fda0..a11be5a7cd 100755 Binary files a/pixelegg/images/dialog_error.png and b/pixelegg/images/dialog_error.png differ diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 885059e0ac..6ea5e60c1c 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -195,6 +195,41 @@ span.et2_date span { background-color: @color_tooltip; } +/** + * Link_entry_widget + */ +div.et2_link_to{ + + + button { + + .Complete_Button_normal; + &:hover {.Complete_Button_Icon_hover; background-color: @color_positive_action_active !important;} + &:active {.Complete_Button_Icon_active; background-color: @color_positive_action_active !important;} + } + + input{width: 72% !important;} +} + + +div.et2_link_entry{ + + //left + select {width: 30% !important;;} + + //center + input.ui-autocomplete-input { + width: 51% !important;; + padding-bottom: 1px; + } + //right - button + //line 201 + +} + + + + /** * Tabs widget */ @@ -212,22 +247,17 @@ span.et2_date span { -webkit-box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); - - -webkit-user-select: none; -moz-user-select: none; user-select: none; - &:hover { .color_5_gray; .background_color_25_gray; } - &:active{ .background_color_0_gray; .color_0_gray; } - } @@ -335,6 +365,9 @@ hr { height: 37px; .border_radius (15px, 3px, 0px, 0px); + + select {margin-top: 10px;} + .et2_label { /* font-size: 0.9em;*/ diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index 59f1569407..54d8b18682 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -829,6 +829,9 @@ a.textSidebox border-top:solid 1px #9c9c9c; border-left:solid 1px #9c9c9c; border-right:solid 1px #9c9c9c; + + + table img {.dimension_height_s;} } #divAppbox @@ -914,12 +917,13 @@ button.et2_button_with_image{ /* ######################################################################################## * - * Button löschen / delete / => color-negative-action + * Button löschen / delete / => color-negative-action // red * ######################################################################################## */ input[type="submit"][id*="delete"], input[type="button"][id*="delete"], +input[id*="delete"], button[id="delete"], button[id="infolog-edit_button[delete]"], button[id="addressbook-edit_button[delete]"], @@ -953,7 +957,7 @@ button[id="timesheet-edit_button[delete]"] /* ######################################################################################## * - * Button edit + save + apply + copy => color-positive-action + * Button edit + save + apply + copy => color-positive-action // green * ######################################################################################## */ @@ -973,6 +977,20 @@ button#filemanager-select_button[ok]{ &:active {background-color: @color_positive_action_active;} } +// Password change +#passwordchange { + background-image:url('../images/cancel.png') !important; + .Complete_Button_text_icon_before; + + &:hover {background-color: @color_positive_action_active !important; .box_shadow_standard_light_hover;} + &:active {background-color: @color_positive_action_active !important; .box_shadow_standard_light_inset;} + + +} + + +/* ######################################################################################## + * /*ui-widget*/ /*edit series*/ button#series { @@ -1005,11 +1023,12 @@ button[id*="edit_button[add_alarm]"]{ } /* ######################################################################################## * - * Button cancel / => color-cancel-action + * Button cancel / => color-cancel-action // yellow * ######################################################################################## */ button[id*="cancel"], +button[id*="importexport-wizardbox_button[previous]"], button#cancel{ &:hover { background-color: @color_cancel_action_hover !important; color: @gray_100; } @@ -1030,6 +1049,18 @@ button[id="cancel"]{ &:active {background-color: @color_cancel_action_active !important; .box_shadow_standard_light_inset;} } + +// Password cancel +#passwordcancel { + background-image:url('../images/cancel.png') !important; + .Complete_Button_text_icon_before; + + &:hover {background-color: @color_cancel_action_hover !important; .box_shadow_standard_light_hover;} + &:active {background-color: @color_cancel_action_active !important; .box_shadow_standard_light_inset;} + + +} + /* ######################################################################################## * * Button hinzufügen @@ -1119,4 +1150,15 @@ div.client_error_log tr td.stack > div { } -// \ No newline at end of file +/** +* table_passord_change +*/ + +table.table_passord_change{ + margin: 1em; + tr {height: 50px;} + td:first-child{ padding-right: 4em;} + +} + +// \ No newline at end of file diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 3e1ce546d2..1ad26ec85a 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -1048,11 +1048,6 @@ div#calendar-container { } -/* ########################################################################################################################################### - - - - /* ########################################################################################################################################### /* ########################################################################################################################################### * Main @@ -1073,6 +1068,14 @@ div#calendar-container { // ######################################## // APPS + // CHrome hack + @media screen and (-webkit-min-device-pixel-ratio:0) { + #egw_fw_tabs { + /*Chrome needs margin-top*/ + margin-top: 3px; + } + } + #egw_fw_tabs{ @@ -1080,7 +1083,7 @@ div#calendar-container { background-color: transparent; float: left; width: 100%; - margin-top: 3px; + /*margin-top: 3px;*/ /*position: absolute;*/ /*top: 65px;*/ @@ -1280,6 +1283,18 @@ div#calendar-container { // Ende Main } +/* ########################################################################################################################################### +* ADMIN INDEX Tree +/* ########################################################################################################################################### +*/ + + +.standartTreeImage { + .img_filter_gray; + .dimension_width_height_s; +} + + // // \ No newline at end of file diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less index 55e1f61853..3a7c04d9ce 100755 --- a/pixelegg/less/layout_table.less +++ b/pixelegg/less/layout_table.less @@ -160,7 +160,7 @@ table.egwGridView_outer{ /*Elements inside td*/ td{ - .et2_link {margin-left: 0px; color: @link_color; font-weight: bold;} + .et2_link {margin-left: 0px; color: @link_color;} img {border: 1px solid transparent; box-shadow: none;}