extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-21 10:27:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

pixelegg changes from Wednesday

Browse Source
This commit is contained in:
Ralf Becker 2013-12-19 03:14:06 +00:00
parent b9d02e42e0
commit e32c235d2e
7 changed files with 204 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pixelegg/changelog.txt
View File

@ -44,4 +44,11 @@ calendar Edit Alarms
Topmenu Items > put some Icons before Topmenu Items > put some Icons before
/* 17.12.2013 ***************** */
Raster > fixed Tab_header, tab_header
/* 18.12.2013 ***************** */
Admin > fixed height for global categorys

103
pixelegg/css/pixelegg.css
View File

@ -2751,6 +2751,17 @@ action buttons, left aligned for "extra" controls
background-color: rgba(255, 194, 0, 0.1); background-color: rgba(255, 194, 0, 0.1);
padding: 0.3em 0 0 0.3em; padding: 0.3em 0 0 0.3em;
} }
/*#################################### ADMIN PART #####################################################*/
iframe#admin-index_iframe {
background-color: yellow;
}
#admin-categories-index {
background-color: green;
}
#admin-categories-index div.egwGridView_scrollarea {
min-height: 500px;
}
/*#################################### ADMIN PART #####################################################*/
} }
/*#################################### Media Queries #####################################################*/ /*#################################### Media Queries #####################################################*/
@media only screen and (min-width: 980px) and (max-width: 1279px) { @media only screen and (min-width: 980px) and (max-width: 1279px) {
@ -3734,6 +3745,16 @@ a.textSidebox,
right: 7px; right: 7px;
top: 7px; top: 7px;
} }
hr.clearer {
clear: both;
height: 20px;
width: 100%;
background-color: #ffc200;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border: 1px solid #000000;
}
.lettersearch { .lettersearch {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
@ -4020,6 +4041,10 @@ a.textSidebox {
text-align: center; text-align: center;
width: 99%; width: 99%;
} }
/*###########################
# #
# #
############################*/
button { button {
border: 1px solid rgba(0, 0, 0, 0.15); border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
@ -4120,7 +4145,7 @@ button[id*="edit_button[add_alarm]"]:active {
/* #####################################################*/ /* #####################################################*/
/*Button cancel */ /*Button cancel */
button[id*="cancel"]:active { button[id*="cancel"]:active {
background-color: #ffc200; background-color: #ffff00 !important;
} }
/* #####################################################*/ /* #####################################################*/
/*Button abbruch / cancel */ /*Button abbruch / cancel */
@ -4128,6 +4153,9 @@ button#cancel:hover {
background-color: red !important; background-color: red !important;
color: #ffffff; color: #ffffff;
} }
button#cancel:hover:active {
background-color: #ffff00 !important;
}
/* #####################################################*/ /* #####################################################*/
/*Button mit Bildern*/ /*Button mit Bildern*/
button.et2_button_with_image { button.et2_button_with_image {
@ -4169,6 +4197,49 @@ button.add:before {
color: #ffc200; color: #ffc200;
line-height: 1.1em; line-height: 1.1em;
} }
button[id*=add] {
background-image: url('../images/add.png') !important;
border: 1px solid rgba(0, 0, 0, 0.15);
-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);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
color: #000000;
padding-left: 30px !important;
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
width: auto;
height: 32px;
}
button[id*=add]:active {
background-color: #00ab00 !important;
}
/* et2_box_widget #####################################################*/
div.et2_box_widget .et2_button_text:last-child {
background-image: url('../images/cancel.png') !important;
border: 1px solid rgba(0, 0, 0, 0.15);
-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);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
color: #000000;
padding-left: 30px !important;
background-position: 6px center !important;
background-repeat: no-repeat !important;
background-size: 20px auto !important;
width: auto;
height: 32px;
content: "ID missing";
}
div.et2_box_widget .et2_button_text:last-child:active {
background-color: #ffff00 !important;
}
/*Button Ende #######################################################*/
@media screen and (-webkit-min-device-pixel-ratio: 0) { @media screen and (-webkit-min-device-pixel-ratio: 0) {
select { select {
padding-right: 20px !important; padding-right: 20px !important;
@ -4244,6 +4315,14 @@ table.egwGridView_outer thead {
/* W3C */ /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf', GradientType=0);
/* IE6-9 */ /* IE6-9 */
/*.background-color-5-gray;*/
/* background: -moz-linear-gradient(top, rgba(240,240,240,0) 0%, rgba(191,191,191,0.65) 100%); FF3.6+
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(240,240,240,0)), color-stop(100%,rgba(191,191,191,0.65))); Chrome,Safari4+
background: -webkit-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); Chrome10+,Safari5.1+
background: -o-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); Opera 11.10+
background: -ms-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); IE10+
background: linear-gradient(to bottom, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); W3C
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf',GradientType=0 ); IE6-9 */
} }
table.egwGridView_outer thead tr th { table.egwGridView_outer thead tr th {
/*.background-color-50-gray;*/ /*.background-color-50-gray;*/
@ -5766,8 +5845,23 @@ table.dialog-main-view {
##############################################*/ ##############################################*/
/********** Header Part ********************/ /********** Header Part ********************/
.dialog-header { .dialog-header {
background-color: #408dd2; /*background-color: @egw_color_2_d;*/
color: #ffffff; /*.background-color-5-gray;*/
background: -moz-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%);
/* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(240, 240, 240, 0)), color-stop(100%, rgba(191, 191, 191, 0.65)));
/* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%);
/* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%);
/* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%);
/* IE10+ */
background: linear-gradient(to bottom, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%);
/* W3C */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf', GradientType=0);
/* IE6-9 */
color: #000000;
} }
.dialog-header table.et2_grid { .dialog-header table.et2_grid {
border-top: none; border-top: none;
@ -5780,12 +5874,13 @@ table.dialog-main-view {
} }
.dialog-header table.et2_grid td { .dialog-header table.et2_grid td {
padding: 0px 0px 0px 3px; padding: 0px 0px 0px 3px;
color: #000000;
} }
.dialog-header table.et2_grid table.et2_grid label.et2_label span.et2_selectbox li { .dialog-header table.et2_grid table.et2_grid label.et2_label span.et2_selectbox li {
float: left; float: left;
} }
.dialog-header .et2_label { .dialog-header .et2_label {
color: #ffffff; color: #000000;
vertical-align: bottom; vertical-align: bottom;
padding: 0px 0px 0px 3px !important; padding: 0px 0px 0px 3px !important;
} }

28
pixelegg/less/def_design_pattern_color_font_shadow.less
View File

@ -146,6 +146,15 @@
@color-positive-action : #00AB00; @color-positive-action : #00AB00;
/*Button delete = negative action */
@color-negative-action : red;
/*Button cancel = do nothing action */
@color-cancel-action : yellow;
// Search Button // Search Button
.background-color-search {background-color : lighten(@egw_color_1, 15%); } .background-color-search {background-color : lighten(@egw_color_1, 15%); }
@ -606,16 +615,15 @@
/* ##################################################### */ /* ##################################################### */
.gradient-outer-thead{ .gradient-thead{
.gradient(@color: rgba(245,246,246,1), @start: #EEE, @stop: #FFF); /*.background-color-5-gray;*/
background: rgb(245,246,246); /* Old browsers */ background: -moz-linear-gradient(top, rgba(240,240,240,0) 0%, rgba(191,191,191,0.65) 100%); /* FF3.6+ */
background: -moz-linear-gradient(top, rgba(245,246,246,1) 0%, rgba(219,220,226,1) 21%, rgba(184,186,198,1) 49%, rgba(221,223,227,1) 80%, rgba(245,246,246,1) 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(240,240,240,0)), color-stop(100%,rgba(191,191,191,0.65))); /* Chrome,Safari4+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(245,246,246,1)), color-stop(21%,rgba(219,220,226,1)), color-stop(49%,rgba(184,186,198,1)), color-stop(80%,rgba(221,223,227,1)), color-stop(100%,rgba(245,246,246,1))); /* Chrome,Safari4+ */ background: -webkit-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); /* Chrome10+,Safari5.1+ */
background: -webkit-linear-gradient(top, rgba(245,246,246,1) 0%,rgba(219,220,226,1) 21%,rgba(184,186,198,1) 49%,rgba(221,223,227,1) 80%,rgba(245,246,246,1) 100%); /* Chrome10+,Safari5.1+ */ background: -o-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); /* Opera 11.10+ */
background: -o-linear-gradient(top, rgba(245,246,246,1) 0%,rgba(219,220,226,1) 21%,rgba(184,186,198,1) 49%,rgba(221,223,227,1) 80%,rgba(245,246,246,1) 100%); /* Opera 11.10+ */ background: -ms-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); /* IE10+ */
background: -ms-linear-gradient(top, rgba(245,246,246,1) 0%,rgba(219,220,226,1) 21%,rgba(184,186,198,1) 49%,rgba(221,223,227,1) 80%,rgba(245,246,246,1) 100%); /* IE10+ */ background: linear-gradient(to bottom, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); /* W3C */
background: linear-gradient(to bottom, rgba(245,246,246,1) 0%,rgba(219,220,226,1) 21%,rgba(184,186,198,1) 49%,rgba(221,223,227,1) 80%,rgba(245,246,246,1) 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf',GradientType=0 ); /* IE6-9 */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f6f6', endColorstr='#f5f6f6',GradientType=0 ); /* IE6-9 */
} }

41
pixelegg/less/etemplate2.less
View File

@ -1664,6 +1664,47 @@ textarea.description {
padding: 0.3em 0 0 0.3em; padding: 0.3em 0 0 0.3em;
} }
/*#################################### ADMIN PART #####################################################*/
iframe#admin-index_iframe{
background-color: yellow;
}
// Content Iframe
#admin-categories-index{
background-color: green;
div.egwGridView_scrollarea { min-height: 500px;}
table.et2_grid {
#admin-categories-index_nm {
div.egwGridView_outer{
td.frame {
}
}
}
}
}
/*#################################### ADMIN PART #####################################################*/
} // Ende Media all } // Ende Media all
/*#################################### Media Queries #####################################################*/ /*#################################### Media Queries #####################################################*/

