diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index e0e13eef25..2800fb667b 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -2801,6 +2801,7 @@ action buttons, left aligned for "extra" controls
margin: 0px;
}
}
+/*@import "../../phpgwapi/templates/idots/css/traditional.css";*/
/**
* EGroupware: Stylite Pixelegg template
*
@@ -2992,7 +2993,8 @@ option:checked {
}
.ui-icon-close {
/*visibility: hidden;*/
- background-image: url(../images/search.png);
+ /*background-image: url(../images/search.png);*/
+ background-image: url("/egroupware2/pixelegg/images/cancel.png");
background-repeat: no-repeat;
background-color: #ffffff;
background-size: contain;
@@ -4066,12 +4068,26 @@ form {
img {
border: 0;
}
+/*SVG Filter / not for Logo */
+#egw_fw_sidebar img[src$="svg"],
+#egw_fw_main img[src$="svg"],
+#egw_fw_footer img[src$="svg"] {
+ 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;
+}
input,
button,
select {
border: solid 1px #bbbbbb;
padding: 0.2em;
- font-size: 0.9em;
+ font-size: 1em;
}
div {
color: #000000;
@@ -4770,11 +4786,27 @@ table.egwGridView_outer thead tr th.optcol span.selectcols {
table.egwGridView_outer thead tr th.optcol span.selectcols:hover {
background-color: #679fd2;
}
+table.egwGridView_outer tbody {
+ /*Elements inside td*/
+}
table.egwGridView_outer tbody td.frame {
border: 1px solid #e6e6e6;
/*padding: 0px 5px; no need*/
}
-table.egwGridView_outer tbody img {
+table.egwGridView_outer tbody td .et2_link {
+ margin-left: 0px;
+}
+table.egwGridView_outer tbody td img {
+ /*.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);
+ 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;
+}
+table.egwGridView_outer tbody td img[src$="svg"] {
background-color: #0c5da5;
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5);
@@ -4784,14 +4816,6 @@ table.egwGridView_outer tbody img {
background-image: -o-linear-gradient(top, #0c5da5, #0c5da5);
background-image: linear-gradient(top, #0c5da5, #0c5da5);
background-repeat: repeat-x;
- /*.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);
- 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;
}
/*########################################################*/
table.egwGridView_grid {
@@ -5689,6 +5713,7 @@ img {
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active img {
padding-left: 9px;
padding-top: 6px;
+ height: 18px;
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 {
text-transform: uppercase;
@@ -5843,7 +5868,7 @@ img {
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active {
border-bottom-width: 0px;
margin-top: 4px;
- background-color: #408dd2;
+ background-color: #0c5da5;
/*.background-color-50-gray;*/
color: #f2f2f2;
-webkit-border-top-right-radius: 3px !important;
@@ -5881,7 +5906,7 @@ img {
background-color: inherit !important;
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active:hover {
- background-color: #0c5da5;
+ background-color: #408dd2;
-webkit-transition: all 0.2s ease-out;
-moz-transition: all 0.2s ease-out;
-o-transition: all 0.2s ease-out;
@@ -6449,14 +6474,14 @@ table.dialog-main-view {
tr.dialog-header2,
tr.dialog-header3,
tr.dialog-header4 {
- background-color: #679fd2 !important;
+ background-color: #e6e6e6 !important;
border-top: 2px solid #e6e6e6;
border-bottom: 2px solid #e6e6e6;
}
tr.dialog-header2 .et2_label,
tr.dialog-header3 .et2_label,
tr.dialog-header4 .et2_label {
- color: #ffffff;
+ color: #1a1a1a;
vertical-align: bottom;
padding: 0px 0px 0px 3px !important;
}
diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less
index aaef994c33..a2215851a8 100644
--- a/pixelegg/css/pixelegg.less
+++ b/pixelegg/css/pixelegg.less
@@ -39,6 +39,7 @@
* neccesarry settings
*/
@import "../less/etemplate2.less";
+/*@import "../../phpgwapi/templates/idots/css/traditional.css";*/
@import "../less/jquery-ui.less";
@import "../less/magicsuggest.less";
// next one transferred to layout_chosen.less
diff --git a/pixelegg/images/abbruch.svg b/pixelegg/images/abbruch.svg
new file mode 100755
index 0000000000..3317c41654
--- /dev/null
+++ b/pixelegg/images/abbruch.svg
@@ -0,0 +1,10 @@
+
+
+
+
diff --git a/pixelegg/images/about.svg b/pixelegg/images/about.svg
new file mode 100755
index 0000000000..829d548c9f
--- /dev/null
+++ b/pixelegg/images/about.svg
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/pixelegg/images/access.svg b/pixelegg/images/access.svg
new file mode 100755
index 0000000000..9d8b67181b
--- /dev/null
+++ b/pixelegg/images/access.svg
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/pixelegg/images/accounts.svg b/pixelegg/images/accounts.svg
new file mode 100755
index 0000000000..e6f4b5c3db
--- /dev/null
+++ b/pixelegg/images/accounts.svg
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/pixelegg/images/add.svg b/pixelegg/images/add.svg
new file mode 100755
index 0000000000..ea061e3d53
--- /dev/null
+++ b/pixelegg/images/add.svg
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/pixelegg/images/advanced-search.svg b/pixelegg/images/advanced-search.svg
new file mode 100755
index 0000000000..e9f26933d8
--- /dev/null
+++ b/pixelegg/images/advanced-search.svg
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/pixelegg/images/agt_action_success.svg b/pixelegg/images/agt_action_success.svg
new file mode 100755
index 0000000000..32e2fb22b0
--- /dev/null
+++ b/pixelegg/images/agt_action_success.svg
@@ -0,0 +1,11 @@
+
+
+
+
diff --git a/pixelegg/images/agt_reload.svg b/pixelegg/images/agt_reload.svg
new file mode 100755
index 0000000000..0d54274d11
--- /dev/null
+++ b/pixelegg/images/agt_reload.svg
@@ -0,0 +1,9 @@
+
+
+
+
diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less
index 81c6aaf006..d14be7177a 100755
--- a/pixelegg/less/def_design_pattern_color_font_shadow.less
+++ b/pixelegg/less/def_design_pattern_color_font_shadow.less
@@ -622,7 +622,7 @@
// Based on this by Phil Brown: http://blog.philipbrown.id.au/2012/09/base64-encoded-svg-gradient-backgrounds-in-less/
// Also based on a mixin from Twitter Bootstrap: https://github.com/twitter/bootstrap
-.gradient-vertical(@startColor, @endColor) {
+.gradient_vertical(@startColor, @endColor) {
// IE9 prep
@dataPrefix: ~"url(data:image/svg+xml;base64,";
diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less
index 7ed8193ea2..b6ad32b1ce 100755
--- a/pixelegg/less/jquery-ui.less
+++ b/pixelegg/less/jquery-ui.less
@@ -184,7 +184,8 @@ option:checked {background-color: @egw_color_1_e;}
.ui-icon-close{
/*visibility: hidden;*/
- background-image: url(../images/search.png);
+ /*background-image: url(../images/search.png);*/
+ background-image: url("/egroupware2/pixelegg/images/cancel.png");
background-repeat: no-repeat;
background-color: @gray_0;
background-size: contain;
diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less
index 4219a1d1bc..30d981b102 100755
--- a/pixelegg/less/layout_content_elements.less
+++ b/pixelegg/less/layout_content_elements.less
@@ -546,7 +546,12 @@ img
}
-
+/*SVG Filter / not for Logo */
+#egw_fw_sidebar img[src$="svg"],
+#egw_fw_main img[src$="svg"],
+#egw_fw_footer img[src$="svg"]{
+ .gradient_vertical (@egw_color_2_a, @egw_color_2_a);
+}
@@ -554,7 +559,7 @@ input,button,select
{
border: solid 1px #bbbbbb;
padding: 0.2em;
- font-size: 0.9em;
+ font-size: 1em;
}
div{
color: #000000;
diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less
index 1f400d78de..156a022041 100755
Binary files a/pixelegg/less/layout_dialog.less and b/pixelegg/less/layout_dialog.less differ
diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less
index 45ea0cd25d..b4332f3961 100644
--- a/pixelegg/less/layout_raster.less
+++ b/pixelegg/less/layout_raster.less
@@ -575,7 +575,9 @@
margin: 0 0 0 0;
border-bottom: none;
height: 30px;
- img {padding-left: 9px; padding-top: 6px;}
+
+
+ img {padding-left: 9px; padding-top: 6px; height: 18px;}
h1 {text-transform: uppercase; font-size: 1.4em; .color_100_gray; padding-top: .8em;}
@@ -667,7 +669,7 @@
border-bottom-width: 0px;
margin-top: 4px;
- background-color: @egw_color_2_d;
+ background-color: @egw_color_2_a;
/*.background-color-50-gray;*/
.color_5_gray;
@@ -692,7 +694,7 @@
}
}
- &:hover {background-color: @egw_color_2_a; .transition (0.2s, ease-out);}
+ &:hover {background-color: @egw_color_2_d; .transition (0.2s, ease-out);}
}
diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less
index 6bb566c6fa..d76f0bbc89 100755
--- a/pixelegg/less/layout_table.less
+++ b/pixelegg/less/layout_table.less
@@ -151,10 +151,22 @@ table.egwGridView_outer{
}
- img {
- .gradient-vertical (@egw_color_2_a, @egw_color_2_a);
+
+ /*Elements inside td*/
+ td{
+
+ .et2_link {margin-left: 0px}
+
+ img {
.Complete_Button_Icon_normal;
- };
+ }
+ img[src$="svg"] {
+ .gradient_vertical (@egw_color_2_a, @egw_color_2_a);
+ }
+
+
+ }
+
}
}
diff --git a/pixelegg/less/traditional.less b/pixelegg/less/traditional.less
index fe1f9dba11..288a8e3b51 100755
--- a/pixelegg/less/traditional.less
+++ b/pixelegg/less/traditional.less
@@ -58,6 +58,28 @@ a:hover,a:active
line-height:40px;
}
+.pageGenTime,#divPoweredBy
+ {
+ font-size: 80%; font-size: 80%;
+ color: #ff0000; color: #ff0000;
+ text-align: center;
+ }
+
+ .pageGenTime {
+ margin-top: 1em;
+ }
+
+ .pageGenTime > span:after {
+ content: ", ";
+ }
+
+ .pageGenTime > span:last-child:after {
+ content: "";
+ }
+
+
+
+
#divAppboxHeader
{
line-height:28px;