diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 2b3708c404..5916f95741 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -301,6 +301,9 @@ input[type=button]:focus {
list-style-image: none;
list-style-type: none;
}
+.et2_selectbox .ui-multiselect-checkboxes li:hover {
+ background-color: #ffc200 !important;
+}
.et2_selectbox .ui-multiselect-checkboxes ul {
margin: 0px auto;
padding-left: 0px;
@@ -1281,7 +1284,6 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
.ms-res-ctn {
overflow-x: hidden;
}
-/*sadfs*/
/**
* EGroupware: Stylite Pixelegg template
*
@@ -1386,9 +1388,10 @@ option:checked {
border-right: solid 1px 1px;
border-bottom: solid 1px 1px;
border-color: #f0f0f0;
- background: #ffc200;
+ background: #ffc200 !important;
background-image: none !important;
color: #000000;
+ font-weight: normal !important;
}
.ui-state-hover a,
.ui-state-hover a:hover,
@@ -3468,6 +3471,17 @@ img {
padding-left: 0;
padding-right: 10px;
float: left;
+ /*filter grey*/
+ filter: url("data:image/svg+xml;utf8,#grayscale");
+ /* Firefox 10+, Firefox on Android */
+ -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 */
}
#egw_fw_sidebar #egw_fw_splitter {
position: absolute;
@@ -3921,6 +3935,7 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown,
.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown {
/*linke Seite Bild*/
+ /*right Button*/
}
.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
@@ -3978,6 +3993,20 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
position: absolute;
z-index: 2;
}
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button.ui-corner-right,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button.ui-corner-right,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown button.ui-corner-right,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown button.ui-corner-right {
+ background-image: url("../images/fav_filter_normal.png");
+}
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button.ui-state-hover,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button.ui-state-hover,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown button.ui-state-hover,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown button.ui-state-hover {
+ /*background-image: none;*/
+ background-color: rgba(255, 255, 255, 0.9) !important;
+ background-image: url("../images/fav_filter_normal.png") !important;
+}
.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper ul,
.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper ul,
.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper ul,
@@ -4030,6 +4059,18 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
# Filterleiste
#
#########################################################*/
+.et2_nextmatch .nextmatch_header > .filters {
+ background-image: none !important;
+ border: medium none !important;
+ background: yellow !important;
+ padding: 0 0 1em 1em;
+ background-color: #d9d9d9 !important;
+ vertical-align: top;
+ border-width: 0 0 1px 0;
+ border-color: #d9d9d9;
+ width: 80%;
+ margin-bottom: 1em;
+}
.filters {
padding: 0 0 1em 1em;
background-color: #f0f0f0;
@@ -4038,6 +4079,7 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
background-image: none;
width: 80%;
margin-bottom: 1em;
+ /*Suchen Button*/
}
.filters img.et2_button_icon {
float: right;
diff --git a/pixelegg/images/fav_filter_normal.png b/pixelegg/images/fav_filter_normal.png
new file mode 100755
index 0000000000..f4ca4377c5
Binary files /dev/null and b/pixelegg/images/fav_filter_normal.png differ
diff --git a/pixelegg/images/login/background-image-1.jpg b/pixelegg/images/login/background-image-1.jpg
new file mode 100755
index 0000000000..c86e9fce4c
Binary files /dev/null and b/pixelegg/images/login/background-image-1.jpg differ
diff --git a/pixelegg/images/login/background-image-2.jpg b/pixelegg/images/login/background-image-2.jpg
new file mode 100755
index 0000000000..c1a79a7fee
Binary files /dev/null and b/pixelegg/images/login/background-image-2.jpg differ
diff --git a/pixelegg/images/login/background-image.psd b/pixelegg/images/login/background-image.psd
new file mode 100755
index 0000000000..c59aeb83ad
Binary files /dev/null and b/pixelegg/images/login/background-image.psd differ
diff --git a/pixelegg/js/login.js b/pixelegg/js/login.js
index 90a9fd762d..3a594f4bb1 100755
--- a/pixelegg/js/login.js
+++ b/pixelegg/js/login.js
@@ -12,9 +12,9 @@ var dg_H = $j(window).height();
var dg_W = $j(window).width();
$j('#wrap').css({'height':dg_H,'width':dg_W});
function anim() {
- $j("#wrap img.bgfade").first().appendTo('#wrap').fadeOut(1500);
- $j("#wrap img").first().fadeIn(1500);
- setTimeout(anim, 3000);
+ $j("#wrap img.bgfade").first().appendTo('#wrap').fadeOut(3500);
+ $j("#wrap img").first().fadeIn(3500);
+ setTimeout(anim, 7000);
}
anim();
$j(window).resize(function(){window.location.href=window.location.href});
diff --git a/pixelegg/less/def_content_elements.less b/pixelegg/less/def_content_elements.less
index 9e4938f299..5ba3c3c198 100755
--- a/pixelegg/less/def_content_elements.less
+++ b/pixelegg/less/def_content_elements.less
@@ -23,7 +23,6 @@
*
* ########################################################################################
*/
-
//Reset
html * {
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 772aca64e8..2762c04b9b 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -309,7 +309,10 @@ button.et2_button_text:focus, input[type=button]:focus {
// text-indent: -26px;
// max-width: 85%;
- // &:hover {background-color: @egw_color_2_e;}
+ &:hover {background-color: @color-hint !important;}
+
+
+
}
.et2_selectbox .ui-multiselect-checkboxes ul {
margin: 0px auto;
@@ -1404,5 +1407,4 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
.ms-res-ctn {
overflow-x: hidden;
}
-
-/*sadfs*/
\ No newline at end of file
+//
\ No newline at end of file
diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less
index a527b27f90..46ba92ffd4 100755
--- a/pixelegg/less/jquery-ui.less
+++ b/pixelegg/less/jquery-ui.less
@@ -107,10 +107,11 @@ option:checked {background-color: @egw_color_1_e;}
.bordered(1px, 1px, 1px,1px);
.border-color-10-gray;
// background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x;
- background: @color-hint;
+ background: @color-hint !important;
background-image: none !important;
// font-size: 105%;
.color-100-gray;
+ font-weight: normal !important;
}
.ui-state-hover a,
.ui-state-hover a:hover,
diff --git a/pixelegg/less/layout_nextmatch.css b/pixelegg/less/layout_nextmatch.css
index 6c0b23be4a..a4d572a0b5 100644
--- a/pixelegg/less/layout_nextmatch.css
+++ b/pixelegg/less/layout_nextmatch.css
@@ -433,6 +433,7 @@
.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown,
.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown {
/*linke Seite Bild*/
+ /*right Button*/
}
.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
@@ -490,6 +491,20 @@
position: absolute;
z-index: 2;
}
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button.ui-corner-right,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button.ui-corner-right,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown button.ui-corner-right,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown button.ui-corner-right {
+ background-image: url("../images/fav_filter_normal.png");
+}
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button.ui-state-hover,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button.ui-state-hover,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown button.ui-state-hover,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown button.ui-state-hover {
+ /*background-image: none;*/
+ background-color: rgba(255, 255, 255, 0.9) !important;
+ background-image: url("../images/fav_filter_normal.png") !important;
+}
.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper ul,
.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper ul,
.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper ul,
@@ -542,6 +557,18 @@
# Filterleiste
#
#########################################################*/
+.et2_nextmatch .nextmatch_header > .filters {
+ background-image: none !important;
+ border: medium none !important;
+ background: yellow !important;
+ padding: 0 0 1em 1em;
+ background-color: #d9d9d9 !important;
+ vertical-align: top;
+ border-width: 0 0 1px 0;
+ border-color: #d9d9d9;
+ width: 80%;
+ margin-bottom: 1em;
+}
.filters {
padding: 0 0 1em 1em;
background-color: #f0f0f0;
@@ -550,6 +577,7 @@
background-image: none;
width: 80%;
margin-bottom: 1em;
+ /*Suchen Button*/
}
.filters img.et2_button_icon {
float: right;
diff --git a/pixelegg/less/layout_nextmatch.less b/pixelegg/less/layout_nextmatch.less
index db478ec3da..122d5bc489 100644
--- a/pixelegg/less/layout_nextmatch.less
+++ b/pixelegg/less/layout_nextmatch.less
@@ -142,6 +142,18 @@
position: absolute;
z-index: 2;
}
+
+
+ /*right Button*/
+ button.ui-corner-right {
+ background-image: url("../images/fav_filter_normal.png");
+ }
+
+ button.ui-state-hover {
+ /*background-image: none;*/
+ background-color: rgba(255, 255, 255, 0.9 ) !important;
+ background-image: url("../images/fav_filter_normal.png") !important;
+ }
} // dropdown
@@ -195,18 +207,35 @@
# Filterleiste
#
#########################################################*/
+.et2_nextmatch .nextmatch_header > .filters {
+ background-image: none !important;
+ border: medium none !important;
+ background: yellow !important;
+ padding: 0 0 1em 1em;
+ .background-color-15-gray !important;
+ vertical-align: top;
+ border-width: 0 0 1px 0;
+ .border-color-15-gray;
+ width: 80%;
+ margin-bottom: 1em;
+}
+
+
.filters {
.nm_filters_rectangle;
width: 80%;
margin-bottom: 1em;
- // Export Bild
+ // Export Icon
img.et2_button_icon {
float: right;
position: relative;
top: 0px;
}
+
+
+
select,
input,
button {height: 20px;}
@@ -238,7 +267,10 @@
}
label { }
- // Suchen Button
+
+
+
+ /*Suchen Button*/
button {
.Complete_Button_search_action;
background-image: none;
diff --git a/pixelegg/less/layout_raster.css b/pixelegg/less/layout_raster.css
index 6f7270a6cc..7f34453a35 100644
--- a/pixelegg/less/layout_raster.css
+++ b/pixelegg/less/layout_raster.css
@@ -820,6 +820,17 @@
padding-left: 0;
padding-right: 10px;
float: left;
+ /*filter grey*/
+ filter: url("data:image/svg+xml;utf8,#grayscale");
+ /* Firefox 10+, Firefox on Android */
+ -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 */
}
#egw_fw_sidebar #egw_fw_splitter {
position: absolute;
diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less
index 8099d621e6..7d943d9ed5 100644
--- a/pixelegg/less/layout_raster.less
+++ b/pixelegg/less/layout_raster.less
@@ -519,7 +519,18 @@
padding-left: 0;
padding-right: 10px;
float: left;
- }
+
+ /*filter grey*/
+ filter: url("data:image/svg+xml;utf8,#grayscale"); /* Firefox 10+, Firefox on Android */
+
+ -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 */
+ }
}
diff --git a/pixelegg/templates/pixelegg/login.tpl b/pixelegg/templates/pixelegg/login.tpl
index bcf003f570..fdf8b468a5 100644
Binary files a/pixelegg/templates/pixelegg/login.tpl and b/pixelegg/templates/pixelegg/login.tpl differ