From 4057ad4f7ca0e33db58ddbf5a04cdca3dceb7d4b Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 20 Jan 2014 18:34:20 +0000 Subject: [PATCH] pixelegg changes from today --- .../mail_view_compose.html | 5 +-- pixelegg/css/pixelegg.css | 16 +++++----- pixelegg/js/slider.js | 4 +-- pixelegg/less/layout_loginPage.css | 4 ++- pixelegg/less/layout_loginPage.less | 3 +- pixelegg/less/layout_raster.less | 31 +++---------------- 6 files changed, 22 insertions(+), 41 deletions(-) diff --git a/pixelegg/content-element-library/mail_view_compose.html b/pixelegg/content-element-library/mail_view_compose.html index e49f85b842..85e212f27d 100755 --- a/pixelegg/content-element-library/mail_view_compose.html +++ b/pixelegg/content-element-library/mail_view_compose.html @@ -50,9 +50,7 @@ Author: Stefan Reinhardt (c) pixelegg
- -
Indentität
Save as DraftSave as Draft and Print
Save:
Save as infolog on send
Save as tracker on send
Recieve notificationPriorität
An
Kopie
Blindkopie
Reply To
Store to Folder
Betreff
Editor type
Files
- +
Als Entwurf speichernAls Entwurf speichern und drucken
Speichern
Save as infolog on send
Save as tracker on send
Empfangsbestätigung anfordernPriorität
Von
An
KopieBlindkopie
Betreff
Anhang
@@ -64,4 +62,3 @@ Author: Stefan Reinhardt (c) pixelegg - \ No newline at end of file diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index cfac03ee36..bb9f51c7c2 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -4059,9 +4059,11 @@ table.nextmatch_header img { margin-bottom: 2em; position: relative; top: 1px; + background-color: #679fd2; } #loginMainDiv #divAppIconBar #divLogo img { - width: 100%; + width: 70%; + margin-left: 15%; } #loginMainDiv #divAppIconBar #divLogo img[src$="svg"] { background-color: #679fd2; @@ -4783,7 +4785,7 @@ table.nextmatch_header img { border-bottom: solid 1px #b4b4b4; margin: 0 0 0 0; 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 { padding-left: 9px; @@ -5028,14 +5030,14 @@ table.nextmatch_header img { position: absolute; background-color: #b3b3b3 !important; width: 5px; - top: 36px; + top: 39px; bottom: 3px; right: 0px; } #egw_fw_sidebar #egw_fw_splitter:hover { background-color: #ffc200; } -.egw_fw_ui_splitter_vertical { +#egw_fw_sidebar .egw_fw_ui_splitter_vertical { background-image: url(../images/splitter_vert.png); background-position: center; background-repeat: no-repeat; @@ -5310,7 +5312,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { background: transparent; display: inline-table; margin: 0px 5px 0px 0px; - /*padding: 2px 10px 2px 10px;*/ + padding: 2px 10px 5px 10px; cursor: pointer; border-width: 1px 1px 0 1px; 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 { border-width: 1px 1px 0px 1px !important; - padding: 0 0 5px !important; + /*padding: 0 0 5px !important;*/ background-color: #b3b3b3 !important; background-image: none !important; /*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 { width: 24px; height: 24px; - margin: 2px 1px 0 5px; + margin: 0px 1px 0 5px; -webkit-border-top-right-radius: 2px; -webkit-border-bottom-right-radius: 0; -webkit-border-bottom-left-radius: 0; diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index dc3ac8a4aa..f60d852756 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -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("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_ui_sidemenu_entry_header_active").css("background-position","95% -3000px"); $j(_toggle).parent().removeClass("slidedown"); @@ -29,7 +29,7 @@ function show_pixelegg_header(_toggle, _delay) function hide_pixelegg_header(_toggle, _delay) { $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_logout").show(); $j("#egw_fw_print").show(); diff --git a/pixelegg/less/layout_loginPage.css b/pixelegg/less/layout_loginPage.css index d2c684ed93..684490b41e 100644 --- a/pixelegg/less/layout_loginPage.css +++ b/pixelegg/less/layout_loginPage.css @@ -36,9 +36,11 @@ margin-bottom: 2em; position: relative; top: 1px; + background-color: #679fd2; } #loginMainDiv #divAppIconBar #divLogo img { - width: 100%; + width: 70%; + margin-left: 15%; } #loginMainDiv #divAppIconBar #divLogo img[src$="svg"] { background-color: #679fd2; diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less index 1316308854..8c6fba6df6 100644 --- a/pixelegg/less/layout_loginPage.less +++ b/pixelegg/less/layout_loginPage.less @@ -48,8 +48,9 @@ margin-bottom: 2em; position: relative; top: 1px; + background-color: @egw_color_2_e; - img {width: 100%; } + img {width: 70%;margin-left: 15%; } img[src$="svg"]{ .gradient_vertical (@egw_color_2_e, @egw_color_2_e); } diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 81bc89b7ee..97cc6f05ff 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -537,7 +537,7 @@ margin: 0 0 0 0; border-bottom: none; - height: 30px; + height: 33px; img {padding-left: 9px; padding-top: 6px; height: 18px;} @@ -711,7 +711,7 @@ // background-color: RGB(200, 200, 255); .background_color_30_gray; width: 5px; - top: 36px; + top: 39px; bottom: 3px; right: 0px; @@ -1137,7 +1137,7 @@ div#calendar-container { display: inline-table; margin: 0px 5px 0px 0px; - /*padding: 2px 10px 2px 10px;*/ + padding: 2px 10px 5px 10px; cursor: pointer; border-width: 1px 1px 0 1px; border-style: solid; @@ -1185,7 +1185,7 @@ div#calendar-container { /*aktive Tabs*/ .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; - padding: 0 0 5px !important; + /*padding: 0 0 5px !important;*/ .background_color_30_gray ; background-image:none !important; @@ -1196,28 +1196,16 @@ div#calendar-container { img.egw_fw_ui_tab_icon { display: inline-block; .dimension_width_height_s; - - - } /*aktive Objekte*/ object { .dimension_width_height_m; - margin: 2px 1px 0 5px; + margin: 0px 1px 0 5px; .border_radius(2px,0, 0, 2px); background-color: @gray_30; } - } - - - - - - - - } .egw_fw_ui_tab_close_button { @@ -1251,9 +1239,6 @@ div#calendar-container { background-color: transparent; } - - - // Der eigentliche Inhalt der APP // ############################################################ // # # # # # # # # # #### @@ -1277,14 +1262,8 @@ div#calendar-container { > div { width: 100%; padding: 0 0 0 0; - - - }; - } - - // Ende Main }