extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

pixelegg changes until now

Browse Source
This commit is contained in:
Ralf Becker 2014-02-14 15:32:25 +00:00
parent 1b2cfeede2
commit 2b1aaa4fba
5 changed files with 164 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

331
pixelegg/css/pixelegg.css
View File

@ -574,7 +574,7 @@
/*.background_color_search;*/
color: #ffd44d;
text-decoration: none;
cursor: pointer;
/*cursor: pointer; 14022014 entfernt*/
padding: 0px;
margin: 8px 10px;
margin-left: 0px;
@ -785,160 +785,11 @@
background-size: 16px 16px !important;
background-position: 10px center !important;
}
/*ausgeblendet - 13022014 - Ralf testest*/
/*.favorites {
li {
&:hover {
div.ui-icon {
display:inline-block;
}
}
span.ui-state-active {
border: none;
}
}
input {margin-right: 1ex;}
img {
margin-right: 1ex;
.dimension_width_height_s;
}
div.ui-icon-trash {
position: relative;
float:right;
display:none;
}
// List Icon
.sideboxstar{
background-image: url("../images/bullet.png");
background-repeat: no-repeat;
background-size: contain;
background-color: egw_color_2_a;
.dimension_width_height_xs;
}
}*/
/*ausgeblendet - 13022014 - Ralf testest*/
.sidebox-favorites {
/* .ui-state-hover,
.ui-widget-content .ui-state-hover,
.ui-widget-header .ui-state-hover,
.ui-state-focus,
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
.bordered(1px, 1px, 1px,1px);
border-color: @gray_10;
background: transparent !important;
font-weight: bold;
.color_100_gray;
}*/
/* .ui-menu-icons {
.ui-menu-item {
a {
position: relative;
padding-left: 1em;
padding: 0.5em 1em 0.5em 0;
&:hover {.Complete_Button_Icon_hover ;}
}
}
}*/
/* .ui-menu {
li
.ui-menu-item {
width: 93%;
&:hover {background-color: @egw_color_1_e;}
a {
line-height: inherit;
padding: 2px 0px;
padding-left: 5px;
&:hover {text-decoration: underline;}
img { .dimension_width_height_s ;}
div.ui-icon-heart{display: none}
}
// Einrückung für ""Filter aufheben""
&:first-child a{padding-left: 41px;}
}
}*/
/* div.ui-icon-heart{
position: relative;
float: left;
display:inline-block;
margin: -3px 1px 0px 1px;
background-image: none;
}*/
/* div.ui-icon-trash{
margin-top: 0px;
margin-right: 2px;
background-image:url(../images/delete.png);
background-size: 16px 16px;
background-position: 0 0;
background-color: egw_color_2_a;
.box_shadow_standard_light;
.rounded;
}*/
}
.sidebox-favorites ul.favorites {
width: 99%;
padding: 0px;
border: none;
background: white;
/* .ui-menu .ui-menu-item a{
line-height: inherit;
padding: 2px 0px;
div.sideboxstar {display: none;}
div.ui-icon-trash{
margin-top: -1px;
margin-right: 2px;
}
}*/
/* img {
// margin-right: 1ex;
margin: 0px 5px;
.dimension_height_s;
padding: 3px;
.Complete_Button_Icon_normal;
&:hover {
.dimension_height_s;
.Complete_Button_Icon_hover ;
}
}
img.sideboxstar {
margin-right: 1ex;
.dimension_height_s;
.Complete_Button_Icon_normal;
background-size: 16px 16px;
background-position: center;
&:hover {.dimension_height_s; .Complete_Button_Icon_hover ;}
}
*/
}
.sidebox-favorites ul.favorites li.ui-menu-item {
margin-left: 0px;
@ -953,13 +804,9 @@
.sidebox-favorites ul.favorites li.ui-menu-item a {
line-height: inherit;
padding: 2px 0px;
/* div.ui-icon-trash{
margin-top: -1px;
margin-right: 2px;
}*/
}
.sidebox-favorites ul.favorites li.ui-menu-item a div.ui-icon-heart {
background-image: url(../images/trash.png);
background-image: url(../images/personal.png);
background-size: 12px 12px;
background-position: 0 0;
}
@ -977,6 +824,20 @@
height: 12px;
margin-left: 4px;
}
.sidebox-favorites ul.favorites li.ui-menu-item [data-id="blank"] div.ui-icon-heart {
background-image: url(../images/trash.png);
background-size: 12px 12px;
background-position: 0 0;
}
.sidebox-favorites ul.favorites li:first-child a div.sideboxstar {
background-image: url(../images/trash.png);
background-size: 12px 12px;
background-position: 0 0;
}
.favorites img {
width: 12px;
height: 12px;
}
.nextmatch_sortheader.asc {
/* font-weight: bold;
background-image: url(../images/up.png);*/
@ -1922,6 +1783,7 @@ td.message span.message {
/**
* Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
* http://cssreset.com
* fieldset legend
*/
html,
body,
@ -1972,10 +1834,8 @@ dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
@ -2961,6 +2821,17 @@ button.et2_button img[url*="svg"] {
background-repeat: repeat-x;
fill: red;
}
button[id*="save"]:hover,
button[id*="apply"]:hover,
button[id*="copy"]:hover,
button[id*="edit_button[edit]"]:hover,
button.et2_button:hover {
background-color: #189800 !important;
color: #000000;
-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);
}
button[id*="save"]:active,
button[id*="apply"]:active,
button[id*="copy"]:active,
@ -3011,95 +2882,6 @@ button#filemanager-select_button[ok]: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);
}
/* ########################################################################################
*
/*ui-widget*/
/*edit series*/
button#series {
background-image: url('../images/edit.svg') !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: #b4b4b4;
padding-left: 30px !important;
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
/*.Button_size_h32_auto;*/
height: 24px;
}
button#series:hover {
background-image: url('../images/edit.svg') !important;
}
button#series:active {
background-color: #1aa200 !important;
}
/*edit exception*/
button#exception {
background-image: url('../images/edit.svg') !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: #b4b4b4;
padding-left: 30px !important;
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
/*.Button_size_h32_auto;*/
height: 24px;
}
button#exception:hover {
background-image: url('../images/edit.svg') !important;
}
button#exception:active {
background-color: #1aa200 !important;
}
/*calendar series add*/
#calendar-edit_add {
/* .Complete_Button_add;
&:hover {.Complete_Button_add_hover;} */
}
#calendar-edit_add:active {
background-color: #1aa200 !important;
}
/*calendar search freetime*/
#calendar-edit_freetime:active {
background-color: #1aa200 !important;
}
/*calendar search freetime*/
button[id*="edit_button[add_alarm]"]:active {
background-color: #1aa200 !important;
}
/* ########################################################################################
*
* Button cancel / => color-cancel-action // yellow
@ -3108,6 +2890,7 @@ button[id*="edit_button[add_alarm]"]:active {
button[id*="cancel"]:hover,
button[id*="importexport-wizardbox_button[previous]"]:hover,
button#cancel:hover,
#cancel:hover,
button.et2_button_cancel:hover,
button.et2_button_question:hover {
background-color: #f5b301 !important;
@ -3116,6 +2899,7 @@ button.et2_button_question:hover {
button[id*="cancel"]:active,
button[id*="importexport-wizardbox_button[previous]"]:active,
button#cancel:active,
#cancel:active,
button.et2_button_cancel:active,
button.et2_button_question:active {
background-color: #fecc44 !important;
@ -3123,7 +2907,8 @@ button.et2_button_question:active {
}
/* et2_box_widget ###*/
/*div.et2_box_widget .et2_button_text:last_child,*/
button[id="cancel"] {
button[id="cancel"],
button#cancel {
background-image: url('../images/cancel.png') !important;
border: 1px solid rgba(0, 0, 0, 0.15);
/*.box_shadow_standard_light;*/
@ -3152,14 +2937,18 @@ button[id="cancel"] {
height: 24px;
content: "ID missing";
}
button[id="cancel"]:hover {
button[id="cancel"]:hover,
button#cancel:hover {
background-color: #f5b301 !important;
color: #000000;
-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);
}
button[id="cancel"]:active {
button[id="cancel"]:active,
button#cancel:active {
background-color: #fecc44 !important;
color: #000000;
-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);
@ -3284,15 +3073,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
background-color: #ffc200 !important;
background-image: none !important;
}
@media screen and (-webkit-min-device-pixel-ratio: 0) {
select {
padding-right: 20px !important;
-webkit-appearance: none;
margin: 0;
background: #ffffff url(../images/selectarrowdown.png) no-repeat center right;
background-size: 20px auto;
}
}
/**
* Clientside Javascript error-log
*/
@ -3367,6 +3147,15 @@ table.table_passord_change td:first-child {
height: 9px;
width: 11px;
}
@media screen and (-webkit-min-device-pixel-ratio: 0) {
select {
padding-right: 20px !important;
-webkit-appearance: none;
margin: 0;
background: #ffffff url(../images/selectarrowdown.png) no-repeat center right;
background-size: 20px auto;
}
}
/**
* EGroupware: Stylite Pixelegg template
*
@ -4966,32 +4755,6 @@ table.nextmatch_header img {
background-position: center;
background-repeat: no-repeat;
}
/* ###########################################################################################################################################
/*extended for calender app*/
div#calendar-container {
margin-left: 0px;
}
div#calendar-container div.calendar {
background-color: inherit;
padding: 0px;
}
div#calendar-container div.calendar table {
background-color: #fafafa;
font-family: Verdana, Helvetica, Sans-Serif;
/* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/
}
div#calendar-container div.calendar table thead .title {
background-color: #ffc200;
}
div#calendar-container div.calendar table thead .daynames {
background-color: #679fd2;
}
div#calendar-container div.calendar table tbody tr.daysrow:hover {
background-color: #ffc200;
}
div#calendar-container div.calendar table tbody tr.rowhilite td {
background-color: #ffc200;
}
/* ###########################################################################################################################################
/* ###########################################################################################################################################
* Main

62
pixelegg/less/def_buttons.less
View File

@ -119,6 +119,68 @@
border-left: 3px solid;
border-left-color: @lightgray;
}
/* ########################################################################################
*
* Button löschen / delete / => color-negative-action // red
*
######################################################################################## */
.Complete_Button_delete{
/*background-color: @color_negative_action_hover !important;*/
background-image:url('../images/delete.png')!important;
margin-left: 3em;
background-color: @gray_30;
.Complete_Button_text_icon_before;
/*background-color: @color-negative-action !important;*/
/*color: @gray_0 !important;*/
&:hover {
background-image:url('../images/delete-hover.png') !important;
background-color: @color_negative_action_hover !important;
.Complete_Button_text_icon_before;
color: @gray_0 !important;;
}
&:active {
background-image:url('../images/delete-hover.png') !important;
background-color: @color_negative_action_active !important;
.Complete_Button_text_icon_before;
color: @gray_0;
}
}
/* ########################################################################################
*
* Button cancel / => color-cancel-action // yellow
*
######################################################################################## */
.Complete_Button_cancel{
background-image:url('../images/cancel.png') !important;
.Complete_Button_text_icon_before;
content: "ID missing";
&:hover {background-color: @color_cancel_action_hover !important; color: @gray_100; .box_shadow_standard_light_hover;}
&:active {background-color: @color_cancel_action_active !important; color: @gray_100; .box_shadow_standard_light_inset;}
}
/* ########################################################################################
*
* Button edit + save + apply + copy => color-positive-action // green
*
######################################################################################## */
.Complete_Button_save_apply_copy{
img[url*="svg"]{.gradient_vertical (@gray_30, @gray_30); fill: red;}
&:hover {background-color: @color_positive_action !important; color: @gray_100; .box_shadow_standard_light_hover;}
&:active {background-color: @color_positive_action_active;}
}
// select

