extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

pixelegg changes from Tuesday

Browse Source
This commit is contained in:
Ralf Becker 2013-12-18 04:33:46 +00:00
parent 6628a866e3
commit b9d02e42e0
11 changed files with 154 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pixelegg/changelog.txt Executable file
View File

@ -0,0 +1,47 @@
/**
* EGroupware: Stylite Pixelegg template
*
* @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de> + Wolfgang Ott <wolfgang.ott@pixelegg.de>
* @package pixelegg
* @version $Id$
*/
/* 13.12.2013 ***************** */
button behavior
addressbook edit
tab - addressbook-edit_link_to
.filters select =
egw_fw_ui_sidemenu_listitem img = kein Button mehr
Listen:
tr:nth-child(even) {background: @color-even;}
tr:nth-child(odd) {background: @color-odd;}
calendar > ui dialog
calendar > edit
calendar > edit series
calendar > edit new
#######
Buttons behavior on button:active
positive = green
negative = red
between = yellow
/* 14.12.2013 ***************** */
def: dimension XL + M + S + XS
calendar Dayview
calendar Edit Alarms
Topmenu Items > put some Icons before

76
pixelegg/css/pixelegg.css
View File

@ -2082,7 +2082,7 @@ action buttons, left aligned for "extra" controls
.nextmatch_header > .filters input[type=search] { .nextmatch_header > .filters input[type=search] {
background-color: #ffd44d; background-color: #ffd44d;
color: black; color: black;
/*height: 25px;*/ height: 25px;
float: left; float: left;
} }
.nextmatch_header > .filters button.et2_button { .nextmatch_header > .filters button.et2_button {
@ -3310,7 +3310,7 @@ span.ui-icon-search {
background: #ffffff; background: #ffffff;
} }
.egw_fw_ui_app_header_container { .egw_fw_ui_app_header_container {
border-width: 9px 0px 0px 9px; border-width: 9px 0px 0px 0px;
border-style: solid; border-style: solid;
border-color: #b4b4b4; border-color: #b4b4b4;
background-color: #b3b3b3 !important; background-color: #b3b3b3 !important;
@ -4263,6 +4263,7 @@ table.egwGridView_outer thead tr th {
background-position: center; background-position: center;
background-repeat: repeat-x;*/ background-repeat: repeat-x;*/
vertical-align: top; vertical-align: top;
overflow: auto;
} }
table.egwGridView_outer thead tr th:hover { table.egwGridView_outer thead tr th:hover {
background-color: #bfbfbf; background-color: #bfbfbf;
@ -4864,7 +4865,7 @@ img {
right: 88px; right: 88px;
top: 0; top: 0;
z-index: 200; z-index: 200;
padding: 6px 0.8em 6px 0.5em; padding: 5px 0.8em 6px 0.5em;
} }
#egw_fw_topmenu_addons span#quick_add:before { #egw_fw_topmenu_addons span#quick_add:before {
content: "+"; content: "+";
@ -4883,7 +4884,7 @@ img {
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-moz-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); box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
height: 30px; height: 26px;
padding: 0 0 0 10px; padding: 0 0 0 10px;
font-size: 0.9em; font-size: 0.9em;
line-height: 1.1em; line-height: 1.1em;
@ -4979,11 +4980,21 @@ img {
} }
/*Name / Datum / angemeldete User*/ /*Name / Datum / angemeldete User*/
#egw_fw_topmenu_info_items { #egw_fw_topmenu_info_items {
padding-right: 20px; /*postion : top*/
white-space: nowrap; bottom: 0px;
right: 5px;
padding-right: 0px;
position: relative;
z-index: 1000;
margin-right: 20px;
display: inline-flex;
float: right; float: right;
display: flex; /*postion: bottom*/
height: 16px; /* bottom: 3px;
right: 5px;
padding-right: 20px;
position: fixed;
z-index: 1000;*/
} }
#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(2) { #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(2) {
/*float: right;*/ /*float: right;*/
@ -5216,7 +5227,7 @@ img {
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active { #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; border-bottom-width: 0px;
margin-top: 4px; margin-top: 4px;
background-color: #0c5da5; background-color: #408dd2;
/*.background-color-50-gray;*/ /*.background-color-50-gray;*/
color: #f2f2f2; color: #f2f2f2;
-webkit-border-top-right-radius: 3px !important; -webkit-border-top-right-radius: 3px !important;
@ -5264,8 +5275,7 @@ img {
} }
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_icon { #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_icon {
display: inline-block; display: inline-block;
width: 20px; height: 24px;
height: 20px;
padding-left: 0; padding-left: 0;
padding-right: 10px; padding-right: 10px;
float: left; float: left;
@ -5285,7 +5295,7 @@ img {
position: absolute; position: absolute;
background-color: #b3b3b3 !important; background-color: #b3b3b3 !important;
width: 5px; width: 5px;
top: 60px; top: 51px;
bottom: 3px; bottom: 3px;
right: 0px; right: 0px;
} }
@ -5525,10 +5535,11 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header {
margin: -1px 0 0 0; margin: -1px 0 0 0;
padding: 0px 5px 0px 5px; padding: 0px 1px 0px 1px;
background-position: bottom; background-position: bottom;
background-repeat: repeat-x; background-repeat: repeat-x;
background-color: transparent; background-color: transparent;
height: 48px;
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header h1 { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header h1 {
float: left; float: left;
@ -5562,46 +5573,46 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
-moz-background-clip: padding-box; -moz-background-clip: padding-box;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
/* -moz-border-radius-topright:3px; /*.background-color-5-gray;*/
-webkit-border-top-right-radius:3px; background: transparent;
-moz-border-radius-topleft:3px;
-webkit-border-top-left-radius:3px;
border-top-right-radius:3px;
border-top-left-radius:3px;*/
background-color: #fafafa;
display: inline-block; display: inline-block;
margin: 3px 5px 0px 0px; margin: 3px 5px 0px 0px;
padding: 2px 10px 2px 10px; /*padding: 2px 10px 2px 10px;*/
cursor: pointer; cursor: pointer;
border-width: 1px; border-width: 1px 1px 0 1px;
border-style: solid; border-style: solid;
border-color: #c6ced6; border-color: #b4b4b4;
background-repeat: repeat-x; background-repeat: repeat-x;
height: 49px; height: 47px;
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover {
background-color: #bfbfbf; background-color: #b3b3b3 !important;
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 {
font-size: 100%; font-size: 100%;
line-height: 1em; line-height: 1em;
margin-top: 0; margin-top: 0;
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header img.egw_fw_ui_tab_icon {
display: inline-block;
height: 24px;
margin-right: 5px;
margin-top: 5px;
}
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active {
border-width: 1px 1px 0px 1px !important; border-width: 1px 1px 0px 1px !important;
padding: 1px 10px 3px 10px !important; padding: 0 0 5px !important;
background-color: #b3b3b3 !important; background-color: #b3b3b3 !important;
background-image: none !important; background-image: none !important;
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover {
background-color: #bfbfbf; background-color: #bfbfbf;
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header img.egw_fw_ui_tab_icon { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active img.egw_fw_ui_tab_icon {
display: inline-block; display: inline-block;
width: 20px; height: 24px;
height: 20px;
margin-right: 5px; margin-right: 5px;
margin-top: 10px; margin-top: 5px;
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button {
position: absolute; position: absolute;
@ -5755,7 +5766,7 @@ table.dialog-main-view {
##############################################*/ ##############################################*/
/********** Header Part ********************/ /********** Header Part ********************/
.dialog-header { .dialog-header {
background-color: #0c5da5; background-color: #408dd2;
color: #ffffff; color: #ffffff;
} }
.dialog-header table.et2_grid { .dialog-header table.et2_grid {
@ -5770,6 +5781,9 @@ 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;
} }
.dialog-header table.et2_grid table.et2_grid label.et2_label span.et2_selectbox li {
float: left;
}
.dialog-header .et2_label { .dialog-header .et2_label {
color: #ffffff; color: #ffffff;
vertical-align: bottom; vertical-align: bottom;

2
pixelegg/css/pixelegg.less
View File

@ -65,4 +65,6 @@
// //
// //
// //

BIN
pixelegg/images/dialog_debug.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
pixelegg/images/dialog_error.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

4
pixelegg/js/slider.js
View File

@ -13,8 +13,10 @@ function show_pixelegg_header(_toggle, _delay)
{ {
$j("#egw_fw_header").slideToggle(); $j("#egw_fw_header").slideToggle();
$j("#egw_fw_topmenu_info_items").animate({"margin-right": "20px","bottom": "","padding-right" : "0"},_delay); $j("#egw_fw_topmenu_info_items").animate({"margin-right": "20px","bottom": "0px","padding-right" : "0"},_delay);
$j("#egw_fw_topmenu_info_items").css("position", "relative"); $j("#egw_fw_topmenu_info_items").css("position", "relative");
$j("#egw_fw_topmenu_info_items").css("display", "inline-flex");
$j("#egw_fw_topmenu_info_items").css("float", "right");
$j("#egw_fw_sidebar").animate({'top':'57px'},_delay); $j("#egw_fw_sidebar").animate({'top':'57px'},_delay);
$j("#egw_fw_tabs").animate({'margin-top':'0px'},_delay); $j("#egw_fw_tabs").animate({'margin-top':'0px'},_delay);

2
pixelegg/less/etemplate2.less
View File

@ -986,7 +986,7 @@ div.message.floating {
.nextmatch_header > .filters input[type=search] { .nextmatch_header > .filters input[type=search] {
.background-color-search; .background-color-search;
color: black; color: black;
/*height: 25px;*/ height: 25px;
float: left; float: left;
} }

BIN
pixelegg/less/layout_dialog.less
View File

Binary file not shown.

2
pixelegg/less/layout_messages.less
View File

@ -25,7 +25,7 @@
.egw_fw_ui_app_header_container { .egw_fw_ui_app_header_container {
border-width: 9px 0px 0px 9px; border-width: 9px 0px 0px 0px;
border-style: solid; border-style: solid;
border-color: @gray-30; border-color: @gray-30;
.background-color-30-gray; .background-color-30-gray;

88
pixelegg/less/layout_raster.less
View File

@ -249,14 +249,14 @@
top: 0; top: 0;
z-index: 200; z-index: 200;
padding: 6px 0.8em 6px 0.5em; padding: 5px 0.8em 6px 0.5em;
&:before {content: "+";font-size: 1.5em;color: @egw_color_1; line-height: 1.1em} &:before {content: "+";font-size: 1.5em;color: @egw_color_1; line-height: 1.1em}
select#quick_add_selectbox{ select#quick_add_selectbox{
.border_normal; .border_normal;
.box_shadow_standard_light; .box_shadow_standard_light;
height: 30px; height: 26px;
padding: 0 0 0 10px; padding: 0 0 0 10px;
font-size: 0.9em; font-size: 0.9em;
line-height: 1.1em; line-height: 1.1em;
@ -335,11 +335,24 @@
#egw_fw_topmenu_info_items { #egw_fw_topmenu_info_items {
padding-right: 20px; /*postion : top*/
white-space: nowrap; bottom: 0px;
right: 5px;
padding-right: 0px;
position: relative;
z-index: 1000;
margin-right: 20px;
display: inline-flex;
float: right; float: right;
display: flex;
height: 16px;
/*postion: bottom*/
/* bottom: 3px;
right: 5px;
padding-right: 20px;
position: fixed;
z-index: 1000;*/
.topmenu_info_item { .topmenu_info_item {
// Info Bell // Info Bell
@ -573,7 +586,7 @@
border-bottom-width: 0px; border-bottom-width: 0px;
margin-top: 4px; margin-top: 4px;
background-color: @egw_color_2_a; background-color: @egw_color_2_d;
/*.background-color-50-gray;*/ /*.background-color-50-gray;*/
.color-5-gray; .color-5-gray;
@ -616,8 +629,8 @@
.egw_fw_ui_sidemenu_entry_icon { .egw_fw_ui_sidemenu_entry_icon {
display: inline-block; display: inline-block;
width: 20px; .dimension_height_m;
height: 20px;
padding-left: 0; padding-left: 0;
padding-right: 10px; padding-right: 10px;
float: left; float: left;
@ -646,7 +659,7 @@
// background-color: RGB(200, 200, 255); // background-color: RGB(200, 200, 255);
.background-color-30-gray; .background-color-30-gray;
width: 5px; width: 5px;
top: 60px; top: 51px;
bottom: 3px; bottom: 3px;
right: 0px; right: 0px;
@ -1027,15 +1040,15 @@ div#calendar-container {
margin: -1px 0 0 0; margin: -1px 0 0 0;
padding: 0px 5px 0px 5px; padding: 0px 1px 0px 1px;
background-position: bottom; background-position: bottom;
background-repeat: repeat-x; background-repeat: repeat-x;
background-color: transparent; background-color: transparent;
height: 48px;
h1 { h1 {
// font-size: 8pt;
float: left; float: left;
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -1069,49 +1082,57 @@ div#calendar-container {
.border-radius(5px,0, 0, 5px); .border-radius(5px,0, 0, 5px);
/* -moz-border-radius-topright:3px;
-webkit-border-top-right-radius:3px;
-moz-border-radius-topleft:3px;
-webkit-border-top-left-radius:3px;
border-top-right-radius:3px;
border-top-left-radius:3px;*/
.background-color-5-gray; /*.background-color-5-gray;*/
background: transparent;
display: inline-block; display: inline-block;
margin: 3px 5px 0px 0px; margin: 3px 5px 0px 0px;
padding: 2px 10px 2px 10px; /*padding: 2px 10px 2px 10px;*/
cursor: pointer; cursor: pointer;
border-width: 1px; border-width: 1px 1px 0 1px;
border-style: solid; border-style: solid;
border-color: #c6ced6; border-color: @gray-30;;
background-repeat:repeat-x; background-repeat:repeat-x;
height: 49px; height: 47px;
&:hover {.background-color-30-gray ;}
&:hover {.background-color-25-gray ;}
h1 {font-size: 100%; line-height: 1em; margin-top:0;} h1 {font-size: 100%; line-height: 1em; margin-top:0;}
// Bilder
img.egw_fw_ui_tab_icon {
display: inline-block;
.dimension_height_m;
margin-right: 5px;
margin-top: 5px;
}
} }
.egw_fw_ui_tab_header_active { .egw_fw_ui_tab_header_active {
border-width: 1px 1px 0px 1px !important; border-width: 1px 1px 0px 1px !important;
padding: 1px 10px 3px 10px !important; padding: 0 0 5px !important;
.background-color-30-gray ; .background-color-30-gray ;
background-image:none !important; background-image:none !important;
&:hover {.background-color-25-gray ;} &:hover {.background-color-25-gray ;}
}
// Bilder // aktive Bilder
img.egw_fw_ui_tab_icon { img.egw_fw_ui_tab_icon {
display: inline-block; display: inline-block;
width: 20px; .dimension_height_m;
height: 20px;
margin-right: 5px; margin-right: 5px;
margin-top: 10px; margin-top: 5px;
} }
}
@ -1190,4 +1211,5 @@ div#calendar-container {
} }
//
// //

BIN
pixelegg/less/layout_table.less
View File

Binary file not shown.