pixelegg changes from today

This commit is contained in:
Ralf Becker 2014-01-20 18:34:20 +00:00
parent d07b061e78
commit 4057ad4f7c
6 changed files with 22 additions and 41 deletions

File diff suppressed because one or more lines are too long

View File

@ -4059,9 +4059,11 @@ table.nextmatch_header img {
margin-bottom: 2em; margin-bottom: 2em;
position: relative; position: relative;
top: 1px; top: 1px;
background-color: #679fd2;
} }
#loginMainDiv #divAppIconBar #divLogo img { #loginMainDiv #divAppIconBar #divLogo img {
width: 100%; width: 70%;
margin-left: 15%;
} }
#loginMainDiv #divAppIconBar #divLogo img[src$="svg"] { #loginMainDiv #divAppIconBar #divLogo img[src$="svg"] {
background-color: #679fd2; background-color: #679fd2;
@ -4783,7 +4785,7 @@ table.nextmatch_header img {
border-bottom: solid 1px #b4b4b4; border-bottom: solid 1px #b4b4b4;
margin: 0 0 0 0; margin: 0 0 0 0;
border-bottom: none; border-bottom: none;
height: 30px; height: 33px;
} }
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active img { #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active img {
padding-left: 9px; padding-left: 9px;
@ -5028,14 +5030,14 @@ table.nextmatch_header img {
position: absolute; position: absolute;
background-color: #b3b3b3 !important; background-color: #b3b3b3 !important;
width: 5px; width: 5px;
top: 36px; top: 39px;
bottom: 3px; bottom: 3px;
right: 0px; right: 0px;
} }
#egw_fw_sidebar #egw_fw_splitter:hover { #egw_fw_sidebar #egw_fw_splitter:hover {
background-color: #ffc200; background-color: #ffc200;
} }
.egw_fw_ui_splitter_vertical { #egw_fw_sidebar .egw_fw_ui_splitter_vertical {
background-image: url(../images/splitter_vert.png); background-image: url(../images/splitter_vert.png);
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -5310,7 +5312,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
background: transparent; background: transparent;
display: inline-table; display: inline-table;
margin: 0px 5px 0px 0px; margin: 0px 5px 0px 0px;
/*padding: 2px 10px 2px 10px;*/ padding: 2px 10px 5px 10px;
cursor: pointer; cursor: pointer;
border-width: 1px 1px 0 1px; border-width: 1px 1px 0 1px;
border-style: solid; border-style: solid;
@ -5364,7 +5366,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_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: 0 0 5px !important; /*padding: 0 0 5px !important;*/
background-color: #b3b3b3 !important; background-color: #b3b3b3 !important;
background-image: none !important; background-image: none !important;
/*aktive Objekte*/ /*aktive Objekte*/
@ -5380,7 +5382,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_active object { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active object {
width: 24px; width: 24px;
height: 24px; height: 24px;
margin: 2px 1px 0 5px; margin: 0px 1px 0 5px;
-webkit-border-top-right-radius: 2px; -webkit-border-top-right-radius: 2px;
-webkit-border-bottom-right-radius: 0; -webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0; -webkit-border-bottom-left-radius: 0;

View File

@ -18,7 +18,7 @@ function show_pixelegg_header(_toggle, _delay)
$j("#egw_fw_topmenu_info_items").css("display", "flex"); $j("#egw_fw_topmenu_info_items").css("display", "flex");
$j("#egw_fw_topmenu_info_items").css("float", "right"); $j("#egw_fw_topmenu_info_items").css("float", "right");
$j("#egw_fw_sidebar").animate({'top':'55px'},_delay); $j("#egw_fw_sidebar").animate({'top':'52px'},_delay);
$j("#egw_fw_tabs").animate({'margin-top':'12px'},_delay); $j("#egw_fw_tabs").animate({'margin-top':'12px'},_delay);
$j(".egw_fw_ui_sidemenu_entry_header_active").css("background-position","95% -3000px"); $j(".egw_fw_ui_sidemenu_entry_header_active").css("background-position","95% -3000px");
$j(_toggle).parent().removeClass("slidedown"); $j(_toggle).parent().removeClass("slidedown");
@ -29,7 +29,7 @@ function show_pixelegg_header(_toggle, _delay)
function hide_pixelegg_header(_toggle, _delay) function hide_pixelegg_header(_toggle, _delay)
{ {
$j("#egw_fw_header").slideToggle(); $j("#egw_fw_header").slideToggle();
$j("#egw_fw_sidebar").animate({'top':'0px'},_delay); $j("#egw_fw_sidebar").animate({'top':'-3px'},_delay);
$j("#egw_fw_topmenu_info_items").show(); $j("#egw_fw_topmenu_info_items").show();
$j("#egw_fw_logout").show(); $j("#egw_fw_logout").show();
$j("#egw_fw_print").show(); $j("#egw_fw_print").show();

View File

@ -36,9 +36,11 @@
margin-bottom: 2em; margin-bottom: 2em;
position: relative; position: relative;
top: 1px; top: 1px;
background-color: #679fd2;
} }
#loginMainDiv #divAppIconBar #divLogo img { #loginMainDiv #divAppIconBar #divLogo img {
width: 100%; width: 70%;
margin-left: 15%;
} }
#loginMainDiv #divAppIconBar #divLogo img[src$="svg"] { #loginMainDiv #divAppIconBar #divLogo img[src$="svg"] {
background-color: #679fd2; background-color: #679fd2;

View File

@ -48,8 +48,9 @@
margin-bottom: 2em; margin-bottom: 2em;
position: relative; position: relative;
top: 1px; top: 1px;
background-color: @egw_color_2_e;
img {width: 100%; } img {width: 70%;margin-left: 15%; }
img[src$="svg"]{ img[src$="svg"]{
.gradient_vertical (@egw_color_2_e, @egw_color_2_e); .gradient_vertical (@egw_color_2_e, @egw_color_2_e);
} }

View File

@ -537,7 +537,7 @@
margin: 0 0 0 0; margin: 0 0 0 0;
border-bottom: none; border-bottom: none;
height: 30px; height: 33px;
img {padding-left: 9px; padding-top: 6px; height: 18px;} img {padding-left: 9px; padding-top: 6px; height: 18px;}
@ -711,7 +711,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: 36px; top: 39px;
bottom: 3px; bottom: 3px;
right: 0px; right: 0px;
@ -1137,7 +1137,7 @@ div#calendar-container {
display: inline-table; display: inline-table;
margin: 0px 5px 0px 0px; margin: 0px 5px 0px 0px;
/*padding: 2px 10px 2px 10px;*/ padding: 2px 10px 5px 10px;
cursor: pointer; cursor: pointer;
border-width: 1px 1px 0 1px; border-width: 1px 1px 0 1px;
border-style: solid; border-style: solid;
@ -1185,7 +1185,7 @@ div#calendar-container {
/*aktive Tabs*/ /*aktive Tabs*/
.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: 0 0 5px !important; /*padding: 0 0 5px !important;*/
.background_color_30_gray ; .background_color_30_gray ;
background-image:none !important; background-image:none !important;
@ -1196,28 +1196,16 @@ div#calendar-container {
img.egw_fw_ui_tab_icon { img.egw_fw_ui_tab_icon {
display: inline-block; display: inline-block;
.dimension_width_height_s; .dimension_width_height_s;
} }
/*aktive Objekte*/ /*aktive Objekte*/
object { object {
.dimension_width_height_m; .dimension_width_height_m;
margin: 2px 1px 0 5px; margin: 0px 1px 0 5px;
.border_radius(2px,0, 0, 2px); .border_radius(2px,0, 0, 2px);
background-color: @gray_30; background-color: @gray_30;
} }
} }
} }
.egw_fw_ui_tab_close_button { .egw_fw_ui_tab_close_button {
@ -1251,9 +1239,6 @@ div#calendar-container {
background-color: transparent; background-color: transparent;
} }
// Der eigentliche Inhalt der APP // Der eigentliche Inhalt der APP
// ############################################################ // ############################################################
// # # # # # # # # # #### // # # # # # # # # # ####
@ -1277,14 +1262,8 @@ div#calendar-container {
> div { > div {
width: 100%; width: 100%;
padding: 0 0 0 0; padding: 0 0 0 0;
}; };
} }
// Ende Main // Ende Main
} }