28
pixelegg/less/etemplate2.less
View File

@ -461,7 +461,7 @@ hr {
color: lighten(@egw_color_1, 15%);
text-decoration: none;
cursor: pointer;
/*cursor: pointer; 14022014 entfernt*/
padding: 0px;
margin: 8px 10px;
margin-left: 0px;
@ -690,7 +690,7 @@ hr {
// Heart
div.ui-icon-heart {background-image: url(../images/trash.png); background-size: 12px 12px;background-position: 0 0;}
div.ui-icon-heart {background-image: url(../images/personal.png); background-size: 12px 12px;background-position: 0 0;}
// Bulltpoints
div.sideboxstar {
@ -707,12 +707,33 @@ hr {
// Aktuelle Ansicht als Favorit
img {.dimension_width_height_xs; margin-left: 4px;}
// Filter aufheben
[data-id="blank"]{
div.ui-icon-heart {background-image: url(../images/trash.png); background-size: 12px 12px;background-position: 0 0;}
}
} // Ende li
// Filter aufheben
li:first-child{
a div.sideboxstar {background-image: url(../images/trash.png); background-size: 12px 12px;background-position: 0 0;}
}
}
} // sidebox-favorites
// Favorites in nextmatch Header
.favorites{
img {.dimension_width_height_xs;}
}
.nextmatch_sortheader.asc {
@ -915,5 +936,6 @@ iframe#admin-index_iframe{
}
//
//
//

107
pixelegg/less/layout_content_elements.less
View File

@ -19,6 +19,7 @@
/**
* Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
* http://cssreset.com
* fieldset legend
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@ -27,7 +28,7 @@
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
form, label,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
@ -934,28 +935,7 @@ button[id="timesheet-edit_button[delete]"],
button[id="displayToolbar-delete"],
button.et2_button_delete
{
/*background-color: @color_negative_action_hover !important;*/
background-image:url('../images/delete.png')!important;
margin-left: 3em;
background-color: @gray_30;
.Complete_Button_text_icon_before;
/*background-color: @color-negative-action !important;*/
/*color: @gray_0 !important;*/
&:hover {
background-image:url('../images/delete-hover.png') !important;
background-color: @color_negative_action_hover !important;
.Complete_Button_text_icon_before;
color: @gray_0 !important;;
}
&:active {
background-image:url('../images/delete-hover.png') !important;
background-color: @color_negative_action_active !important;
.Complete_Button_text_icon_before;
color: @gray_0;
}
.Complete_Button_delete;
}
/* ########################################################################################
@ -970,10 +950,7 @@ button[id*="copy"],
button[id*="edit_button[edit]"],
button.et2_button{
img[url*="svg"]{.gradient_vertical (@gray_30, @gray_30); fill: red;}
&:active {background-color: @color_positive_action_active;}
.Complete_Button_save_apply_copy;
}
@ -993,38 +970,7 @@ button#filemanager-select_button[ok]{
}
/* ########################################################################################
*
/*ui-widget*/
/*edit series*/
button#series {
background-image:url('../images/edit.svg') !important;
.Complete_Button_text_icon_before;
&:hover {background-image:url('../images/edit.svg') !important;}
&:active {background-color: @color_positive_action_active !important;}
}
/*edit exception*/
button#exception {
background-image:url('../images/edit.svg') !important;
.Complete_Button_text_icon_before;
&:hover {background-image:url('../images/edit.svg') !important;}
&:active {background-color: @color_positive_action_active !important;}
}
/*calendar series add*/
#calendar-edit_add {
&:active {background-color: @color_positive_action_active !important;}
/* .Complete_Button_add;
&:hover {.Complete_Button_add_hover;} */
}
/*calendar search freetime*/
#calendar-edit_freetime{
&:active {background-color: @color_positive_action_active !important;}
}
/*calendar search freetime*/
button[id*="edit_button[add_alarm]"]{
&:active {background-color: @color_positive_action_active !important;}
}
/* ########################################################################################
*
* Button cancel / => color-cancel-action // yellow
@ -1034,6 +980,7 @@ button[id*="edit_button[add_alarm]"]{
button[id*="cancel"],
button[id*="importexport-wizardbox_button[previous]"],
button#cancel,
#cancel,
button.et2_button_cancel,
button.et2_button_question{
@ -1044,15 +991,10 @@ button.et2_button_question{
/* et2_box_widget ###*/
/*div.et2_box_widget .et2_button_text:last_child,*/
button[id="cancel"]{
button[id="cancel"],
button#cancel{
background-image:url('../images/cancel.png') !important;
.Complete_Button_text_icon_before;
content: "ID missing";
&: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;}
.Complete_Button_cancel;
}
@ -1089,6 +1031,15 @@ button[id="add"]{
/*Button Ende #######################################################*/
/*dhtml Submenu ##########################################################*/
div.dhtmlxMenu_egw_SubLevelArea_Polygon{
@ -1112,17 +1063,6 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon{
/////* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */
@media screen and (-webkit-min-device-pixel-ratio:0) {
select {
padding-right: 20px !important;
-webkit-appearance:none;
margin:0;
background: #ffffff url(../images/selectarrowdown.png) no-repeat center right;
background-size: 20px auto;
}
}
/**
* Clientside Javascript error-log
@ -1206,5 +1146,18 @@ table.table_passord_change{
}
/////* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */
@media screen and (-webkit-min-device-pixel-ratio:0) {
select {
padding-right: 20px !important;
-webkit-appearance:none;
margin:0;
background: #ffffff url(../images/selectarrowdown.png) no-repeat center right;
background-size: 20px auto;
}
}
//

54
pixelegg/less/layout_raster.less
View File

@ -1027,61 +1027,7 @@
}
/* ###########################################################################################################################################
/*extended for calender app*/
div#calendar-container {
margin-left: 0px;
div.calendar{
background-color: inherit;
padding: 0px;
table {
.background_color_5_gray;
.basefontfamily;
thead {
// Month
.title {
background-color: @egw_color_1_a;
}
// << today >>
.headrow {}
// daynames
.daynames {
background-color: @egw_color_2_e;
}
}
tbody {
tr.daysrow {
&:hover {background-color: @egw_color_1_a;}
// fields
.name {}
.day {}
.weekend {}
}
// hover tr
tr.rowhilite td{background-color: @egw_color_1_a;}
}
} // table
}
}
/* ###########################################################################################################################################