43
pixelegg/less/layout_content_elements.less
View File

@ -416,6 +416,16 @@ a.textSidebox,
} }
hr.clearer {
clear: both;
height: 20px;
width: 100%;
background-color: @egw_color_1_a;
.rounded (3px);
border: 1px solid @gray-100;
}
//############################################################################################################## //##############################################################################################################
// Lettersearch // Lettersearch
@ -781,6 +791,12 @@ a.textSidebox
// Button global for all and everything: // Button global for all and everything:
/*###########################
# #
# #
############################*/
button{ button{
.Complete_Button_normal; .Complete_Button_normal;
@ -799,9 +815,7 @@ button[id*="delete"]{
.Complete_Button_text_icon_before; .Complete_Button_text_icon_before;
} }
// Hover // Hover
input[type="submit"][id*="delete"]:hover, input[type="submit"][id*="delete"]:hover,
input[type="button"][id*="delete"]:hover, input[type="button"][id*="delete"]:hover,
button[id*="delete"]:hover { button[id*="delete"]:hover {
@ -860,7 +874,7 @@ button[id*="edit_button[add_alarm]"]{
button[id*="cancel"] { button[id*="cancel"] {
&:active {background-color: @color-hint;} &:active{background-color: @color-cancel-action !important;}
} }
@ -868,7 +882,10 @@ button[id*="cancel"] {
/* #####################################################*/ /* #####################################################*/
/*Button abbruch / cancel */ /*Button abbruch / cancel */
button#cancel:hover {background-color: red !important; color: @gray-0; } button#cancel:hover {
background-color: red !important; color: @gray-0;
&:active{background-color: @color-cancel-action !important;}
}
/* #####################################################*/ /* #####################################################*/
@ -887,8 +904,26 @@ button.add {
.Complete_Button_add ; .Complete_Button_add ;
} }
button[id*=add]{
background-image:url('../images/add.png') !important;
.Complete_Button_text_icon_before;
&:active {background-color: @color-positive-action !important;}
}
/* et2_box_widget #####################################################*/
// Cancel Button
div.et2_box_widget .et2_button_text:last-child {
background-image:url('../images/cancel.png') !important;
.Complete_Button_text_icon_before;
content: "ID missing";
&:active {background-color: @color-cancel-action !important;}
}
/*Button Ende #######################################################*/
/////* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */ /////* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */
@media screen and (-webkit-min-device-pixel-ratio:0) { @media screen and (-webkit-min-device-pixel-ratio:0) {

BIN
pixelegg/less/layout_dialog.less
View File

Binary file not shown.

BIN
pixelegg/less/layout_table.less
View File

Binary file not shown.