From d5d5888db98f38d59db76eacf1fd3c8694a3eb2e Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 18 Jan 2014 08:11:23 +0000 Subject: [PATCH] pixelegg changes from yesterday --- pixelegg/css/pixelegg.css | 61 +++++++++++----- .../images/login/app_addressbook_icon.svg | 25 +++++++ pixelegg/images/login/app_admin_icon.svg | 32 ++++++++ pixelegg/images/login/app_calendar_icon.svg | 25 +++++++ .../images/login/app_developer_tools_icon.svg | 26 +++++++ .../images/login/app_filemanager_icon.svg | 19 +++++ pixelegg/images/login/app_infolog_icon.svg | 21 ++++++ pixelegg/images/login/app_mail_icon.svg | 21 ++++++ .../images/login/app_preferences_icon.svg | 44 +++++++++++ .../images/login/app_projectmanager_icon.svg | 18 +++++ pixelegg/images/login/app_resources_icon.svg | 18 +++++ pixelegg/images/login/app_sambaadmin_icon.svg | 15 ++++ pixelegg/images/login/app_sitemgr_icon.svg | 19 +++++ pixelegg/images/login/app_syncml_icon.svg | 0 pixelegg/images/login/app_timesheet_icon.svg | 22 ++++++ pixelegg/images/login/app_tracker_icon.svg | 10 +++ pixelegg/images/login/app_wiki_icon.svg | 20 +++++ pixelegg/js/slider.js | 6 +- pixelegg/less/def_buttons.less | 2 - pixelegg/less/layout_loginPage.css | 58 ++++++++++----- pixelegg/less/layout_loginPage.less | 73 ++++++++++++------- pixelegg/less/layout_raster.less | 2 +- pixelegg/templates/pixelegg/login.tpl | 16 ++-- 23 files changed, 478 insertions(+), 75 deletions(-) create mode 100755 pixelegg/images/login/app_addressbook_icon.svg create mode 100755 pixelegg/images/login/app_admin_icon.svg create mode 100755 pixelegg/images/login/app_calendar_icon.svg create mode 100755 pixelegg/images/login/app_developer_tools_icon.svg create mode 100755 pixelegg/images/login/app_filemanager_icon.svg create mode 100755 pixelegg/images/login/app_infolog_icon.svg create mode 100755 pixelegg/images/login/app_mail_icon.svg create mode 100755 pixelegg/images/login/app_preferences_icon.svg create mode 100755 pixelegg/images/login/app_projectmanager_icon.svg create mode 100755 pixelegg/images/login/app_resources_icon.svg create mode 100755 pixelegg/images/login/app_sambaadmin_icon.svg create mode 100755 pixelegg/images/login/app_sitemgr_icon.svg create mode 100755 pixelegg/images/login/app_syncml_icon.svg create mode 100755 pixelegg/images/login/app_timesheet_icon.svg create mode 100755 pixelegg/images/login/app_tracker_icon.svg create mode 100755 pixelegg/images/login/app_wiki_icon.svg diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index dbec8af5c7..0013fd8311 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -3621,7 +3621,6 @@ button[id="cancel"]:active { * ######################################################################################## */ button.add { - /*background-color: @egw_color_blue_lighter !important;*/ color: #FFF; text-shadow: none; /* height: auto;*/ @@ -4155,12 +4154,17 @@ table.nextmatch_header img { box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); } #wrap { - z-index: -1; - margin: 0 auto; - background-color: transparent; + /* float: left; + z-index: -1; + margin: 0 auto; + background-color:transparent; + width: 100%;*/ } -#wrap .animation_login { - margin-top: 3em; +#wrap div.animation_login { + margin: 0.3em; + position: fixed; + width: 100%; + bottom: 0; } #wrap img[src$="svg"], #wrap background-image[url$="svg"] { @@ -4174,15 +4178,18 @@ table.nextmatch_header img { background-image: linear-gradient(top, #679fd2, #679fd2); background-repeat: repeat-x; } -/*4 Bilder*/ #img1, #img2, #img3, -#img4 { - width: 100%; - height: 100%; - position: fixed; - top: 10em; +#img4, +#img5, +#img6, +#img7, +#img8 { + width: 12%; + /*height:100%;*/ + /*position:fixed;*/ + /*top: 10em;*/ z-index: -1; animation-name: test; animation-duration: 8s; @@ -4197,16 +4204,32 @@ table.nextmatch_header img { -webkit-animation-delay: 0s; } #img2 { - animation-delay: 8s; - -webkit-animation-delay: 8s; + animation-delay: 3s; + -webkit-animation-delay: 3s; } #img3 { - animation-delay: 16s; - -webkit-animation-delay: 16s; + animation-delay: 6s; + -webkit-animation-delay: 6s; } #img4 { - animation-delay: 24s; - -webkit-animation-delay: 24s; + animation-delay: 9s; + -webkit-animation-delay: 9s; +} +#img5 { + animation-delay: 12s; + -webkit-animation-delay: 12s; +} +#img6 { + animation-delay: 15s; + -webkit-animation-delay: 15s; +} +#img7 { + animation-delay: 18s; + -webkit-animation-delay: 18s; +} +#img8 { + animation-delay: 21s; + -webkit-animation-delay: 21s; } @-webkit-keyframes test { 0% { @@ -5160,7 +5183,7 @@ div#calendar-container { div#calendar-container div.calendar { margin-bottom: 1em; background-color: inherit; - padding: 2%; + padding: 0%; } div#calendar-container div.calendar table { font-size: 0.9em; diff --git a/pixelegg/images/login/app_addressbook_icon.svg b/pixelegg/images/login/app_addressbook_icon.svg new file mode 100755 index 0000000000..a5a58c1040 --- /dev/null +++ b/pixelegg/images/login/app_addressbook_icon.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/app_admin_icon.svg b/pixelegg/images/login/app_admin_icon.svg new file mode 100755 index 0000000000..865e1bd6c2 --- /dev/null +++ b/pixelegg/images/login/app_admin_icon.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/pixelegg/images/login/app_calendar_icon.svg b/pixelegg/images/login/app_calendar_icon.svg new file mode 100755 index 0000000000..46a586167d --- /dev/null +++ b/pixelegg/images/login/app_calendar_icon.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + diff --git a/pixelegg/images/login/app_developer_tools_icon.svg b/pixelegg/images/login/app_developer_tools_icon.svg new file mode 100755 index 0000000000..e77e5a227c --- /dev/null +++ b/pixelegg/images/login/app_developer_tools_icon.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + diff --git a/pixelegg/images/login/app_filemanager_icon.svg b/pixelegg/images/login/app_filemanager_icon.svg new file mode 100755 index 0000000000..fb9d1b11c1 --- /dev/null +++ b/pixelegg/images/login/app_filemanager_icon.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/app_infolog_icon.svg b/pixelegg/images/login/app_infolog_icon.svg new file mode 100755 index 0000000000..90316257eb --- /dev/null +++ b/pixelegg/images/login/app_infolog_icon.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/app_mail_icon.svg b/pixelegg/images/login/app_mail_icon.svg new file mode 100755 index 0000000000..5ce8142435 --- /dev/null +++ b/pixelegg/images/login/app_mail_icon.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/app_preferences_icon.svg b/pixelegg/images/login/app_preferences_icon.svg new file mode 100755 index 0000000000..25a4d67789 --- /dev/null +++ b/pixelegg/images/login/app_preferences_icon.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + diff --git a/pixelegg/images/login/app_projectmanager_icon.svg b/pixelegg/images/login/app_projectmanager_icon.svg new file mode 100755 index 0000000000..b9505f9f6c --- /dev/null +++ b/pixelegg/images/login/app_projectmanager_icon.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/pixelegg/images/login/app_resources_icon.svg b/pixelegg/images/login/app_resources_icon.svg new file mode 100755 index 0000000000..a2eab3ac1b --- /dev/null +++ b/pixelegg/images/login/app_resources_icon.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/app_sambaadmin_icon.svg b/pixelegg/images/login/app_sambaadmin_icon.svg new file mode 100755 index 0000000000..c238b07fa9 --- /dev/null +++ b/pixelegg/images/login/app_sambaadmin_icon.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/pixelegg/images/login/app_sitemgr_icon.svg b/pixelegg/images/login/app_sitemgr_icon.svg new file mode 100755 index 0000000000..91b78cdf2e --- /dev/null +++ b/pixelegg/images/login/app_sitemgr_icon.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/pixelegg/images/login/app_syncml_icon.svg b/pixelegg/images/login/app_syncml_icon.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/login/app_timesheet_icon.svg b/pixelegg/images/login/app_timesheet_icon.svg new file mode 100755 index 0000000000..cafd8ec846 --- /dev/null +++ b/pixelegg/images/login/app_timesheet_icon.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/pixelegg/images/login/app_tracker_icon.svg b/pixelegg/images/login/app_tracker_icon.svg new file mode 100755 index 0000000000..3f54a94755 --- /dev/null +++ b/pixelegg/images/login/app_tracker_icon.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/pixelegg/images/login/app_wiki_icon.svg b/pixelegg/images/login/app_wiki_icon.svg new file mode 100755 index 0000000000..9cd441ea33 --- /dev/null +++ b/pixelegg/images/login/app_wiki_icon.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index 2ed7ac4faf..dc3ac8a4aa 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -19,7 +19,7 @@ function show_pixelegg_header(_toggle, _delay) $j("#egw_fw_topmenu_info_items").css("float", "right"); $j("#egw_fw_sidebar").animate({'top':'55px'},_delay); - $j("#egw_fw_tabs").animate({'margin-top':'17px'},_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"); $j(_toggle).parent().addClass("slideup"); @@ -33,7 +33,7 @@ function hide_pixelegg_header(_toggle, _delay) $j("#egw_fw_topmenu_info_items").show(); $j("#egw_fw_logout").show(); $j("#egw_fw_print").show(); - $j("#egw_fw_tabs").animate({'margin-top':'1px'},_delay); + $j("#egw_fw_tabs").animate({'margin-top':'-1px'},_delay); $j("#egw_fw_topmenu_info_items").animate({ "bottom": "3px", "right": "5px", @@ -47,7 +47,7 @@ function hide_pixelegg_header(_toggle, _delay) $j("#egw_fw_topmenu_info_items").css("position", "fixed"); $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", "34px"); //Tab $j(".egw_fw_ui_tab_header").css("height", "24px"); diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less index 2de890ff94..967e12b018 100755 --- a/pixelegg/less/def_buttons.less +++ b/pixelegg/less/def_buttons.less @@ -60,10 +60,8 @@ .box_shadow_standard_light_inset; } - /*ADD / Hinzufügen*/ .Complete_Button_add { - /*background-color: @egw_color_blue_lighter !important;*/ color: #FFF; text-shadow: none; /* height: auto;*/ diff --git a/pixelegg/less/layout_loginPage.css b/pixelegg/less/layout_loginPage.css index e81e370f9b..d2c684ed93 100644 --- a/pixelegg/less/layout_loginPage.css +++ b/pixelegg/less/layout_loginPage.css @@ -171,12 +171,17 @@ box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); } #wrap { - z-index: -1; - margin: 0 auto; - background-color: transparent; + /* float: left; + z-index: -1; + margin: 0 auto; + background-color:transparent; + width: 100%;*/ } -#wrap .animation_login { - margin-top: 3em; +#wrap div.animation_login { + margin: 0.3em; + position: fixed; + width: 100%; + bottom: 0; } #wrap img[src$="svg"], #wrap background-image[url$="svg"] { @@ -190,15 +195,18 @@ background-image: linear-gradient(top, #679fd2, #679fd2); background-repeat: repeat-x; } -/*4 Bilder*/ #img1, #img2, #img3, -#img4 { - width: 100%; - height: 100%; - position: fixed; - top: 10em; +#img4, +#img5, +#img6, +#img7, +#img8 { + width: 12%; + /*height:100%;*/ + /*position:fixed;*/ + /*top: 10em;*/ z-index: -1; animation-name: test; animation-duration: 8s; @@ -213,16 +221,32 @@ -webkit-animation-delay: 0s; } #img2 { - animation-delay: 8s; - -webkit-animation-delay: 8s; + animation-delay: 3s; + -webkit-animation-delay: 3s; } #img3 { - animation-delay: 16s; - -webkit-animation-delay: 16s; + animation-delay: 6s; + -webkit-animation-delay: 6s; } #img4 { - animation-delay: 24s; - -webkit-animation-delay: 24s; + animation-delay: 9s; + -webkit-animation-delay: 9s; +} +#img5 { + animation-delay: 12s; + -webkit-animation-delay: 12s; +} +#img6 { + animation-delay: 15s; + -webkit-animation-delay: 15s; +} +#img7 { + animation-delay: 18s; + -webkit-animation-delay: 18s; +} +#img8 { + animation-delay: 21s; + -webkit-animation-delay: 21s; } @-webkit-keyframes test { 0% { diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less index 71819e8c84..1316308854 100644 --- a/pixelegg/less/layout_loginPage.less +++ b/pixelegg/less/layout_loginPage.less @@ -156,29 +156,32 @@ - #wrap{ - z-index: -1; - margin: 0 auto; - background-color:transparent; - - .animation_login{ - margin-top: 3em; - } - - img[src$="svg"], - background-image[url$="svg"]{ - .gradient_vertical (@egw_color_2_e, @egw_color_2_e); - } - - } +#wrap{ +/* float: left; + z-index: -1; + margin: 0 auto; + background-color:transparent; + width: 100%;*/ + + div.animation_login{ + margin: 0.3em; + position: fixed; + width: 100%; + bottom: 0; + } - /*4 Bilder*/ + img[src$="svg"], + background-image[url$="svg"]{ + .gradient_vertical (@egw_color_2_e, @egw_color_2_e); + } + +} - #img1, #img2, #img3, #img4 { - width:100%; - height:100%; - position:fixed; - top: 10em; + #img1, #img2, #img3, #img4 , #img5 , #img6 , #img7 , #img8 { + width:12%; + /*height:100%;*/ + /*position:fixed;*/ + /*top: 10em;*/ z-index:-1; animation-name: test; @@ -197,16 +200,32 @@ } #img2 { - animation-delay:8s; - -webkit-animation-delay:8s + animation-delay:3s; + -webkit-animation-delay:3s } #img3 { - animation-delay:16s; - -webkit-animation-delay:16s + animation-delay:6s; + -webkit-animation-delay:6s } #img4 { - animation-delay:24s; - -webkit-animation-delay:24s + animation-delay:9s; + -webkit-animation-delay:9s + } + #img5 { + animation-delay:12s; + -webkit-animation-delay:12s + } + #img6 { + animation-delay:15s; + -webkit-animation-delay:15s + } + #img7 { + animation-delay:18s; + -webkit-animation-delay:18s + } + #img8 { + animation-delay:21s; + -webkit-animation-delay:21s } diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 7c72fb7e16..4b9f6ef21d 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -991,7 +991,7 @@ div#calendar-container { div.calendar{ margin-bottom: 1em; background-color: inherit; - padding: 2%; + padding: 0%; table { diff --git a/pixelegg/templates/pixelegg/login.tpl b/pixelegg/templates/pixelegg/login.tpl index a42131d69e..2b809c91e4 100644 --- a/pixelegg/templates/pixelegg/login.tpl +++ b/pixelegg/templates/pixelegg/login.tpl @@ -69,12 +69,16 @@ -
+