diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index 0c56aee3e4..63b1a5b90e 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -12,8 +12,8 @@ * @version $Id$ */ -@import (reference) "../../../pixelegg/less/def_buttons.less"; -@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; + +@import (reference) "../../../pixelegg/less/definitions.less"; @import (less) "../default/app.css"; diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css index 22c009ed8c..c8e2a59574 100755 --- a/admin/templates/pixelegg/app.css +++ b/admin/templates/pixelegg/app.css @@ -18,7 +18,7 @@ * @package etemplate * @link http://www.egroupware.org * @author Ralf Becker - * @version $Id: app.css 46650 2014-04-17 12:09:11Z hnategh $ + * @version $Id: app.css 47432 2014-06-30 07:48:05Z hnategh $ */ .admin_tree table, .admin_tree tr, @@ -78,6 +78,10 @@ td.admin_userAgent span { display: none; } @media all { + div.dhtmlxTree td.standartTreeRow span.selectedTreeRow { + background-color: #ffdd73; + color: #1e1e1e; + } /* ############################################################################# // iframe // Rahmen + padding**/ @@ -102,9 +106,22 @@ td.admin_userAgent span { iframe#admin-index_iframe table.egwGridView_grid tr td { color: #000; } + table.egwGridView_grid img { + /*filter grey*/ + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(0%); + -o-filter: grayscale(100%); + filter: grayscale(100%); + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: gray; + /* IE 6-9 */ + } /*########################################### # # -# dialog-header # +# dialogHeader # ############################################# # # # # diff --git a/admin/templates/pixelegg/app.less b/admin/templates/pixelegg/app.less index 53c9dc5eb0..590c3308bb 100755 --- a/admin/templates/pixelegg/app.less +++ b/admin/templates/pixelegg/app.less @@ -12,13 +12,29 @@ * @version $Id$ */ -@import (reference) "../../../pixelegg/less/def_buttons.less"; -@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; + +@import (reference) "../../../pixelegg/less/definitions.less"; @import (less) "../default/app.css"; @media all { + // ADMIN in SIDEBAR + + div.dhtmlxTree { + + + // selected Item + td.standartTreeRow { + + span.selectedTreeRow { background-color: @egw_color_1_e; color: @gray_90;} + + } + + + + } + /* ############################################################################# // iframe @@ -44,6 +60,9 @@ iframe#admin-index_iframe{ /*.egwGridView_scrollarea { min-height: 500px;}*/ + + + #admin-categories-index{ padding: 10px; @@ -71,6 +90,11 @@ iframe#admin-index_iframe{ } // iframe +// gray Filter for images + table.egwGridView_grid img { + /*filter grey*/ + .img_filter_gray; + } @@ -80,7 +104,7 @@ iframe#admin-index_iframe{ /*########################################### # # -# dialog-header # +# dialogHeader # ############################################# # # # # diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 48f9fe20b7..d9710bfffb 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -11,7 +11,7 @@ * @package calendar * @version $Id$ */ -/* $Id: app.css 47279 2014-06-16 16:49:45Z hnategh $ */ +/* $Id: app.css 47456 2014-07-01 12:03:39Z hnategh $ */ /* Header classes */ tr.dialogHeader td, tr.dialogHeader2 td, @@ -849,7 +849,7 @@ div.calendar { .calendar tbody td.today { /* Cell showing selected date */ font-weight: normal; - color: #0c5da5; + color: #189800; background-color: #ffc200; } .calendar tbody .disabled { diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 4278719f5a..0dbc92a8bb 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -12,8 +12,8 @@ * @version $Id$ */ -@import (reference) "../../../pixelegg/less/def_buttons.less"; -@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; + +@import (reference) "../../../pixelegg/less/definitions.less"; @import (less) "../default/app.css"; diff --git a/etemplate/templates/pixelegg/app.less b/etemplate/templates/pixelegg/app.less index 87b98562da..0180bfd8ee 100755 --- a/etemplate/templates/pixelegg/app.less +++ b/etemplate/templates/pixelegg/app.less @@ -9,8 +9,10 @@ * @version $Id$ */ -@import (reference) "../../../pixelegg/less/def_buttons.less"; -@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; + +@import (reference) "../../../pixelegg/less/definitions.less"; + + .redItalic, .message { color: red; diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css index 6eadc74e48..e11f10c39e 100755 --- a/filemanager/templates/pixelegg/app.css +++ b/filemanager/templates/pixelegg/app.css @@ -295,6 +295,17 @@ div.filemanager_navigation label input { #filemanager-index .filters #filemanager-index_filter { margin-top: 0.5em; } +table.egwGridView_grid img { + /*filter grey*/ + filter: none; + -webkit-filter: initial; + -moz-filter: initial; + -ms-filter: initial; + -o-filter: initial; + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: initial; + /* IE 6-9 */ +} /*// #####################################################*/ /*Dialog filemanager*/ #filemanager-select { @@ -424,7 +435,7 @@ div#stylite-filemanager-upload .et2_file input { background-color: #0c5da5; } div#stylite-filemanager-upload .et2_file input:hover { - background-color: #66a1d2 !important; + background-color: #189800 !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); diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less index 86dacb7b3a..89f2d73697 100644 --- a/filemanager/templates/pixelegg/app.less +++ b/filemanager/templates/pixelegg/app.less @@ -12,8 +12,8 @@ * @version $Id$ */ -@import (reference) "../../../pixelegg/less/def_buttons.less"; -@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; + +@import (reference) "../../../pixelegg/less/definitions.less"; @import (less) "../default/app.css"; /*/***************************************************************** @@ -194,7 +194,21 @@ div.filemanager_navigation{ } -} // iframe +} + + + +// images .... uploaded files +table.egwGridView_grid img { + + .img_filter_none; + +} + + + + +// iframe diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index a5b52c0211..c7cdf6771b 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -12,9 +12,9 @@ * @version $Id$ */ -@import (reference) "../../../pixelegg/less/def_buttons.less"; -@import (reference) "../../../pixelegg/less/layout_content_elements.less"; -@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; + +@import (reference) "../../../pixelegg/less/layout_definitions.less"; +@import (reference) "../../../pixelegg/less/definitions.less"; @import (less) "../default/app.css"; #popupMainDiv{ diff --git a/timesheet/templates/pixelegg/app.css b/timesheet/templates/pixelegg/app.css index f2d67c5a53..dba1dc547c 100755 --- a/timesheet/templates/pixelegg/app.css +++ b/timesheet/templates/pixelegg/app.css @@ -11,6 +11,41 @@ * @package timesheet * @version $Id$ */ +/** + * Styles for etemplate2 widgets + * + * @version: $Id$ + */ +/* Header classes*/ +tr.dialogHeader td, +tr.dialogHeader2 td, +tr.dialogHeader3 td, +tr.dialogHeader4 td, +tr.dialogOperators td, +.dialogFooterToolbar { + padding: 5px 0 5px 0; + vertical-align: middle; +} +.timesheet_titleSum, +.timesheet_titleDetails { + font-weight: bold; +} +div#timesheet-edit.et2_container { + width: 648px; +} +/* add # sign behind the ts_id */ +#timesheet-edit_ts_id:before { + content: "#"; +} +/* make the modifier inline*/ +.timesheet_modifier label { + display: inline-block; + float: right; +} +.timesheet_modifier ul { + display: inline-block; + float: left; +} #timesheet-index { /*Details Bold*/ } diff --git a/timesheet/templates/pixelegg/app.less b/timesheet/templates/pixelegg/app.less index b4d7ccac7f..c0393b5a4d 100755 --- a/timesheet/templates/pixelegg/app.less +++ b/timesheet/templates/pixelegg/app.less @@ -12,9 +12,9 @@ * @version $Id$ */ -@import (reference) "../../../pixelegg/less/def_buttons.less"; -@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; +@import (reference) "../../../pixelegg/less/definitions.less"; +@import (less) "../default/app.css"; // iframe