pixelegg changes from thursday

This commit is contained in:
Ralf Becker 2014-01-17 08:10:35 +00:00
parent 195ac0ceb3
commit 26df0b41b7
8 changed files with 67 additions and 31 deletions

View File

@ -1849,7 +1849,11 @@ option:checked {
} }
span.ui-icon-close { span.ui-icon-close {
margin-top: 0px; margin-top: 0px;
top: 5px !important; top: 5px;
}
.et2_link_entry .ui-icon-close {
margin-top: -5px;
top: 9px !important;
} }
/*Schliessen x*/ /*Schliessen x*/
.ui-icon-closethick { .ui-icon-closethick {
@ -3711,7 +3715,7 @@ table.egwGridView_outer tbody {
/*Elements inside td*/ /*Elements inside td*/
} }
table.egwGridView_outer tbody td.frame { table.egwGridView_outer tbody td.frame {
/*border: 1px solid #e6e6e6; can't have - breaks grid scrol calcs*/ /*border: 1px solid @gray_10; can't have - breaks grid scroll calculations'
/*padding: 0px 5px; no need*/ /*padding: 0px 5px; no need*/
} }
table.egwGridView_outer tbody td .et2_link { table.egwGridView_outer tbody td .et2_link {
@ -3740,7 +3744,7 @@ table.egwGridView_outer tbody td img[src$="svg"] {
} }
/*########################################################*/ /*########################################################*/
table.egwGridView_grid { table.egwGridView_grid {
font-size: 1.15em; font-size: 12px;
background-color: #ffffff; background-color: #ffffff;
border-spacing: 0px 1px; border-spacing: 0px 1px;
width: 100%; width: 100%;
@ -5089,7 +5093,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
width: 100%; width: 100%;
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header {
margin: 4px 0 0 0; margin: 2px 0 0 0;
padding: 0px 1px 0px 1px; padding: 0px 1px 0px 1px;
background-position: bottom; background-position: bottom;
background-repeat: repeat-x; background-repeat: repeat-x;
@ -5132,7 +5136,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
/*.background-clip(padding-box);*/ /*.background-clip(padding-box);*/
/*.background-color-5-gray;*/ /*.background-color-5-gray;*/
background: transparent; background: transparent;
display: table-cell; display: inline-table;
margin: 3px 5px 0px 0px; margin: 3px 5px 0px 0px;
/*padding: 2px 10px 2px 10px;*/ /*padding: 2px 10px 2px 10px;*/
cursor: pointer; cursor: pointer;
@ -5244,7 +5248,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
padding: 0px; padding: 0px;
margin: 0; margin: 0;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: hidden;
} }
#egw_fw_main .egw_fw_ui_tab_content > div { #egw_fw_main .egw_fw_ui_tab_content > div {
width: 100%; width: 100%;

View File

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

View File

@ -47,10 +47,10 @@ function hide_pixelegg_header(_toggle, _delay)
$j("#egw_fw_topmenu_info_items").css("position", "fixed"); $j("#egw_fw_topmenu_info_items").css("position", "fixed");
$j("#egw_fw_topmenu_info_items").css("z-index", "1000"); $j("#egw_fw_topmenu_info_items").css("z-index", "1000");
$j(".egw_fw_ui_tabs_header").css("height", "32px"); $j(".egw_fw_ui_tabs_header").css("height", "30px");
//Tab //Tab
$j(".egw_fw_ui_tab_header").css("height", "32px"); $j(".egw_fw_ui_tab_header").css("height", "24px");
// ICON // 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("display", "inline-block");

View File

@ -73,6 +73,9 @@
&: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;}
} }
.Complete_Button_add_hover { .Complete_Button_add_hover {
background-color: @egw_color_blue_lightest !important; background-color: @egw_color_blue_lightest !important;
color: @egw_color_1; color: @egw_color_1;
@ -81,6 +84,33 @@
} }
/*ADD / Hinzufügen = only PLUS */
.Complete_Button_add_only_plus {
.dimension_width_height_l;
border: 1px solid rgba(0, 0, 0, 0.15);
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
padding: 0.5em;
background-color: @egw_color_2_a !important;
&:before {
content: "+";
font-size: 2em;
color: @egw_color_1_a;
line-height: 0.6em;
padding-left: 0.1em;
padding-right: 4em;
}
&:active {background-color: @color_positive_action_active;}
}
.Complete_Button_add_only_plus_hover {
background-color: @egw_color_blue_lightest !important;
color: @egw_color_1;
.box_shadow_standard_light_hover;
.border_radius_button_lefttop;
}
.Complete_Button_hinweis{ .Complete_Button_hinweis{
.Button_size_square_32; .Button_size_square_32;

View File

@ -201,7 +201,8 @@ option:checked {background-color: @egw_color_1_e;}
&:active { background-color: @color_cancel_action_active !important; } &:active { background-color: @color_cancel_action_active !important; }
} }
span.ui-icon-close {margin-top: 0px; top: 5px !important;} span.ui-icon-close {margin-top: 0px; top: 5px;}
.et2_link_entry .ui-icon-close {margin-top: -5px; top: 9px !important;}
/*Schliessen x*/ /*Schliessen x*/
.ui-icon-closethick { .ui-icon-closethick {

Binary file not shown.

View File

@ -1087,7 +1087,7 @@ div#calendar-container {
.egw_fw_ui_tabs_header { .egw_fw_ui_tabs_header {
margin: 4px 0 0 0; margin: 2px 0 0 0;
padding: 0px 1px 0px 1px; padding: 0px 1px 0px 1px;
@ -1133,7 +1133,7 @@ div#calendar-container {
/*.background-color-5-gray;*/ /*.background-color-5-gray;*/
background: transparent; background: transparent;
display: table-cell; display: inline-table;
margin: 3px 5px 0px 0px; margin: 3px 5px 0px 0px;
/*padding: 2px 10px 2px 10px;*/ /*padding: 2px 10px 2px 10px;*/
cursor: pointer; cursor: pointer;

View File

@ -185,7 +185,7 @@ table.egwGridView_outer{
table.egwGridView_grid{ table.egwGridView_grid{
// border-collapse:collapse; // border-collapse:collapse;
font-size: 1.15em; font-size: 12px;
.background_color_0_gray; .background_color_0_gray;
border-spacing: 0px 1px; border-spacing: 0px 1px;
width: 100%; width: 100%;