holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pixelegg changes from Tuesday

Browse Source
This commit is contained in:
Ralf Becker 2014-01-21 17:30:43 +00:00
parent 4057ad4f7c
commit d2f63b607d
15 changed files with 158 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
pixelegg/css/pixelegg.css
View File

@ -2835,16 +2835,17 @@ div.selectbox-wrapper ul li {
display: block;
outline: none;
padding: 7px 0 7px 3px;
color: #26537c;
}
.sbOptions a:link,
.sbOptions a:visited {
color: #000000;
color: #26537c;
text-decoration: none;
}
.sbOptions a:hover,
.sbOptions a:focus,
.sbOptions a.sbFocus {
color: #EBB52D;
color: #ffffff;
}
.sbOptions li.last a {
border-bottom: none;
@ -2873,7 +2874,7 @@ a:visited,
select,
input,
textarea {
color: #000000;
color: #26537c;
}
select,
input,
@ -2891,13 +2892,13 @@ select {
a:link,
a:visited {
cursor: pointer;
color: #000000;
color: #26537c;
text-decoration: none;
}
a:hover,
a:active {
cursor: pointer;
color: #000000;
color: #ffffff;
text-decoration: underline;
}
.divLoginboxHeader,
@ -3361,12 +3362,13 @@ button.et2_button_with_image background-color[url$="svg"] {
* Button löschen / delete / => color-negative-action
*
######################################################################################## */
input[type="submit"][id="delete"],
input[type="button"][id="delete"],
input[type="submit"][id*="delete"],
input[type="button"][id*="delete"],
button[id="delete"],
button[id="infolog-edit_button[delete]"],
button[id="addressbook-edit_button[delete]"],
button[id="resources-edit_delete"] {
button[id="resources-edit_delete"],
button[id="calendar-edit_button[delete]"] {
background-color: #b81f00 !important;
background-image: url('../images/delete-hover.png') !important;
margin-left: 3em;
@ -3401,12 +3403,13 @@ button[id="resources-edit_delete"] {
/*background-color: @color-negative-action !important;*/
color: #ffffff !important;
}
input[type="submit"][id="delete"]:hover,
input[type="button"][id="delete"]:hover,
input[type="submit"][id*="delete"]:hover,
input[type="button"][id*="delete"]:hover,
button[id="delete"]:hover,
button[id="infolog-edit_button[delete]"]:hover,
button[id="addressbook-edit_button[delete]"]:hover,
button[id="resources-edit_delete"]:hover {
button[id="resources-edit_delete"]:hover,
button[id="calendar-edit_button[delete]"]:hover {
background-image: url('../images/delete-hover.png') !important;
background-color: #b81f00 !important;
border: 1px solid rgba(0, 0, 0, 0.15);
@ -3438,12 +3441,13 @@ button[id="resources-edit_delete"]:hover {
height: 32px;
color: #ffffff !important;
}
input[type="submit"][id="delete"]:active,
input[type="button"][id="delete"]:active,
input[type="submit"][id*="delete"]:active,
input[type="button"][id*="delete"]:active,
button[id="delete"]:active,
button[id="infolog-edit_button[delete]"]:active,
button[id="addressbook-edit_button[delete]"]:active,
button[id="resources-edit_delete"]:active {
button[id="resources-edit_delete"]:active,
button[id="calendar-edit_button[delete]"]:active {
background-image: url('../images/delete-hover.png') !important;
background-color: #e12500 !important;
border: 1px solid rgba(0, 0, 0, 0.15);
@ -3745,6 +3749,37 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
background-size: 20px auto;
}
}
/**
* Clientside Javascript error-log
*/
#topmenu_info_error {
width: 16px;
cursor: pointer;
}
div.client_error_log {
max-height: 50ex;
}
div.client_error_log tbody {
vertical-align: top;
}
div.client_error_log tr.hidden td > div {
max-height: 2ex;
max-width: 40ex;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
div.client_error_log tr td.timestamp > div {
text-wrap: none;
white-space: normal;
width: 27ex;
}
div.client_error_log tr.hidden td.stack > div {
text-indent: 100%;
}
div.client_error_log tr td.stack > div {
white-space: pre;
}
/**
* EGroupware: Stylite Pixelegg template
*
@ -3872,6 +3907,8 @@ 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 {
/*.background_color_10_gray;*/
@ -3883,6 +3920,9 @@ table.egwGridView_outer tbody td img {
-moz-border-radius: 3px;
border-radius: 3px;
}
table.egwGridView_outer tbody td time {
display: block;
}
table.egwGridView_outer tbody td img[src$="svg"] {
background-color: #0c5da5;
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
@ -3941,7 +3981,7 @@ table.egwGridView_grid tr td {
border-right: 0px;
/*padding: 0.3em 0 0.3em 0.3em;*/
border-bottom: 1px solid;
color: #bfbfbf;
color: #696969;
/*&:hover {background-color: @egw_color_2_e;} legacy*/
}
table.egwGridView_grid tr td:active {
@ -4700,6 +4740,9 @@ table.nextmatch_header img {
right: 1px !important;
top: -5px;
}
#egw_fw_topmenu_info_items img#topmenu_info_error {
height: 16px;
}
/* ################################################################################################################
* Sidebar
* ################################################################################################################*/
@ -5312,7 +5355,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
background: transparent;
display: inline-table;
margin: 0px 5px 0px 0px;
padding: 2px 10px 5px 10px;
padding: 2px 2px 5px 2px;
cursor: pointer;
border-width: 1px 1px 0 1px;
border-style: solid;
@ -5326,7 +5369,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 {
font-size: 100%;
line-height: 1em;
margin: 0 15px 2px 3px;
margin: 0 1px 2px 2px;
vertical-align: super;
}
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header img.egw_fw_ui_tab_icon {
@ -5402,8 +5445,8 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
right: 1px;
top: 1px;
display: inline-block;
width: 16px;
height: 16px;
width: 12px;
height: 12px;
margin-left: 0px;
background-repeat: no-repeat;
background-position: center;

1
pixelegg/css/pixelegg.less
View File

@ -67,5 +67,4 @@
//
//
//

BIN
pixelegg/images/dhtmlxtree/folderClosed.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
pixelegg/images/dhtmlxtree/folderClosed.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
pixelegg/images/dhtmlxtree/folderNoSelectClosed.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
pixelegg/images/dhtmlxtree/folderNoSelectClosed.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
pixelegg/images/dhtmlxtree/folderNoSelectOpen.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
pixelegg/images/dhtmlxtree/folderNoSelectOpen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
pixelegg/images/dhtmlxtree/folderOpen.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
pixelegg/images/dhtmlxtree/folderOpen.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

2
pixelegg/js/slider.js
View File

@ -52,7 +52,7 @@ function hide_pixelegg_header(_toggle, _delay)
//Tab
$j(".egw_fw_ui_tab_header").css("height", "24px");
// ICON
$j(".egw_fw_ui_tab_icon").css("height", "17px");
//$j(".egw_fw_ui_tab_icon").css("height", "17px");
$j(".egw_fw_ui_tab_icon").css("display", "inline-block");
$j(".egw_fw_ui_tab_icon").css("margin-right", "5px");
// H1

31
pixelegg/less/def_design_pattern_color_font_shadow.less
View File

@ -119,7 +119,7 @@
@yellow : #FFD40F;
// Link Colours
@link_color : #000000;
@link_color : @egw_color_2_b;
@link_color_active: @link_color*010101;
// soll EGROUPWARE FARBE GEBEN
@ -677,5 +677,34 @@ background-repeat: repeat-x;
}
.span_tool_group {
float: left;
margin: 0 6px 5px 0;
padding: 0px 2px;
border: 1px solid #a6a6a6;
border-bottom-color: #979797;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: 0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;
-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;
box-shadow: 0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;
background: #e4e4e4;
background-image: -webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));
background-image: -moz-linear-gradient(top,#fff,#e4e4e4);
background-image: -webkit-linear-gradient(top,#fff,#e4e4e4);
background-image: -o-linear-gradient(top,#fff,#e4e4e4);
background-image: -ms-linear-gradient(top,#fff,#e4e4e4);
background-image: linear-gradient(top,#fff,#e4e4e4);
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4');
}
//
//

46
pixelegg/less/layout_content_elements.less
View File

@ -330,17 +330,18 @@ div.selectbox-wrapper {
display: block;
outline: none;
padding: 7px 0 7px 3px;
color:@link_color;
}
a:link,
a:visited{
.color_100_gray;
color:@link_color;
text-decoration: none;
}
a:hover,
a:focus,
a.sbFocus{
color: #EBB52D;
color: @link_color_active;
}
li.last a{
border-bottom: none;
@ -925,12 +926,13 @@ button.et2_button_with_image{
*
######################################################################################## */
input[type="submit"][id="delete"],
input[type="button"][id="delete"],
input[type="submit"][id*="delete"],
input[type="button"][id*="delete"],
button[id="delete"],
button[id="infolog-edit_button[delete]"],
button[id="addressbook-edit_button[delete]"],
button[id="resources-edit_delete"]
button[id="resources-edit_delete"],
button[id="calendar-edit_button[delete]"]
{
background-color: @color_negative_action_hover !important;
background-image:url('../images/delete-hover.png')!important;
@ -1091,7 +1093,37 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon{
}
/**
* Clientside Javascript error-log
*/
#topmenu_info_error {
width: 16px;
cursor: pointer;
}
div.client_error_log {
max-height: 50ex;
}
div.client_error_log tbody {
vertical-align: top;
}
div.client_error_log tr.hidden td > div {
max-height: 2ex;
max-width: 40ex;
overflow: hidden;
text-overflow: ellipsis;
white-space:nowrap;
}
div.client_error_log tr td.timestamp > div {
text-wrap: none;
white-space: normal;
width: 27ex;
}
div.client_error_log tr.hidden td.stack > div {
text-indent: 100%
}
div.client_error_log tr td.stack > div {
white-space: pre;
}
//
//

13
pixelegg/less/layout_raster.less
View File

@ -66,7 +66,6 @@
}
/* ###########################################################################################################################################
Topmenu / Home / Einstellungen / usw..
###########################################################################################################################################
@ -442,6 +441,10 @@
}
img#topmenu_info_error{
.dimension_height_s;
}
}
// Ende items
@ -1137,7 +1140,7 @@ div#calendar-container {
display: inline-table;
margin: 0px 5px 0px 0px;
padding: 2px 10px 5px 10px;
padding: 2px 2px 5px 2px;
cursor: pointer;
border-width: 1px 1px 0 1px;
border-style: solid;
@ -1152,7 +1155,7 @@ div#calendar-container {
h1 {
font-size: 100%;
line-height: 1em;
margin:0 15px 2px 3px;
margin:0 1px 2px 2px;
vertical-align: super;
}
@ -1213,7 +1216,7 @@ div#calendar-container {
top: 1px;
display: inline-block;
.dimension_width_height_s;
.dimension_width_height_xs;
margin-left: 0px;
background-repeat: no-repeat;
background-position: center;
@ -1269,4 +1272,4 @@ div#calendar-container {
//
//
//

12
pixelegg/less/layout_table.less
View File

@ -160,11 +160,13 @@ table.egwGridView_outer{
/*Elements inside td*/
td{
.et2_link {margin-left: 0px}
.et2_link {margin-left: 0px; color: @link_color; font-weight: bold;}
img {.Complete_Button_Icon_normal;}
time {display: block;}
img {
.Complete_Button_Icon_normal;
}
img[src$="svg"] {
.gradient_vertical (@egw_color_2_a, @egw_color_2_a);
}
@ -236,7 +238,7 @@ table.egwGridView_grid{
/*padding: 0.3em 0 0.3em 0.3em;*/
border-bottom: 1px solid;
color: #bfbfbf;
color: @gray_60;;
/*&:hover {background-color: @egw_color_2_e;} legacy*/
&:active {