From 7f45b0725a53eed0b059d3d269e46e9ac12aa200 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 14 Jan 2014 08:20:19 +0000 Subject: [PATCH] pixelegg changes from monday --- pixelegg/css/pixelegg.css | 412 +++++++++--------- pixelegg/js/slider.js | 34 +- pixelegg/less/def_buttons.less | 22 +- .../def_design_pattern_color_font_shadow.less | 2 +- pixelegg/less/etemplate2.less | 30 +- pixelegg/less/jquery-ui.less | 16 + pixelegg/less/layout_content_elements.less | 81 ++-- pixelegg/less/layout_dialog.less | Bin 6713 -> 6785 bytes pixelegg/less/layout_loginPage.css | 114 +---- pixelegg/less/layout_loginPage.less | 100 ++--- pixelegg/less/layout_raster.less | 32 +- pixelegg/less/layout_table.less | 2 +- pixelegg/templates/pixelegg/login.tpl | 5 +- 13 files changed, 419 insertions(+), 431 deletions(-) diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index d958e1cf28..cb229302b6 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -182,10 +182,10 @@ -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -194,6 +194,7 @@ -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; } /*in Nextmatch definiert*/ .et2_button_icon { @@ -211,6 +212,7 @@ -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); background-color: #1aa200; + background-size: 20px 20px; } button.et2_button_text:active, input[type=button]:active { @@ -1935,10 +1937,10 @@ span.ui-icon-search { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -1947,6 +1949,7 @@ span.ui-icon-search { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -1967,6 +1970,14 @@ span.ui-icon-search { .ui-dialog-buttonset button.ui-button-text-only:hover { background-color: #b4b4b4 !important; } +/*###########################################*/ +/*Dialog: calendar edit series*/ +.ui-datepicker { + padding: 1em; +} +.ui-datepicker .ui-widget-header .ui-icon { + background-image: url("images/ui-icons_d8e7f3_256x240.png"); +} /** * EGroupware: Stylite Pixelegg template * @@ -2928,6 +2939,8 @@ img { #egw_fw_sidebar img[src$="svg"], #egw_fw_main img[src$="svg"], #egw_fw_footer img[src$="svg"] { + /*path{fill: red;}*/ + /*stroke: none; fill: #0000ff;*/ background-color: #0c5da5; background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); @@ -2937,6 +2950,11 @@ img { background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); background-image: linear-gradient(top, #0c5da5, #0c5da5); background-repeat: repeat-x; + /* &:hover { + + path{fill: red;} + + }*/ } input, button, @@ -3170,6 +3188,82 @@ a.textSidebox { # # # # ############################*/ +button.et2_button_text background-image[src$="svg"], +input[type=button] background-image[src$="svg"] { + background-color: #b4b4b4; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4)); + background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: linear-gradient(top, #b4b4b4, #b4b4b4); + background-repeat: repeat-x; +} +button.et2_button_text:hover, +input[type=button]:hover { + /*background-color: @gray_30;*/ + text-shadow: 0px 0px; + color: #ffffff; + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + background-color: #1aa200; + background-size: 20px 20px; +} +button.et2_button_text:active, +input[type=button]:active { + -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; + -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; + box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; +} +/* ######################################################################################## + * + * Button mit Bildern + * + ######################################################################################## */ +button.et2_button_with_image { + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-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); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color: #000000; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; + -webkit-transition-duration: 0.5s; + -moz-transition-duration: 0.5s; + -o-transition-duration: 0.5s; + transition-duration: 0.5s; + -webkit-transition-timing-function: linear; + -moz-transition-timing-function: linear; + -o-transition-timing-function: linear; + transition-timing-function: linear; + padding-left: 30px !important; + background-position: 6px center !important; + background-size: 20px auto !important; + width: auto; + height: 32px; + background-repeat: no-repeat !important; + background-position: 6px center; + background-size: 20px 20px; + background-color: #b4b4b4; +} +button.et2_button_with_image background-color[url$="svg"] { + background-color: #b4b4b4; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4)); + background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: linear-gradient(top, #b4b4b4, #b4b4b4); + background-repeat: repeat-x; +} /* ######################################################################################## * * Button löschen / delete / => color-negative-action @@ -3190,10 +3284,10 @@ button[id="addressbook-edit_button[delete]"] { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -3202,6 +3296,7 @@ button[id="addressbook-edit_button[delete]"] { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -3226,10 +3321,10 @@ button[id="addressbook-edit_button[delete]"]:hover { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -3238,6 +3333,7 @@ button[id="addressbook-edit_button[delete]"]:hover { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -3261,10 +3357,10 @@ button[id="addressbook-edit_button[delete]"]:active { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -3273,6 +3369,7 @@ button[id="addressbook-edit_button[delete]"]:active { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -3286,15 +3383,24 @@ button[id="addressbook-edit_button[delete]"]:active { * Button edit + save + apply + copy => color-positive-action * ######################################################################################## */ -button[id*="save"]:active { - background-color: #1aa200; -} -button[id*="apply"]:active { - background-color: #1aa200; -} -button[id*="copy"]:active { - background-color: #1aa200; +button[id*="save"] img[url*="svg"], +button[id*="apply"] img[url*="svg"], +button[id*="copy"] img[url*="svg"], +button[id*="edit_button[edit]"] img[url*="svg"] { + background-color: #b4b4b4; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4)); + background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4); + background-image: linear-gradient(top, #b4b4b4, #b4b4b4); + background-repeat: repeat-x; + fill: red; } +button[id*="save"]:active, +button[id*="apply"]:active, +button[id*="copy"]:active, button[id*="edit_button[edit]"]:active { background-color: #1aa200; } @@ -3304,7 +3410,7 @@ button#filemanager-select_button[ok]:active { /*ui-widget*/ /*edit series*/ button#series { - background-image: url('../images/edit.png') !important; + background-image: url('../images/edit.svg') !important; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -3313,10 +3419,10 @@ button#series { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -3325,6 +3431,7 @@ button#series { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -3333,14 +3440,14 @@ button#series { height: 32px; } button#series:hover { - background-image: url('../images/edit.png') !important; + background-image: url('../images/edit.svg') !important; } button#series:active { background-color: #1aa200 !important; } /*edit exception*/ button#exception { - background-image: url('../images/edit.png') !important; + background-image: url('../images/edit.svg') !important; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -3349,10 +3456,10 @@ button#exception { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -3361,6 +3468,7 @@ button#exception { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -3369,7 +3477,7 @@ button#exception { height: 32px; } button#exception:hover { - background-image: url('../images/edit.png') !important; + background-image: url('../images/edit.svg') !important; } button#exception:active { background-color: #1aa200 !important; @@ -3417,10 +3525,10 @@ button[id="cancel"] { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -3429,6 +3537,7 @@ button[id="cancel"] { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -3478,10 +3587,10 @@ button[id="add"] { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -3490,6 +3599,7 @@ button[id="add"] { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -3500,41 +3610,6 @@ button[id="add"] { button[id="add"]:active { background-color: #1aa200 !important; } -/* ######################################################################################## - * - * Button mit Bildern - * - ######################################################################################## */ -button.et2_button_with_image { - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-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); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; - -webkit-transition-duration: 0.5s; - -moz-transition-duration: 0.5s; - -o-transition-duration: 0.5s; - transition-duration: 0.5s; - -webkit-transition-timing-function: linear; - -moz-transition-timing-function: linear; - -o-transition-timing-function: linear; - transition-timing-function: linear; - padding-left: 30px !important; - background-position: 6px center !important; - background-size: 20px auto !important; - width: auto; - height: 32px; - background-repeat: no-repeat !important; - background-position: 6px center; - background-size: 20px auto; -} /*Button Ende #######################################################*/ @media screen and (-webkit-min-device-pixel-ratio: 0) { select { @@ -3565,7 +3640,7 @@ button.et2_button_with_image { */ /* TABLE STYLE */ .innerContainer { - overflow: auto; + /*overflow:auto;*/ /*padding: 0;*/ } .egwGridView_grid tr.th > td, @@ -3982,30 +4057,8 @@ table.customfields td span > div { margin: 0 auto; background-color: transparent; } -#wrap img.bgfade { - position: absolute; - top: -22%; - left: 0%; - /*display:block;*/ - z-index: -1; - width: 20%; -} -#wrap div.animation_login { - background-image: url(../../images/about.svg), url(../../images/accounts.svg), url(../../images/alarm.svg); - background-position: 20px -90px, 30px 80px, 0px 0px; - background-repeat: no-repeat, no-repeat, repeat-x; - animation: animatedLogin 4s linear infinite; - height: 190px; - overflow: hidden; - width: 560px; -} -@keyframes animatedLogin { - from { - background-position: 20px 20px, 30px 80px, 0 0; - } - to { - background-position: 300px -90px, 30px 20px, 100% 0; - } +#wrap .animation_login { + margin-top: 3em; } #wrap img[src$="svg"], #wrap background-image[url$="svg"] { @@ -4019,6 +4072,7 @@ table.customfields td span > div { background-image: linear-gradient(top, #679fd2, #679fd2); background-repeat: repeat-x; } +/*4 Bilder*/ #img1, #img2, #img3, @@ -4026,42 +4080,31 @@ table.customfields td span > div { width: 100%; height: 100%; position: fixed; - top: 0; + top: 10em; z-index: -1; animation-name: test; - animation-duration: 5s; + animation-duration: 8s; + animation-iteration-count: infinite; + -webkit-animation-name: test; + -webkit-animation-duration: 8s; + -webkit-animation-iteration-count: infinite; opacity: 0; } +#img1 { + animation-delay: 0s; + -webkit-animation-delay: 0s; +} #img2 { - animation-delay: 5s; - -webkit-animation-delay: 5s; + animation-delay: 8s; + -webkit-animation-delay: 8s; } #img3 { - animation-delay: 10s; - -webkit-animation-delay: 10s; + animation-delay: 16s; + -webkit-animation-delay: 16s; } #img4 { - animation-delay: 15s; - -webkit-animation-delay: 15s; -} -.animated { - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; - -ms-animation-fill-mode: both; - -o-animation-fill-mode: both; - animation-fill-mode: both; - -webkit-animation-duration: 3s; - -moz-animation-duration: 3s; - -ms-animation-duration: 3s; - -o-animation-duration: 3s; - animation-duration: 3s; -} -.animated.hinge { - -webkit-animation-duration: 2s; - -moz-animation-duration: 2s; - -ms-animation-duration: 2s; - -o-animation-duration: 2s; - animation-duration: 2s; + animation-delay: 24s; + -webkit-animation-delay: 24s; } @-webkit-keyframes test { 0% { @@ -4070,6 +4113,9 @@ table.customfields td span > div { 50% { opacity: 1; } + 100% { + opacity: 0; + } } @keyframes test { 0% { @@ -4078,45 +4124,8 @@ table.customfields td span > div { 50% { opacity: 1; } -} -@-webkit-keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; - } -} -@-moz-keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; - } -} -@-ms-keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; - } -} -@-o-keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; - } -} -@keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; + 100% { + opacity: 0; } } /** @@ -4207,10 +4216,10 @@ table.customfields td span > div { -moz-border-radius: 3px; border-radius: 3px; color: #000000; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -4219,6 +4228,8 @@ table.customfields td span > div { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; + background-color: #cdcdcd; -webkit-transition: all 0.2s ease-out; -moz-transition: all 0.2s ease-out; -o-transition: all 0.2s ease-out; @@ -4239,6 +4250,8 @@ table.customfields td span > div { #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a { color: #000000; text-decoration: none; + height: 16px; + font-size: 1.1em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { color: #808080; @@ -4259,8 +4272,8 @@ table.customfields td span > div { content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; - width: 16px; - height: 16px; + width: 12px; + height: 12px; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_prefs { margin-left: 0px; @@ -4270,15 +4283,15 @@ table.customfields td span > div { content: ""; background-image: url(../images/topmenu_items/setup.png); background-repeat: no-repeat; - width: 16px; - height: 16px; + width: 12px; + height: 12px; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_acl:before { padding-right: 20px; content: ""; background-repeat: no-repeat; - width: 16px; - height: 16px; + width: 12px; + height: 12px; background-image: url(../images/topmenu_items/access.png); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_cats:before { @@ -4286,32 +4299,32 @@ table.customfields td span > div { padding-right: 20px; content: ""; background-repeat: no-repeat; - width: 16px; - height: 16px; + width: 12px; + height: 12px; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_preferences:before { background-image: url(../images/topmenu_items/password.png); padding-right: 20px; content: ""; background-repeat: no-repeat; - width: 16px; - height: 16px; + width: 12px; + height: 12px; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_manual:before { background-image: url(../images/topmenu_items/help.png); padding-right: 20px; content: ""; background-repeat: no-repeat; - width: 16px; - height: 16px; + width: 12px; + height: 12px; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_search:before { background-image: url(../images/topmenu_items/search.png); padding-right: 20px; content: ""; background-repeat: no-repeat; - width: 16px; - height: 16px; + width: 12px; + height: 12px; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_logout:before { background-image: url(../images/topmenu_items/logout.png); @@ -4626,6 +4639,7 @@ table.customfields td span > div { #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header h1 { margin: 0 0 10px 0; padding-top: 0.31em; + padding-left: 3em; color: #999999; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active { @@ -4839,8 +4853,8 @@ table.customfields td span > div { color: #FFF; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 a img { - height: 16px; width: 16px; + height: 16px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 a:hover { padding: 5px 30px 5px 0px; @@ -4870,12 +4884,11 @@ table.customfields td span > div { display: inline-block; height: 24px; padding-left: 0; - padding-right: 10px; + padding-right: 0px; float: left; /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - /* Firefox 10+, Firefox on Android */ -webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); -ms-filter: grayscale(100%); @@ -4884,6 +4897,11 @@ table.customfields td span > div { /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ + /* path {color: red} + + svg:hover path {fill: red;} + + filter: hue-rotate(90deg);*/ } #egw_fw_sidebar #egw_fw_splitter { position: absolute; @@ -5197,7 +5215,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { margin: 5px 1px 0 1em; /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - /* Firefox 10+, Firefox on Android */ -webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); -ms-filter: grayscale(100%); @@ -5468,6 +5485,9 @@ tr.dialog-header4 .et2_label { .dialog-footer-toolbar button { height: 32px; } +.dialog-footer-toolbar button[id="addressbook-edit_button[delete]"] { + float: right; +} .dialog-footer-toolbar .et2_selectbox { height: 32px; top: 0px; diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index 92dcd9512e..f0bcfa9309 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -153,4 +153,36 @@ egw_LAB.wait(function() { text-align: right; white-space: nowrap; z-index: 1000; -} */ \ No newline at end of file +} */ + + /* + * Replace all SVG images with inline SVG + */ + $j('img.svg').each(function(){ + var $img = $j(this); + var imgID = $img.attr('id'); + var imgClass = $img.attr('class'); + var imgURL = $img.attr('src'); + + $j.get(imgURL, function(data) { + // Get the SVG tag, ignore the rest + var $svg = $j(data).find('svg'); + + // Add replaced image's ID to the new SVG + if(typeof imgID !== 'undefined') { + $svg = $svg.attr('id', imgID); + } + // Add replaced image's classes to the new SVG + if(typeof imgClass !== 'undefined') { + $svg = $svg.attr('class', imgClass+' replaced-svg'); + } + + // Remove any invalid XML tags as per http://validator.w3.org + $svg = $svg.removeAttr('xmlns:a'); + + // Replace image with new SVG + $img.replaceWith($svg); + + }, 'xml'); + + }); \ No newline at end of file diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less index 85b177c71a..c8d862f06d 100755 --- a/pixelegg/less/def_buttons.less +++ b/pixelegg/less/def_buttons.less @@ -27,10 +27,11 @@ .rounded (3px); color: @gray_100; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; + + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; @@ -39,7 +40,7 @@ -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; - + background-color: @gray_30; } @@ -298,4 +299,15 @@ width: 93%; } + +/*##################################################### + +Images svg + +#####################################################*/ + + +/*delete*/ +img[url*="delete"]{.gradient_vertical (@gray_30, @gray_30);} + // \ No newline at end of file diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less index 0ef3cdce63..5d19e919c4 100755 --- a/pixelegg/less/def_design_pattern_color_font_shadow.less +++ b/pixelegg/less/def_design_pattern_color_font_shadow.less @@ -337,7 +337,7 @@ .img_filter_gray{ /*filter grey*/ - filter: url("data:image/svg+xml;utf8,#grayscale"); /* Firefox 10+, Firefox on Android */ + filter: url("data:image/svg+xml;utf8,#grayscale"); -webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 277b549d3d..27f64f9b3f 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -201,37 +201,11 @@ a.et2_url.url { .dimension_height_s; } +/*look in layout_content_elements*/ button.et2_button_text, -input[type=button] { - - &:hover{ - /*background-color: @gray_30;*/ - text-shadow: 0px 0px; - color: @gray_0; - .box_shadow_standard_light_hover; - background-color: @color_positive_action_active; - } - - &:active {.box_shadow_standard_light_active !important;} - -} +input[type=button] {} -/*button.et2_button_text:hover, input[type=button]:hover { - color: @gray_90; - border: 1px solid @gray_20; - background-color: @gray_30; -} -button.et2_button_text:active, input[type=button]:active { - background-image: none !important; - background-color: @gray_50; - color: @gray_0; -} -button.et2_button_text:focus, input[type=button]:focus { - border: 1px solid @gray_40; - color: @gray_0; - outline: none; -}*/ /** * Drop down button diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less index b6ad32b1ce..5bd34d5e9d 100755 --- a/pixelegg/less/jquery-ui.less +++ b/pixelegg/less/jquery-ui.less @@ -275,4 +275,20 @@ span.ui-icon-search{ &:hover{ background-color: @gray_30 !important;} } } + +/*###########################################*/ +/*Dialog: calendar edit series*/ + +.ui-datepicker { + + padding: 1em; + + .ui-widget-header .ui-icon { + background-image: url("images/ui-icons_d8e7f3_256x240.png"); +} + + + +} + // \ No newline at end of file diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index 756649a411..ae3328115f 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -550,7 +550,16 @@ img #egw_fw_sidebar img[src$="svg"], #egw_fw_main img[src$="svg"], #egw_fw_footer img[src$="svg"]{ + + /*path{fill: red;}*/ + /*stroke: none; fill: #0000ff;*/ .gradient_vertical (@egw_color_2_a, @egw_color_2_a); + +/* &:hover { + + path{fill: red;} + + }*/ } @@ -861,6 +870,40 @@ a.textSidebox button{ // siehe etemplate2.less } + +button.et2_button_text, +input[type=button] { + + background-image[src$="svg"]{.gradient_vertical (@gray_30, @gray_30);} + + &:hover{ + /*background-color: @gray_30;*/ + text-shadow: 0px 0px; + color: @gray_0; + .box_shadow_standard_light_hover; + background-color: @color_positive_action_active; + background-size: 20px 20px; + } + + &:active {.box_shadow_standard_light_active !important;} + +} + +/* ######################################################################################## + * + * Button mit Bildern + * + ######################################################################################## */ +button.et2_button_with_image{ + .Complete_Button_text_icon_before; + background-repeat: no-repeat !important; + background-position: 6px center; + background-size: 20px 20px; + background-color: @gray_30; + background-color[url$="svg"]{.gradient_vertical (@gray_30, @gray_30);} + +} + /* ######################################################################################## * * Button löschen / delete / => color-negative-action @@ -902,19 +945,18 @@ button[id="addressbook-edit_button[delete]"] * ######################################################################################## */ -button[id*="save"] { - &:active {background-color: @color_positive_action_active;} -} -button[id*="apply"]{ - &:active {background-color: @color_positive_action_active;} -} -button[id*="copy"]{ - &:active {background-color: @color_positive_action_active;} - } +button[id*="save"], +button[id*="apply"], +button[id*="copy"], button[id*="edit_button[edit]"]{ + + img[url*="svg"]{.gradient_vertical (@gray_30, @gray_30); fill: red;} + + &:active {background-color: @color_positive_action_active;} } + button#filemanager-select_button[ok]{ &:active {background-color: @color_positive_action_active;} } @@ -922,16 +964,16 @@ button#filemanager-select_button[ok]{ /*ui-widget*/ /*edit series*/ button#series { - background-image:url('../images/edit.png') !important; + background-image:url('../images/edit.svg') !important; .Complete_Button_text_icon_before; - &:hover {background-image:url('../images/edit.png') !important;} + &:hover {background-image:url('../images/edit.svg') !important;} &:active {background-color: @color_positive_action_active !important;} } /*edit exception*/ button#exception { - background-image:url('../images/edit.png') !important; + background-image:url('../images/edit.svg') !important; .Complete_Button_text_icon_before; - &:hover {background-image:url('../images/edit.png') !important;} + &:hover {background-image:url('../images/edit.svg') !important;} &:active {background-color: @color_positive_action_active !important;} } @@ -993,18 +1035,7 @@ button[id="add"]{ &:active {background-color: @color_positive_action_active !important;} } -/* ######################################################################################## - * - * Button mit Bildern - * - ######################################################################################## */ -button.et2_button_with_image{ - .Complete_Button_text_icon_before; - background-repeat: no-repeat !important; - background-position: 6px center; - background-size: 20px auto; - -} + /*Button Ende #######################################################*/ diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index 156a0220417cf99e9ba6991c2a644a344072251f..67a56a02a480e6b56ce9371fbfbf80a1686ff74e 100755 GIT binary patch delta 85 zcmdmK(rCJ&Qo3{b$OuMYrXwFRXB diff --git a/pixelegg/less/layout_loginPage.css b/pixelegg/less/layout_loginPage.css index 26d11d9bc1..7ea994ab9b 100644 --- a/pixelegg/less/layout_loginPage.css +++ b/pixelegg/less/layout_loginPage.css @@ -175,30 +175,8 @@ margin: 0 auto; background-color: transparent; } -#wrap img.bgfade { - position: absolute; - top: -22%; - left: 0%; - /*display:block;*/ - z-index: -1; - width: 20%; -} -#wrap div.animation_login { - background-image: url(../../images/about.svg), url(../../images/accounts.svg), url(../../images/alarm.svg); - background-position: 20px -90px, 30px 80px, 0px 0px; - background-repeat: no-repeat, no-repeat, repeat-x; - animation: animatedLogin 4s linear infinite; - height: 190px; - overflow: hidden; - width: 560px; -} -@keyframes animatedLogin { - from { - background-position: 20px 20px, 30px 80px, 0 0; - } - to { - background-position: 300px -90px, 30px 20px, 100% 0; - } +#wrap .animation_login { + margin-top: 3em; } #wrap img[src$="svg"], #wrap background-image[url$="svg"] { @@ -212,6 +190,7 @@ background-image: linear-gradient(top, #679fd2, #679fd2); background-repeat: repeat-x; } +/*4 Bilder*/ #img1, #img2, #img3, @@ -219,42 +198,31 @@ width: 100%; height: 100%; position: fixed; - top: 0; + top: 10em; z-index: -1; animation-name: test; - animation-duration: 5s; + animation-duration: 8s; + animation-iteration-count: infinite; + -webkit-animation-name: test; + -webkit-animation-duration: 8s; + -webkit-animation-iteration-count: infinite; opacity: 0; } +#img1 { + animation-delay: 0s; + -webkit-animation-delay: 0s; +} #img2 { - animation-delay: 5s; - -webkit-animation-delay: 5s; + animation-delay: 8s; + -webkit-animation-delay: 8s; } #img3 { - animation-delay: 10s; - -webkit-animation-delay: 10s; + animation-delay: 16s; + -webkit-animation-delay: 16s; } #img4 { - animation-delay: 15s; - -webkit-animation-delay: 15s; -} -.animated { - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; - -ms-animation-fill-mode: both; - -o-animation-fill-mode: both; - animation-fill-mode: both; - -webkit-animation-duration: 3s; - -moz-animation-duration: 3s; - -ms-animation-duration: 3s; - -o-animation-duration: 3s; - animation-duration: 3s; -} -.animated.hinge { - -webkit-animation-duration: 2s; - -moz-animation-duration: 2s; - -ms-animation-duration: 2s; - -o-animation-duration: 2s; - animation-duration: 2s; + animation-delay: 24s; + -webkit-animation-delay: 24s; } @-webkit-keyframes test { 0% { @@ -263,6 +231,9 @@ 50% { opacity: 1; } + 100% { + opacity: 0; + } } @keyframes test { 0% { @@ -271,44 +242,7 @@ 50% { opacity: 1; } -} -@-webkit-keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; - } -} -@-moz-keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; - } -} -@-ms-keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; - } -} -@-o-keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; - } -} -@keyframes some-animation { - from { - width: 254px; - } - to { - width: 512px; + 100% { + opacity: 0; } } diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less index 7cc09f45a7..71819e8c84 100644 --- a/pixelegg/less/layout_loginPage.less +++ b/pixelegg/less/layout_loginPage.less @@ -161,42 +161,10 @@ margin: 0 auto; background-color:transparent; - - img.bgfade{ - position:absolute; - top:-22%; - left: 0%; - /*display:block;*/ - z-index:-1; - width: 20%; - - - - } - - - - div.animation_login{ - - background-image: url(../../images/about.svg), url(../../images/accounts.svg), url(../../images/alarm.svg); - background-position: 20px -90px, 30px 80px, 0px 0px; - background-repeat: no-repeat, no-repeat, repeat-x; - - animation: animatedLogin 4s linear infinite; - - - height: 190px; - overflow: hidden; - width: 560px; - + .animation_login{ + margin-top: 3em; } - @keyframes animatedLogin { - from { background-position: 20px 20px, 30px 80px, 0 0; } - to { background-position: 300px -90px, 30px 20px, 100% 0; } -} - - img[src$="svg"], background-image[url$="svg"]{ .gradient_vertical (@egw_color_2_e, @egw_color_2_e); @@ -204,49 +172,45 @@ } - + /*4 Bilder*/ #img1, #img2, #img3, #img4 { width:100%; height:100%; position:fixed; - top: 0; + top: 10em; z-index:-1; + animation-name: test; - animation-duration: 5s; + animation-duration: 8s; + animation-iteration-count: infinite; + + -webkit-animation-name: test; + -webkit-animation-duration: 8s; + -webkit-animation-iteration-count: infinite; + opacity:0; } + #img1 { + animation-delay:0s; + -webkit-animation-delay:0s + } + #img2 { - animation-delay:5s; - -webkit-animation-delay:5s + animation-delay:8s; + -webkit-animation-delay:8s } #img3 { - animation-delay:10s; - -webkit-animation-delay:10s + animation-delay:16s; + -webkit-animation-delay:16s } #img4 { - animation-delay:15s; - -webkit-animation-delay:15s - } - .animated { - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; - -ms-animation-fill-mode: both; - -o-animation-fill-mode: both; - animation-fill-mode: both; - -webkit-animation-duration: 3s; - -moz-animation-duration: 3s; - -ms-animation-duration: 3s; - -o-animation-duration: 3s; - animation-duration: 3s; - } - .animated.hinge { - -webkit-animation-duration: 2s; - -moz-animation-duration: 2s; - -ms-animation-duration: 2s; - -o-animation-duration: 2s; - animation-duration: 2s; + animation-delay:24s; + -webkit-animation-delay:24s } + + + @-webkit-keyframes test { 0% { opacity: 0; @@ -255,8 +219,10 @@ opacity: 1; } 100% { + opacity: 0; } } + @keyframes test { 0% { opacity: 0; @@ -265,18 +231,10 @@ opacity: 1; } 100% { + opacity: 0; } } - .mixi-frames () { - from {width: 254px;} - to {width: 512px;} -} - @-webkit-keyframes some-animation {.mixi-frames;} - @-moz-keyframes some-animation {.mixi-frames;} - @-ms-keyframes some-animation {.mixi-frames;} - @-o-keyframes some-animation {.mixi-frames;} - @keyframes some-animation {.mixi-frames;} diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 1e1efe77d3..c321860b1c 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -92,15 +92,18 @@ /*.Button_size_square_32;*/ padding: 0.3em 0.4em; .Complete_Button_normal; + background-color: @gray_20; - &:hover{.Complete_Button_hover;.color_100_gray;} + &:hover{.Complete_Button_hover; .color_100_gray;} &:active {.Complete_Button_active;} .transition (0.2s, ease-out); a { .color_100_gray; text-decoration: none; + .dimension_height_s; + font-size: 1.1em; &:hover { .color_50_gray; @@ -125,7 +128,7 @@ content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; - .dimension_width_height_s; + .dimension_width_height_xs; } } @@ -139,7 +142,7 @@ content: ""; background-image: url(../images/topmenu_items/setup.png); background-repeat: no-repeat; - .dimension_width_height_s; + .dimension_width_height_xs; } } @@ -149,7 +152,7 @@ padding-right: 20px; content: ""; background-repeat: no-repeat; - .dimension_width_height_s; + .dimension_width_height_xs; background-image: url(../images/topmenu_items/access.png); } } @@ -160,7 +163,7 @@ padding-right: 20px; content: ""; background-repeat: no-repeat; - .dimension_width_height_s; + .dimension_width_height_xs; } } /*password*/ @@ -170,7 +173,7 @@ padding-right: 20px; content: ""; background-repeat: no-repeat; - .dimension_width_height_s; + .dimension_width_height_xs; } } /*help*/ @@ -180,7 +183,7 @@ padding-right: 20px; content: ""; background-repeat: no-repeat; - .dimension_width_height_s; + .dimension_width_height_xs; } } /*Search*/ @@ -190,7 +193,7 @@ padding-right: 20px; content: ""; background-repeat: no-repeat; - .dimension_width_height_s; + .dimension_width_height_xs; } } /*logout*/ @@ -551,6 +554,7 @@ h1 { margin: 0 0 10px 0; padding-top: 0.31em; + padding-left: 3em; .color_40_gray; } } @@ -682,7 +686,7 @@ color: #FFF; - img {height: 16px; width: 16px;} + img {.dimension_width_height_s;} } a:hover { @@ -716,11 +720,17 @@ .dimension_height_m; padding-left: 0; - padding-right: 10px; + padding-right: 0px; float: left; /*filter grey*/ - .img_filter_gray + .img_filter_gray; + +/* path {color: red} + + svg:hover path {fill: red;} + + filter: hue-rotate(90deg);*/ } } diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less index d76f0bbc89..858d31742c 100755 --- a/pixelegg/less/layout_table.less +++ b/pixelegg/less/layout_table.less @@ -31,7 +31,7 @@ table.et2_grid { .innerContainer{ - overflow:auto; + /*overflow:auto;*/ /*padding: 0;*/ } // Table Head in Listen diff --git a/pixelegg/templates/pixelegg/login.tpl b/pixelegg/templates/pixelegg/login.tpl index 5a5ff1141c..d7f30ec0a2 100644 --- a/pixelegg/templates/pixelegg/login.tpl +++ b/pixelegg/templates/pixelegg/login.tpl @@ -20,7 +20,7 @@ - + @@ -71,9 +71,10 @@
-