diff --git a/pixelegg/changelog.txt b/pixelegg/changelog.txt index 1d3e4b847b..b3c4ee1382 100755 --- a/pixelegg/changelog.txt +++ b/pixelegg/changelog.txt @@ -62,4 +62,9 @@ Dateimanager - still working on it Calendar -> still working on it -/* 20.12.2013 ***************** */ \ No newline at end of file +/* 27.12.2013 ***************** */ +Fix Headernavigation Img before +Fix Sidemenu Rollover Effekts +Fix Dateimanager Menu + +NEW: Transition Effekt \ No newline at end of file diff --git a/pixelegg/content-element-library/index_navigation_left.html b/pixelegg/content-element-library/index_navigation_left.html index 6e746cd22d..76bdeba981 100755 Binary files a/pixelegg/content-element-library/index_navigation_left.html and b/pixelegg/content-element-library/index_navigation_left.html differ diff --git a/pixelegg/content-element-library/jquery_ui_dialog.html b/pixelegg/content-element-library/jquery_ui_dialog.html index b7c8be7fbe..4e616d1e3b 100755 --- a/pixelegg/content-element-library/jquery_ui_dialog.html +++ b/pixelegg/content-element-library/jquery_ui_dialog.html @@ -81,6 +81,9 @@ Author: Stefan Reinhardt (c) pixelegg
+ + + diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index ab02596584..8f445be05d 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1309,10 +1309,31 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button { * Button widget - text only, and icon */ .et2_button { - cursor: pointer; + /* cursor: pointer; text-align: center; - font-size: 9pt; - text-shadow: 0px 0px; + + font-size: 9pt;*/ + text-shadow: 0px 0px !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); + 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; } /*in Nextmatch definiert*/ .et2_button_icon { @@ -1323,22 +1344,35 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button { } button.et2_button_text:hover, input[type=button]:hover { - color: #1e1e1e; - border: 1px solid #cdcdcd; - background-color: #b4b4b4; + /*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; } button.et2_button_text:active, input[type=button]:active { - /*background-image: none !important;*/ - background-color: #828282; - color: #ffffff; + -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.et2_button_text:focus, - input[type=button]:focus { - border: 1px solid #9b9b9b; - color: #ffffff; + /*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 */ @@ -1704,9 +1738,9 @@ action buttons, left aligned for "extra" controls } .et2_link_to .et2_button_icon:hover { background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -1790,22 +1824,11 @@ action buttons, left aligned for "extra" controls padding: 4px; cursor: pointer; font-size: 0.8em; - -webkit-border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 0; - -webkit-border-bottom-left-radius: 0; - -webkit-border-top-left-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 0; - -moz-border-radius-bottomleft: 0; - -moz-border-radius-topleft: 3px; - border-top-right-radius: 3px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 3px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.border_radius(3px,0,0,3px);*/ background-color: #bfbfbf; + -webkit-box-shadow: inset 1px 0px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: inset 1px 0px 0px rgba(0, 0, 0, 0.5); + box-shadow: inset 1px 0px 0px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); @@ -1885,9 +1908,7 @@ action buttons, left aligned for "extra" controls border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ } .invalid { border: 1px solid #a6261d; @@ -2050,9 +2071,7 @@ action buttons, left aligned for "extra" controls border-bottom-right-radius: 3px; border-bottom-left-radius: 0px; border-top-left-radius: 0px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ } .nextmatch_header > .filters .et2_label { /* font-size: 0.9em;*/ @@ -2070,9 +2089,9 @@ action buttons, left aligned for "extra" controls /*Dialog - Addressbook - View */ } .nextmatch_header > .filters .et2_label select:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } .nextmatch_header > .filters .et2_label select #infolog-index_cat_id, .nextmatch_header > .filters .et2_label select #infolog-index_filter { @@ -2118,9 +2137,9 @@ action buttons, left aligned for "extra" controls overflow: hidden; } .nextmatch_header > .filters button.et2_button:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); /* .Complete_Button_search_action_hover;*/ background-color: #679fd2 !important; /*hide arrow*/ @@ -2155,9 +2174,9 @@ action buttons, left aligned for "extra" controls border-radius: 3px; } .nextmatch_header > .filters input:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } .nextmatch_header > .filters input:focus { outline: 0; @@ -2186,9 +2205,9 @@ action buttons, left aligned for "extra" controls } .nextmatch_header > .filters .et2_button_icon:hover { background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -2245,9 +2264,9 @@ action buttons, left aligned for "extra" controls #admin-categories-index_add:hover { background-color: #66a1d2 !important; color: #ffc200; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); -webkit-border-radius: 3px; -webkit-border-top-left-radius: 20px; -moz-border-radius: 3px; @@ -2374,7 +2393,7 @@ action buttons, left aligned for "extra" controls .sidebox-favorites ul.favorites li { padding-left: 0 !important; margin-left: 0px; - line-height: 1.5em; + line-height: 2.5em; } .sidebox-favorites ul.favorites li img { margin: 0px 5px; @@ -2410,9 +2429,9 @@ action buttons, left aligned for "extra" controls .sidebox-favorites ul.favorites li img.sideboxstar:hover { height: 16px; background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -2440,9 +2459,9 @@ action buttons, left aligned for "extra" controls } .sidebox-favorites .ui-menu-icons .ui-menu-item a:hover { background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -2856,7 +2875,7 @@ option:checked { /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf', GradientType=0) !important; /* IE6-9 */ - /*border-color: @gray-10;*/ + /*border-color: @gray_10;*/ color: #000000; font-weight: bold; background-image: none; @@ -2981,15 +3000,15 @@ option:checked { .ui-icon-close:hover { background-color: #b4b4b4; color: #1e1e1e; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } .ui-icon-close: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; - background-color: #ffff4d !important; + background-color: #fecc44 !important; } span.ui-icon-close { margin-top: 0px; @@ -3008,15 +3027,15 @@ span.ui-icon-close { .ui-icon-closethick:hover { background-color: #e6e6e6; color: #1e1e1e; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } .ui-icon-closethick: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; - background-color: #ffff4d !important; + background-color: #fecc44 !important; } span.ui-icon-search { background-image: url(../images/search.png) !important; @@ -3050,6 +3069,18 @@ 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-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-repeat: no-repeat !important; @@ -3310,7 +3341,7 @@ span.ui-icon-search { * * et2 Messages * - * Please do NOT change css-files directly, instead change less-files and compile them! + * Please do NOT change css_files directly, instead change less-files and compile them! * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License @@ -3360,9 +3391,9 @@ span.ui-icon-search { border-radius: 3px; } .chzn-container-active .chzn-choices li.search-field input:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } .chzn-container-active .chzn-choices li.search-field input:focus { outline: 0; @@ -3503,9 +3534,9 @@ input { font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, Verdana, sans-serif !important; } input:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } input:focus { outline: 0; @@ -3525,9 +3556,9 @@ select { border-radius: 4px; } select:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } select:focus { outline: 0; @@ -3538,6 +3569,12 @@ select:focus { -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); } +:hover { + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + -o-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; +} p { font-size: 12px; } @@ -3579,32 +3616,29 @@ h6 { select { position: relative; } -select:after { - content: '<>'; - font: 11px "Consolas", monospace; - color: #aaa; - -webkit-transform: rotate(90deg); - -moz-transform: rotate(90deg); - -ms-transform: rotate(90deg); - transform: rotate(90deg); - right: 8px; - top: 2px; - padding: 0 0 2px; - border-bottom: 1px solid #ddd; - position: absolute; - pointer-events: none; +/*select:after { + content:'<>'; + font:11px "Consolas", monospace; + color:#aaa; + -webkit-transform:rotate(90deg); + -moz-transform:rotate(90deg); + -ms-transform:rotate(90deg); + transform:rotate(90deg); + right:8px; top:2px; + padding:0 0 2px; + border-bottom:1px solid #ddd; + position:absolute; + pointer-events:none; } select:before { - content: ''; - right: 6px; - top: 0px; - width: 20px; - height: 20px; - background: #f8f8f8; - position: absolute; - pointer-events: none; - display: block; -} + content:''; + right:6px; top:0px; + width:20px; height:20px; + background:#f8f8f8; + position:absolute; + pointer-events:none; + display:block; +}*/ div.selectbox-wrapper ul { list-style-type: none; margin: 0px; @@ -3644,9 +3678,9 @@ div.selectbox-wrapper ul li { width: 10em; } .sbHolder:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } .sbHolder:focus { outline: 0; @@ -4127,43 +4161,6 @@ a.textSidebox { # # # # ############################*/ -button { - 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: 1s; - -moz-transition-duration: 1s; - -o-transition-duration: 1s; - transition-duration: 1s; - -webkit-transition-timing-function: linear; - -moz-transition-timing-function: linear; - -o-transition-timing-function: linear; - transition-timing-function: linear; - - -} -button:hover { - background-color: #b4b4b4; - color: #1e1e1e; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); -} -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 löschen / delete / => color-negative-action @@ -4184,6 +4181,18 @@ 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-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-repeat: no-repeat !important; @@ -4191,7 +4200,7 @@ button[id="addressbook-edit_button[delete]"] { width: auto; height: 32px; /*background-color: @color-negative-action !important;*/ - /*color: @gray-100 !important;*/ + /*color: @gray_100 !important;*/ } input[type="submit"][id="delete"]:hover, input[type="button"][id="delete"]:hover, @@ -4199,7 +4208,7 @@ button[id="delete"]:hover, button[id="infolog-edit_button[delete]"]:hover, button[id="addressbook-edit_button[delete]"]:hover { background-image: url('../images/delete-hover.png') !important; - background-color: #ff0a0a !important; + background-color: #b81f00 !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); @@ -4208,6 +4217,18 @@ 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-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-repeat: no-repeat !important; @@ -4222,7 +4243,7 @@ button[id="delete"]:active, button[id="infolog-edit_button[delete]"]:active, button[id="addressbook-edit_button[delete]"]:active { background-image: url('../images/delete-hover.png') !important; - background-color: #ff3333 !important; + background-color: #e12500 !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); @@ -4231,6 +4252,18 @@ 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-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-repeat: no-repeat !important; @@ -4245,19 +4278,19 @@ button[id="addressbook-edit_button[delete]"]:active { * ######################################################################################## */ button[id*="save"]:active { - background-color: #00b500; + background-color: #1aa200; } button[id*="apply"]:active { - background-color: #00b500; + background-color: #1aa200; } button[id*="copy"]:active { - background-color: #00b500; + background-color: #1aa200; } button[id*="edit_button[edit]"]:active { - background-color: #00b500; + background-color: #1aa200; } button#filemanager-select_button[ok]:active { - background-color: #00b500; + background-color: #1aa200; } /*ui-widget*/ /*edit series*/ @@ -4271,6 +4304,18 @@ 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-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-repeat: no-repeat !important; @@ -4282,7 +4327,7 @@ button#series:hover { background-image: url('../images/edit.png') !important; } button#series:active { - background-color: #00b500 !important; + background-color: #1aa200 !important; } /*edit exception*/ button#exception { @@ -4295,6 +4340,18 @@ 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-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-repeat: no-repeat !important; @@ -4306,7 +4363,7 @@ button#exception:hover { background-image: url('../images/edit.png') !important; } button#exception:active { - background-color: #00b500 !important; + background-color: #1aa200 !important; } /*calendar series add*/ #calendar-edit_add { @@ -4314,15 +4371,15 @@ button#exception:active { &:hover {.Complete_Button_add_hover;} */ } #calendar-edit_add:active { - background-color: #00b500 !important; + background-color: #1aa200 !important; } /*calendar search freetime*/ #calendar-edit_freetime:active { - background-color: #00b500 !important; + background-color: #1aa200 !important; } /*calendar search freetime*/ button[id*="edit_button[add_alarm]"]:active { - background-color: #00b500 !important; + background-color: #1aa200 !important; } /* ######################################################################################## * @@ -4331,16 +4388,16 @@ button[id*="edit_button[add_alarm]"]:active { ######################################################################################## */ button[id*="cancel"]:hover, button#cancel:hover { - background-color: #ffff00 !important; + background-color: #f5b301 !important; color: #000000; } button[id*="cancel"]:active, button#cancel:active { - background-color: #ffff4d !important; + background-color: #fecc44 !important; color: #373737; } /* et2_box_widget ###*/ -/*div.et2_box_widget .et2_button_text:last-child,*/ +/*div.et2_box_widget .et2_button_text:last_child,*/ button[id="cancel"] { background-image: url('../images/cancel.png') !important; border: 1px solid rgba(0, 0, 0, 0.15); @@ -4351,6 +4408,18 @@ 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-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-repeat: no-repeat !important; @@ -4360,13 +4429,13 @@ button[id="cancel"] { content: "ID missing"; } button[id="cancel"]:hover { - background-color: #ffff00 !important; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + background-color: #f5b301 !important; + -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); } button[id="cancel"]:active { - background-color: #ffff4d !important; + background-color: #fecc44 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -4405,6 +4474,18 @@ 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-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-repeat: no-repeat !important; @@ -4413,7 +4494,7 @@ button[id="add"] { height: 32px; } button[id="add"]:active { - background-color: #00b500 !important; + background-color: #1aa200 !important; } /* ######################################################################################## * @@ -4429,6 +4510,18 @@ button.et2_button_with_image { -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; @@ -4738,9 +4831,7 @@ table.egwGridView_grid span.arrow.loading { border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; border-top-left-radius: 25px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ border-top: solid 1px #0c5da5; border-left: solid 1px #0c5da5; border-right: solid 1px #0c5da5; @@ -4799,9 +4890,9 @@ table.egwGridView_grid span.arrow.loading { cursor: pointer; } #loginMainDiv div#centerBox form table.divLoginbox select:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } #loginMainDiv div#centerBox form table.divLoginbox input { border: 1px solid rgba(0, 0, 0, 0.15); @@ -4816,9 +4907,9 @@ table.egwGridView_grid span.arrow.loading { border-radius: 3px; } #loginMainDiv div#centerBox form table.divLoginbox input:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } #loginMainDiv div#centerBox form table.divLoginbox input:focus { outline: 0; @@ -4984,11 +5075,13 @@ img { #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items { float: left; padding-top: 10px; + width: 70%; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul { /*Home*/ - /*Setup*/ - /*access*/ + /*home*/ + /*Setup / Einstellungen*/ + /*access / Zugriff */ /*category*/ /*password*/ /*help*/ @@ -4996,8 +5089,7 @@ img { /*logout*/ } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li { - width: 32px; - height: 32px; + /*.Button_size_square_32;*/ padding: 0.3em 0.4em; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -5007,11 +5099,27 @@ img { -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; + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + -o-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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: inherit !important; color: #000000; } @@ -5035,51 +5143,73 @@ img { #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child :before { border: none; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child a:before { - padding-right: 5px; - content: url(../images/topmenu_items/home.png); +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home { + margin-left: 0px; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before { + padding-right: 20px; + content: " "; + background-image: url(../images/topmenu_items/home.png); + background-repeat: no-repeat; width: 16px; height: 16px; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(2) a:before { - padding-right: 5px; - content: url(../images/topmenu_items/setup.png); +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_prefs { + margin-left: 0px; +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_prefs:before { + padding-right: 20px; + content: ""; + background-image: url(../images/topmenu_items/setup.png); + background-repeat: no-repeat; width: 16px; height: 16px; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(3) a:before { - padding-right: 5px; - content: url(../images/topmenu_items/access.png); +#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; + background-image: url(../images/topmenu_items/access.png); +} +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_cats:before { + background-image: url(../images/topmenu_items/category.png); + padding-right: 20px; + content: ""; + background-repeat: no-repeat; width: 16px; height: 16px; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(4) a:before { - padding-right: 5px; - content: url(../images/topmenu_items/category.png); +#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; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(5) a:before { - padding-right: 5px; - content: url(../images/topmenu_items/password.png); +#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; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(6) a:before { - padding-right: 5px; - content: url(../images/topmenu_items/help.png); +#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; } -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(7) a:before { - padding-right: 5px; - content: url(../images/topmenu_items/search.png); - width: 16px; - height: 16px; -} -#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(8) a:before { - padding-right: 5px; - content: url(../images/topmenu_items/logout.png); +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_logout:before { + background-image: url(../images/topmenu_items/logout.png); + padding-right: 20px; + content: ""; + background-repeat: no-repeat; width: 16px; height: 16px; } @@ -5127,61 +5257,71 @@ img { Add / Print / Logout / - Name / Date ###################################################*/ +#egw_fw_topmenu_addons { + /*hover*/ +} #egw_fw_topmenu_addons span#quick_add { - background-color: #0b5fa4 !important; - color: #FFF; - text-shadow: none; - /* height: auto;*/ - background-image: none !important; - -webkit-border-radius: 3px; - -webkit-border-top-left-radius: 20px; - -moz-border-radius: 3px; - -moz-border-radius-topleft: 20px; - border-radius: 3px; - border-top-left-radius: 20px; - position: fixed; - right: 88px; - top: 0; - z-index: 200; - padding: 5px 0.8em 6px 0.5em; -} -#egw_fw_topmenu_addons span#quick_add:before { - content: "+"; - font-size: 1.5em; - color: #ffc200; - line-height: 1.1em; -} -#egw_fw_topmenu_addons span#quick_add:before { - content: "+"; - font-size: 1.5em; - color: #ffc200; - line-height: 1.1em; -} -#egw_fw_topmenu_addons span#quick_add select#quick_add_selectbox { + /*.Complete_Button_add;*/ + width: 16px; + height: 16px; 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); - height: 26px; - padding: 0 0 0 10px; - font-size: 0.9em; - line-height: 1.1em; - /* option { - &:first-child{ - &:before {content: "+";font-size: 2em;color: @egw_color_1;} - - }*/ + float: right; + position: fixed; + right: 83px; + top: 5px; + padding: 0.5em; + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + -o-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; } -#egw_fw_topmenu_addons span#quick_add select#quick_add_selectbox:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); +#egw_fw_topmenu_addons span#quick_add:before { + content: "+"; + font-size: 2em; + color: #ffc200; + line-height: 0.6em; } -#egw_fw_topmenu_addons span#quick_add select#quick_add_selectbox:focus { +#egw_fw_topmenu_addons span#quick_add:focus { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); } +#egw_fw_topmenu_addons span#quick_add select#quick_add_selectbox { + position: fixed; + right: 83px; + /*.border_normal;*/ + /*.box_shadow_standard_light;*/ + /*height: 26px;*/ + padding: 0 0 0 10px; + font-size: 0.9em; + /*line-height: 1.1em;*/ + visibility: hidden; + transition-property: visibility; + transition-duration: 0s; + transition-timing-function: linear; + transition-delay: 0s; +} +#egw_fw_topmenu_addons span#quick_add:hover { + width: 166px !important; + -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); +} +#egw_fw_topmenu_addons span#quick_add:hover select#quick_add_selectbox { + /*.box_shadow_standard_light_hover;*/ + -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); + -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); + box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); + border: none; + position: relative !important; + right: 1px !important; + top: -5px; + z-index: 200; + visibility: visible !important; +} #egw_fw_logout { background-image: url(../images/logout.png); background-size: 16px 16px; @@ -5205,9 +5345,9 @@ img { right: 5px; } #egw_fw_logout:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } #egw_fw_logout:active { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -5242,9 +5382,9 @@ img { z-index: 200; } #egw_fw_print:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } #egw_fw_print:active { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -5286,9 +5426,9 @@ img { display: inline-block; } #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):focus { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -5374,9 +5514,7 @@ img { border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-top-left-radius: 27px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ border-top: solid 1px #b4b4b4; border-left: solid 1px #b4b4b4; border-right: solid 1px #b4b4b4; @@ -5396,9 +5534,9 @@ img { padding-top: 8px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); -webkit-border-top-right-radius: 5px; -webkit-border-bottom-right-radius: 0px; -webkit-border-bottom-left-radius: 0px; @@ -5411,9 +5549,7 @@ img { border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-top-left-radius: 27px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:active { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -5431,9 +5567,7 @@ img { border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-top-left-radius: 27px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:focus { background-image: url("../images/ajax-loader.gif"); @@ -5462,9 +5596,7 @@ img { border-bottom-right-radius: 0; border-bottom-left-radius: 27px; border-top-left-radius: 0; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ border-color: #b4b4b4; border-style: solid; border-width: 0px; @@ -5488,9 +5620,7 @@ img { border-bottom-right-radius: 0; border-bottom-left-radius: 27px; border-top-left-radius: 0; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ border-color: #b4b4b4; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content div.egw_fw_ui_category:nth-last-of-type(-n+3) { @@ -5508,16 +5638,15 @@ img { border-bottom-right-radius: 0; border-bottom-left-radius: 15px; border-top-left-radius: 0; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category { margin: 10px 5px 0px 5px; padding: 0.5em 1em; cursor: pointer; border-color: #b4b4b4; - background-color: #828282; + background-color: #e6e6e6; + /*background-color: @egw_color_2_d;*/ -webkit-border-top-right-radius: 3px; -webkit-border-bottom-right-radius: 3px; -webkit-border-bottom-left-radius: 3px; @@ -5530,9 +5659,7 @@ img { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category h1 { margin: 5px 0px 3px 5px; @@ -5568,9 +5695,7 @@ img { border-bottom-right-radius: 3px !important; border-bottom-left-radius: 3px !important; border-top-left-radius: 3px !important; - -moz-background-clip: padding-box !important; - -webkit-background-clip: padding-box !important; - background-clip: padding-box !important; + /*.background-clip(padding-box);*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 { background-image: url(../images/arrow_down.png); @@ -5587,11 +5712,18 @@ img { width: 200px; background-color: #f0f0f0; color: #808080; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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: inherit !important; } +#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active:hover { + background-color: #0c5da5; + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + -o-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; +} #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content_bottom { border-width: 0px 1px 1px 1px; } @@ -5649,11 +5781,10 @@ img { padding-left: 0px; padding-top: 14px; margin-right: 5px; - min-height: 50px; + /*min-height: 50px;*/ } .egw_fw_ui_category_content img { height: 16px; - width: 16px; vertical-align: middle; } .egw_fw_ui_category_content:hover { @@ -5662,7 +5793,6 @@ img { } .egw_fw_ui_category_content input#uical_select_owner_multiple { height: 16px; - width: 16px; vertical-align: middle; } .egw_fw_ui_category_content select#calendar_filter { @@ -5670,18 +5800,20 @@ img { } .egw_fw_ui_sidemenu_listitem { padding: 0.5em 0; - margin: 4px 0 5px 0px; + margin: 0px 0 5px 0px; position: relative; + min-height: 16px; + background-color: #ffffff; } .egw_fw_ui_sidemenu_listitem img.egw_fw_ui_sidemenu_listitem_icon { - height: 16px; width: 16px; + height: 16px; padding: 0px; margin: 0px 5px; float: left; /*.Complete_Button_Icon_normal;*/ background-image: url("../images/bullet.png"); - background-size: 16px 16px; + background-size: .dimension_width_height_s; background-position: center; /*&:hover {height: 16px; .Complete_Button_Icon_hover ;}*/ } @@ -5743,9 +5875,9 @@ img { .egw_fw_ui_sidemenu_listitem div a:nth-child(2):hover { background-color: #ff0000; background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -5896,9 +6028,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { border-bottom-right-radius: 0; border-bottom-left-radius: 0; border-top-left-radius: 5px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ /*.background-color-5-gray;*/ background: transparent; display: inline-block; @@ -6049,9 +6179,7 @@ div.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ } div.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input.hasDatepicker { background-image: url("../images/datepopup.png"); diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less index de0cb03151..40b96ab6fa 100644 --- a/pixelegg/css/pixelegg.less +++ b/pixelegg/css/pixelegg.less @@ -64,5 +64,6 @@ @import "../less/print.less"; // + // // \ No newline at end of file diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less index c1067fa03a..424e7fc1f1 100755 --- a/pixelegg/less/def_buttons.less +++ b/pixelegg/less/def_buttons.less @@ -25,7 +25,7 @@ .border_normal; .box_shadow_standard_light; .rounded (3px); - color: @gray-100; + color: @gray_100; -webkit-transition-property: background; -moz-transition-property: background; @@ -108,7 +108,7 @@ outline:0; border-width:1px; border-style: solid; - border-color: @gray-30; + border-color: @gray_30; -webkit-box-shadow: 0 0 2px 1px rgba(0,0,0, 0.10); -moz-box-shadow: 0 0 2px 1px rgba(0,0,0, 0.10); box-shadow: 0 0 2px 1px rgba(0,0,0, 0.10); @@ -121,7 +121,7 @@ .Complete_Button_input{ .border_normal; - border-color: @gray-30; + border-color: @gray_30; .box_shadow_standard_light; width: auto; /*margin: 0.5em 0em 0.5em 0;*/ @@ -140,7 +140,7 @@ outline:0; border-width:1px; border-style: solid; - border-color: @gray-30; + border-color: @gray_30; -webkit-box-shadow: 0 0 2px 1px rgba(0,0,0, 0.10); -moz-box-shadow: 0 0 2px 1px rgba(0,0,0, 0.10); box-shadow: 0 0 2px 1px rgba(0,0,0, 0.10); @@ -152,13 +152,13 @@ .Complete_Button_search_action{ .border_normal; - border-color: @gray-30; + border-color: @gray_30; .box_shadow_standard_light; width: 45px; height: 22px; .border_radius_button_righttop; - .background-color-search; + .background_color_search; color: lighten(@egw_color_1, 15%); text-decoration: none; @@ -189,8 +189,8 @@ .Complete_Button_text{ .border_radius_button_normal; - .background-color-10-gray; - border-color: @gray-50; + .background_color_10_gray; + border-color: @gray_50; cursor: pointer; } @@ -200,7 +200,7 @@ .border_hover; text-align: center; cursor: pointer; - .background-color-30-gray; + .background_color_30_gray; } .Complete_Button_text_active{ color: @gray; @@ -230,21 +230,21 @@ // Buttons nur Icon .Complete_Button_Icon_normal { - .background-color-10-gray; + .background_color_10_gray; .box_shadow_standard_light; .border_normal; .border_radius_button_normal; } .Complete_Button_Icon_hover { - .background-color-20-gray; + .background_color_20_gray; .box_shadow_standard_light_hover; .border_hover; .border_radius_button_normal; } .Complete_Button_Icon_active { - .background-color-30-gray; + .background_color_30_gray; .border_active; .border_radius_button_normal; .box_shadow_standard_light_inset; @@ -254,16 +254,16 @@ // Button Sub Menupunkte .Complete_Button_Module_Menu_Links{ - .background-color-10-gray; + .background_color_10_gray; } .Complete_Button_Module_Menu_Links_Hover{ - .background-color-30-gray; - .color-5-gray; + .background_color_30_gray; + .color_5_gray; } .Complete_Button_Module_Menu_Links_active{ - .background-color-10-gray; + .background_color_10_gray; } @@ -274,7 +274,7 @@ padding-top: 0px; padding-bottom: 5px; .border_normal; - .background-color-15-gray; + .background_color_15_gray; } .Complete_Button_Module_Menu_Links_Sub { @@ -283,7 +283,7 @@ padding-bottom: 5px; .border_normal; border-top-width: 0px; - .background-color-10-gray; + .background_color_10_gray; margin-top: -7px; padding-left: 14px; diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less index 0aa3a0e4b9..0ad1165d78 100755 --- a/pixelegg/less/def_design_pattern_color_font_shadow.less +++ b/pixelegg/less/def_design_pattern_color_font_shadow.less @@ -50,88 +50,93 @@ //Berechnung der EGW Farben -.background-color-egw-normal {background-color : @egw_color_1_a !important;} -.background-color-egw-light {background-color : @egw_color_1_d;} -.background-color-egw-lighter {background-color : @egw_color_1_e;} -.background-color-egw-dark {background-color : @egw_color_2_a;} -.background-color-egw-darker {background-color : @egw_color_2_b;} +.background_color_egw_normal {background-color : @egw_color_1_a !important;} +.background_color_egw_light {background-color : @egw_color_1_d;} +.background_color_egw_lighter {background-color : @egw_color_1_e;} +.background_color_egw_dark {background-color : @egw_color_2_a;} +.background_color_egw_darker {background-color : @egw_color_2_b;} // greyscale @gray : #000000; // Base colur is black /*@gray-100 : #000000;*/ -@gray-100 : #000000; -@gray-90 : #1E1E1E; -@gray-80 : #373737; -@gray-70 : #505050; -@gray-60 : #696969; -@gray-50 : #828282; -@gray-40 : #9B9B9B; -@gray-30 : #B4B4B4; -@gray-20 : #CDCDCD; -@gray-10 : #E6E6E6; -@gray-0 : #FFFFFF; +@gray_100 : #000000; +@gray_90 : #1E1E1E; +@gray_80 : #373737; +@gray_70 : #505050; +@gray_60 : #696969; +@gray_50 : #828282; +@gray_40 : #9B9B9B; +@gray_30 : #B4B4B4; +@gray_20 : #CDCDCD; +@gray_10 : #E6E6E6; +@gray_0 : #FFFFFF; -.color-0-gray { color : lighten(@gray, 100%);} // white +.color_0_gray { color : lighten(@gray, 100%);} // white -.color-5-gray { color : lighten(@gray, 95%);} -.color-10-gray { color : lighten(@gray, 90%);} -.color-15-gray { color : lighten(@gray, 85%);} -.color-20-gray { color : lighten(@gray, 80%);} -.color-25-gray { color : lighten(@gray, 75%);} -.color-30-gray { color : lighten(@gray, 70%);} -.color-40-gray { color : lighten(@gray, 60%);} -.color-50-gray { color : lighten(@gray, 50%);} -.color-60-gray { color : lighten(@gray, 40%);} -.color-70-gray { color : lighten(@gray, 30%);} -.color-80-gray { color : lighten(@gray, 20%);} -.color-90-gray { color : lighten(@gray, 10%);} -.color-100-gray { color : @gray; } // black +.color_5_gray { color : lighten(@gray, 95%);} +.color_10_gray { color : lighten(@gray, 90%);} +.color_15_gray { color : lighten(@gray, 85%);} +.color_20_gray { color : lighten(@gray, 80%);} +.color_25_gray { color : lighten(@gray, 75%);} +.color_30_gray { color : lighten(@gray, 70%);} +.color_40_gray { color : lighten(@gray, 60%);} +.color_50_gray { color : lighten(@gray, 50%);} +.color_60_gray { color : lighten(@gray, 40%);} +.color_70_gray { color : lighten(@gray, 30%);} +.color_80_gray { color : lighten(@gray, 20%);} +.color_90_gray { color : lighten(@gray, 10%);} +.color_100_gray { color : @gray; } // black @lightgray : @gray*010101; -/*@darkgrey : .color-90-gray;*/ +/*@darkgrey : .color_90_gray;*/ // grey fpr background -.background-color-0-gray { background-color : lighten(@gray, 100%);} -.background-color-5-gray { background-color : lighten(@gray, 98%); } -.background-color-10-gray { background-color : lighten(@gray, 94%); } -.background-color-15-gray { background-color : lighten(@gray, 85%); } -.background-color-20-gray { background-color : lighten(@gray, 80%); } -.background-color-25-gray { background-color : lighten(@gray, 75%); } -.background-color-30-gray { background-color : lighten(@gray, 70%) !important; } -.background-color-40-gray { background-color : lighten(@gray, 60%); } -.background-color-50-gray { background-color : lighten(@gray, 50%); } +.background_color_0_gray { background-color : lighten(@gray, 100%);} +.background_color_5_gray { background-color : lighten(@gray, 98%); } +.background_color_10_gray { background-color : lighten(@gray, 94%); } +.background_color_15_gray { background-color : lighten(@gray, 85%); } +.background_color_20_gray { background-color : lighten(@gray, 80%); } +.background_color_25_gray { background-color : lighten(@gray, 75%); } +.background_color_30_gray { background-color : lighten(@gray, 70%) !important; } +.background_color_40_gray { background-color : lighten(@gray, 60%); } +.background_color_50_gray { background-color : lighten(@gray, 50%); } // Warning @red: #FF0000; -@color-warning : @red; +@color_warning : @red; + + +// ERROR +@color_error : #AE1D00; + // Test Colour for debug @yellow : #FFD40F; // Link Colours -@link-color : #000000; -@link-color-active: @link-color*010101; +@link_color : #000000; +@link_color_active: @link_color*010101; // soll EGROUPWARE FARBE GEBEN /*@active_button_border_bottom : @egw_color_2_d;*/ // Hint / or have to do / must field -@color-hint : @egw_color_1_a; +@color_hint : @egw_color_1_a; /*optional / can field*/ -@color-optional : lighten(@egw_color_1_a, 25%); +@color_optional : lighten(@egw_color_1_a, 25%); /*Listenausgabe*/ -@color-even : @gray-0; -@color-odd : darken(@gray-0, 8%); +@color_even : @gray_0; +@color_odd : darken(@gray_0, 8%); // aktiverte Zeilen in allen APP mit Listenausgabe @@ -148,31 +153,31 @@ /*Button edit + save + apply + copy = positive action */ -@color-positive-action : #00AB00; // green -@color-positive-action-hover : fade(#00AB00, 2%); // green -@color-positive-action-active : lighten(#00AB00, 2%); // green +@color_positive_action : #189800; // green +@color_positive_action_hover : fade(#189800, 2%); // green +@color_positive_action_active : lighten(#189800, 2%); // green /*Button cancel = do nothing action */ -@color-cancel-action : yellow; -@color-cancel-action-hover : lighten(yellow, 0%); -@color-cancel-action-active : lighten(yellow, 15%); +@color_cancel_action : #F5B301; +@color_cancel_action_hover : lighten(#F5B301, 0%); +@color_cancel_action_active : lighten(#F5B301, 15%); /*Button delete = negative action */ -@color-negative-action : red; -@color-negative-action-hover : lighten(red, 2%); -@color-negative-action-active : lighten(red, 10%); +@color_negative_action : #AE1D00; +@color_negative_action_hover : lighten(#AE1D00, 2%); +@color_negative_action_active : lighten(#AE1D00, 10%); // Search Button -.background-color-search {background-color : lighten(@egw_color_1, 15%); } +.background_color_search {background-color : lighten(@egw_color_1, 15%); } // cal Heute -.background-table-cal-head { background-color : @egw_color_1_a;} +.background_table_cal_head { background-color : @egw_color_1_a;} -@color-progress : @egw_color_1_e; +@color_progress : @egw_color_1_e; /*#####################################################################*/ // Schriften @@ -214,6 +219,16 @@ // Box Shadow +// none +.box_shadow_none { + -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); + -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); + box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); +} + + + + // auf hellem Hintergrund .box_shadow_standard_light { @@ -226,9 +241,9 @@ // wird dunkler .box_shadow_standard_light_hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); // -webkit-box-shadow: none; // -moz-box-shadow: none; // box-shadow:none; @@ -432,7 +447,18 @@ # N x 32 # ############################*/ -.dimension_height_xl{ height: 32px; } +.dimension_height_xl{ height: 40px; } + + +/* ########################## + # large Button # + # # + # # + # # + # N x 32 # + ############################*/ + +.dimension_height_l{ height: 32px; } /* ########################## # medium Button # @@ -494,7 +520,7 @@ @start); filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@stop,@start)); } -.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) { +.bw_gradient(@color: #F5F5F5, @start: 0, @stop: 255) { background: @color, -webkit-gradient(linear, left bottom, @@ -517,7 +543,7 @@ border-right: solid 1px @right-color; border-bottom: solid 1px @bottom-color; } -.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @r:0, @g:0, @b:0, @alpha: 0.1, @inset:inset) { +.drop_shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @r:0, @g:0, @b:0, @alpha: 0.1, @inset:inset) { -webkit-box-shadow: @x-axis @y-axis @blur rgba(@r, @g, @b, @alpha) @inset; -moz-box-shadow: @x-axis @y-axis @blur rgba(@r, @g, @b, @alpha) @inset; box-shadow: @x-axis @y-axis @blur rgba(@r, @g, @b, @alpha) @inset; @@ -527,7 +553,7 @@ -moz-border-radius: @radius; border-radius: @radius; } -.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) { +.border_radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) { -webkit-border-top-right-radius: @topright; -webkit-border-bottom-right-radius: @bottomright; -webkit-border-bottom-left-radius: @bottomleft; @@ -540,7 +566,7 @@ border-bottom-right-radius: @bottomright; border-bottom-left-radius: @bottomleft; border-top-left-radius: @topleft; - .background-clip(padding-box); + /*.background-clip(padding-box);*/ } .opacity(@opacity: 0.5) { -moz-opacity: @opacity; @@ -551,7 +577,7 @@ -ms-filter: ~"progid:DXImageTransform.Microsoft.Alpha(opacity=@{opperc})"; filter: ~"alpha(opacity=@{opperc})"; } -.transition-duration(@duration: 0.2s) { +.transition_duration(@duration: 0.2s) { -moz-transition-duration: @duration; -webkit-transition-duration: @duration; -o-transition-duration: @duration; @@ -576,23 +602,23 @@ -o-transition: all @duration @ease; transition: all @duration @ease; } -.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) { +.inner_shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) { -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha); -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha); box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha); } -.box-shadow(@arguments) { +.box_shadow(@arguments) { -webkit-box-shadow: @arguments; -moz-box-shadow: @arguments; box-shadow: @arguments; } -.box-sizing(@sizing: border-box) { +.box_sizing(@sizing: border-box) { -ms-box-sizing: @sizing; -moz-box-sizing: @sizing; -webkit-box-sizing: @sizing; box-sizing: @sizing; } -.user-select(@argument: none) { +.user_select(@argument: none) { -webkit-user-select: @argument; -moz-user-select: @argument; -ms-user-select: @argument; @@ -621,7 +647,7 @@ .translate(@x:0, @y:0) { .transform(translate(@x, @y)); } -.background-clip(@argument: padding-box) { +.background_clip(@argument: padding-box) { -moz-background-clip: @argument; -webkit-background-clip: @argument; background-clip: @argument; @@ -629,7 +655,7 @@ /* ##################################################### */ -.gradient-thead{ +.gradient_thead{ /*.background-color-5-gray;*/ background: -moz-linear-gradient(top, rgba(240,240,240,0) 0%, rgba(191,191,191,0.65) 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(240,240,240,0)), color-stop(100%,rgba(191,191,191,0.65))); /* Chrome,Safari4+ */ diff --git a/pixelegg/less/def_messages.less b/pixelegg/less/def_messages.less index 9240a1482c..51d0bb81e4 100755 --- a/pixelegg/less/def_messages.less +++ b/pixelegg/less/def_messages.less @@ -19,8 +19,8 @@ border-width: 9px 0px 0px 9px; border-style: solid; - border-color: @gray-30; - .background-color-25-gray; + border-color: @gray_30; + .background_color_25_gray; @@ -29,12 +29,12 @@ // display: none !important; border-width: 0px 0px 0px 0px; border-style: solid; - border-color: @gray-50; + border-color: @gray_50; .border_radius_button_righttop; padding: 14px 2px 4px 15px; font-size: 1em; font-weight: normal; - .background-color-10-gray; + .background_color_10_gray; color: @egw_color_2_d; width: 80%; diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 736beb8dbe..e5742e9746 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -86,7 +86,7 @@ div.et2_hbox>div { display: inline-block; /*border: 1px solid cornflowerblue;*/ .border_normal; - background-color: @gray-10; + background-color: @gray_10; padding: 3px; margin: 1px; } @@ -104,7 +104,7 @@ div.et2_hbox>div { .et2_placeholder .et2_attr { display: block; font-size: 8pt; - color: @gray-100; + color: @gray_100; margin: 2px 0 2px 0; } @@ -140,7 +140,7 @@ div.et2_hbox>div { * Label widget, and labels for other widgets */ .et2_label { - color: @gray-90; + color: @gray_90; // float: left; } @@ -178,12 +178,12 @@ a.et2_url.url { * Button widget - text only, and icon */ .et2_button { - cursor: pointer; +/* cursor: pointer; text-align: center; - font-size: 9pt; - - text-shadow: 0px 0px; + font-size: 9pt;*/ + text-shadow: 0px 0px !important; + .Complete_Button_normal; } /*in Nextmatch definiert*/ @@ -200,21 +200,38 @@ a.et2_url.url { // width: 16px; .dimension_height_s; } -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, +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;} + +} + + +/*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; + 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; + border: 1px solid @gray_40; + color: @gray_0; outline: none; -} +}*/ /** * Drop down button @@ -310,7 +327,7 @@ button.et2_button_text:focus, input[type=button]:focus { // text-indent: -26px; // max-width: 85%; - &:hover {background-color: @color-hint !important;} + &:hover {background-color: @color_hint !important;} @@ -345,7 +362,7 @@ button.et2_button_text:focus, input[type=button]:focus { .et2_selectbox .ui-multiselect-checkboxes div.ui-icon-close{ /*visibility: hidden;*/ background-image: url(../images/close.png); - background: @gray-0; + background: @gray_0; margin: 2px; padding: 0px; } @@ -387,7 +404,7 @@ span.et2_date span { background-position: center; background-repeat: no-repeat; - color: @gray-0; + color: @gray_0; cursor: pointer; padding-top: 3px; padding-left: 22px; @@ -475,7 +492,7 @@ div.et2_file input {background-color: @egw_color_1_a;} } .et2_file .progress p { - background-color: @color-progress; + background-color: @color_progress; height:5px; margin: 0px; } @@ -542,7 +559,7 @@ div.et2_link_entry input.ui-autocomplete-input { } .et2_link_entry .ui-icon-close { display: inline-block; - background-color: @gray-0; + background-color: @gray_0; border: none; position: relative; top: 3px; @@ -663,7 +680,7 @@ ul.et2_link_string { position: fixed; border: 1px solid #897f51; padding: 3px; - background-color: @color-hint; + background-color: @color_hint; max-width: 300px; color: black; } @@ -678,12 +695,10 @@ ul.et2_link_string { padding: 4px; cursor: pointer; font-size: 0.8em; - .border-radius(3px,0,0,3px); - // .bordered (@egw_color_2_c, @egw_color_2_c, #bfbfbf, @egw_color_2_c); + /*.border_radius(3px,0,0,3px);*/ - .background-color-25-gray; - // .border_radius_button_normal; - // .border_normal; + .background_color_25_gray; + .inner_shadow(1px, 0px, 0px, 0.5); -webkit-box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); box-shadow: 1px 0px 0px rgba(0, 0, 0, 0.5); @@ -694,18 +709,13 @@ ul.et2_link_string { user-select: none; &:hover { - .color-5-gray; - // border: 1px solid gray; - .background-color-25-gray; + .color_5_gray; + .background_color_25_gray; } &:active{ - .background-color-0-gray; - // border-width: 3px 1px 0px 0; - // border-style: solid; - // border-spacing: 0px; - // border-color: @active_button_border_bottom; - .color-0-gray; + .background_color_0_gray; + .color_0_gray; } } @@ -717,14 +727,14 @@ ul.et2_link_string { // border-style: solid; border-spacing: 0px; // border-color: @active_button_border_bottom; - // .color-0-gray; + // .color_0_gray; background-color: white; - .color-100-gray; + .color_100_gray; border-width: 1px 1px 0px 1px; border-style: solid; - border-color: @gray-70; + border-color: @gray_70; &:hover { - .color-100-gray; + .color_100_gray; // border: 1px solid gray; background-color: white; } @@ -733,16 +743,16 @@ ul.et2_link_string { .et2_tabs { border-width: 0px 1px 1px 1px; border-style: solid; - border-color: @gray-70; + border-color: @gray_70; padding: 5px; overflow-y: auto; - background-color: @gray-0; + background-color: @gray_0; .border_radius_button_normal; } .et2_tabheader { -// background-color: @gray-20; +// background-color: @gray_20; background-position: bottom; background-repeat: repeat-x; padding-left: 0em; @@ -776,7 +786,7 @@ ul.et2_vfs { */ [required] { background-color: @egw_color_1_a; - .border-radius (3px, 3px ,3px ,3px ); + .border_radius (3px, 3px ,3px ,3px ); input{ } @@ -790,7 +800,7 @@ ul.et2_vfs { -moz-box-shadow: 0 0 6px #DDDDDD; background-color: #FFFE36; border: 1px solid #E1E16D; - color: @color-warning; + color: @color_warning; display: none; font-size: 11px; height: 15px; @@ -806,7 +816,7 @@ ul.et2_vfs { hr { border-style: none; - border-top: 1px solid @gray-10; + border-top: 1px solid @gray_10; height: 1px; margin: 10px 0px 10px 0px; } @@ -823,7 +833,7 @@ table.et2_grid { /* border: 1px dashed silver;*/ .gray { - padding: 1em; background-color: @color-hint; + padding: 1em; background-color: @color_hint; span {background-color: transparent;} } } @@ -902,7 +912,7 @@ div.message.floating { .et2_nextmatch { - .background-color-10-gray; + .background_color_10_gray; } /* Left & right headers*/ @@ -939,12 +949,12 @@ div.message.floating { width: 80%; margin-bottom: 4px; padding: 0; - background-color: @gray-30; + background-color: @gray_30; border: none !important; - border-color: @gray-100; + border-color: @gray_100; background-image: none !important; height: 37px; - .border-radius (15px, 3px, 0px, 0px); + .border_radius (15px, 3px, 0px, 0px); .et2_label { @@ -986,7 +996,7 @@ div.message.floating { // Search Field .nextmatch_header > .filters input[type=search] { - .background-color-search; + .background_color_search; color: black; /*height: 25px;*/ float: left; @@ -1060,8 +1070,8 @@ div.message.floating { // margin-right: 3px; } .et2_nextmatch .nextmatch_header > .filters { - border: 1px solid @gray-10; - background-color: @gray-20; + border: 1px solid @gray_10; + background-color: @gray_20; background-image: url(../images/header_overlay.png); background-position: center; background-repeat: repeat-x; @@ -1097,7 +1107,7 @@ div.message.floating { .box_shadow_standard_light; .border_radius_button_normal; - .background-color-25-gray; + .background_color_25_gray; } @@ -1113,7 +1123,7 @@ div.message.floating { vertical-align: middle; margin-right: -2px; padding: 0px 1ex; - .background-color-0-gray; + .background_color_0_gray; background-image: none; // width: 50px; @@ -1156,7 +1166,7 @@ div.message.floating { /* hover */ button.ui-state-hover { - background-color: @gray-30 !important; + background-color: @gray_30 !important; // background-image: url("../images/fav_filter_normal.png") !important; // background-repeat: no-repeat !important; background-size: 16px 16px !important; @@ -1250,7 +1260,7 @@ div.message.floating { padding-left: 0 !important; margin-left: 0px; - line-height: 1.5em; + line-height: 2.5em; img { @@ -1290,10 +1300,10 @@ div.message.floating { .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { .bordered(1px, 1px, 1px,1px); - border-color: @gray-10; + border-color: @gray_10; background: transparent !important; font-weight: bold; - .color-100-gray; + .color_100_gray; } .ui-menu-icons { @@ -1474,7 +1484,7 @@ div.et2_progress { text-align: left; } div.et2_progress > div { - background-color: @color-progress; + background-color: @color_progress; height: 5px; } @@ -1665,7 +1675,7 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button { textarea, textarea.description { - background-color: @color-optional; + background-color: @color_optional; padding: 0.3em 0 0 0.3em; } @@ -1729,4 +1739,4 @@ iframe#admin-index_iframe{ } // -// \ No newline at end of file +// \ No newline at end of file diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less index ce821a6d5b..ccb3c078b9 100755 --- a/pixelegg/less/jquery-ui.less +++ b/pixelegg/less/jquery-ui.less @@ -28,7 +28,7 @@ option:checked {background-color: @egw_color_1_e;} z-index: 9999; max-width: 300px; - .box-shadow (0 0 5px #aaa); + .box_shadow (0 0 5px #aaa); } /* Component containers @@ -56,28 +56,28 @@ option:checked {background-color: @egw_color_1_e;} // background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; // color: #222222; background-image: none; - .color-50-gray !important; + .color_50_gray !important; background: white; } .ui-widget-content a { // color: #222222; - .color-40-gray; + .color_40_gray; } .ui-widget-header { // border: 1px solid #4297d7; .bordered(0px, 0px, 0px,0px) !important; - .gradient-thead !important; - /*border-color: @gray-10;*/ + .gradient_thead !important; + /*border-color: @gray_10;*/ // background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; // color: #ffffff; - color : @gray-100; + color : @gray_100; font-weight: bold; background-image: none; border: 0px !important; } .ui-widget-header a { // color: #ffffff; - .color-0-gray; + .color_0_gray; } /* Interaction states @@ -86,18 +86,18 @@ option:checked {background-color: @egw_color_1_e;} .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { .bordered(1px, 1px, 1px,1px); - border-color: @gray-10; + border-color: @gray_10; // background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; background: transparent; font-weight: bold; - .color-40-gray; + .color_40_gray; // float: left; // position: relative; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { - .color-40-gray; + .color_40_gray; text-decoration: none; } .ui-state-hover, @@ -107,35 +107,35 @@ option:checked {background-color: @egw_color_1_e;} .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { .bordered(1px, 1px, 1px,1px); - border-color: @gray-10; + border-color: @gray_10; // background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; - background: @color-hint !important; + background: @color_hint !important; background-image: none !important; // font-size: 105%; - .color-100-gray; + .color_100_gray; // font-weight: normal !important; } .ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { - .color-50-gray; + .color_50_gray; text-decoration: none; } .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { .bordered(1px, 1px, 1px,1px); - border-color: @gray-20; - background: @color-hint; + border-color: @gray_20; + background: @color_hint; background-image: none; font-weight: bold; - .color-50-gray; + .color_50_gray; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - .color-50-gray; + .color_50_gray; text-decoration: none; } @@ -145,22 +145,22 @@ option:checked {background-color: @egw_color_1_e;} .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { .bordered(1px, 1px, 1px,1px); - border-color: @gray-30; + border-color: @gray_30; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; - .color-50-gray; + .color_50_gray; } .ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a { - .color-10-gray; + .color_10_gray; } .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { .bordered(1px, 1px, 1px,1px); - border-color: @gray-10; + border-color: @gray_10; // background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; - .color-30-gray; + .color_30_gray; } .ui-state-error a, .ui-widget-content .ui-state-error a,{ @@ -177,7 +177,7 @@ option:checked {background-color: @egw_color_1_e;} /*visibility: hidden;*/ background-image: url(../images/search.png); background-repeat: no-repeat; - background-color: @gray-0; + background-color: @gray_0; background-size: contain; .dimension_width_height_s; margin: 2px; @@ -185,11 +185,11 @@ option:checked {background-color: @egw_color_1_e;} margin-top: 1px; .rounded (2px); - &:hover{ background-color: @gray-30; color: @gray-90;.box_shadow_standard_light_hover;} + &:hover{ background-color: @gray_30; color: @gray_90;.box_shadow_standard_light_hover;} &:active { .box_shadow_standard_light_active !important; - background-color: @color-cancel-action-active !important; + background-color: @color_cancel_action_active !important; } } @@ -199,17 +199,17 @@ span.ui-icon-close {margin-top: 0px; top: 5px !important;} .ui-icon-closethick { background-image: url(../images/close.png) !important; background-repeat: no-repeat; - background-color: @gray-0; + background-color: @gray_0; background-size: contain; background-position: 0 0 !important; - .color-0-gray; + .color_0_gray; .dimension_height_s; - &:hover{ background-color: @gray-10; color: @gray-90; .box_shadow_standard_light_hover;} + &:hover{ background-color: @gray_10; color: @gray_90; .box_shadow_standard_light_hover;} &:active { .box_shadow_standard_light_active !important; - background-color: @color-cancel-action-active !important; + background-color: @color_cancel_action_active !important; } } @@ -237,7 +237,7 @@ span.ui-icon-search{ div.ui-widget-header { - ul li label.ui-state-hover {background-color: @color-hint; font-weight: normal;} + ul li label.ui-state-hover {background-color: @color_hint; font-weight: normal;} } @@ -254,15 +254,15 @@ span.ui-icon-search{ button{ .Complete_Button_text_icon_before; - &:hover{ background-color: @gray-30; color: @gray-90;} + &:hover{ background-color: @gray_30; color: @gray_90;} } - button.ui-button-text-only {background-color: @gray-20 !important; + button.ui-button-text-only {background-color: @gray_20 !important; background: inherit; - color: @gray-100 !important; + color: @gray_100 !important; font-weight: normal !important; - &:hover{ background-color: @gray-30 !important;} + &:hover{ background-color: @gray_30 !important;} } } // \ No newline at end of file diff --git a/pixelegg/less/layout_chosen.less b/pixelegg/less/layout_chosen.less index 319aa30c7f..d134f1796f 100755 Binary files a/pixelegg/less/layout_chosen.less and b/pixelegg/less/layout_chosen.less differ diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index e28359db4d..c85ba970b9 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -35,8 +35,8 @@ html * { body{ background-image:none; - .background-color-10-gray; - .color-100-gray; // Schriftfarbe schwarz + .background_color_10_gray; + .color_100_gray; // Schriftfarbe schwarz margin: 0px !important; padding: 0px !important; @@ -61,7 +61,7 @@ textarea { .basefontfamily; - .background-color-5-gray ; + .background_color_5_gray ; } //########################## @@ -88,6 +88,8 @@ select { } +:hover {.transition (0.2s, ease-out);} + // ############################# // Schriftformate @@ -140,7 +142,7 @@ select { position:relative; } -select:after { +/*select:after { content:'<>'; font:11px "Consolas", monospace; color:#aaa; @@ -162,7 +164,7 @@ select:before { position:absolute; pointer-events:none; display:block; -} +}*/ div.selectbox-wrapper { @@ -225,7 +227,7 @@ div.selectbox-wrapper { } .sbSelector:link, .sbSelector:visited, .sbSelector:hover{ // color: #EBB52D; - .color-50-gray; + .color_50_gray; outline: none; text-decoration: none; } @@ -263,7 +265,7 @@ div.selectbox-wrapper { .sbOptions{ // background-color: #212121; - .background-color-0-gray; + .background_color_0_gray; border: solid 1px #515151; list-style: none; left: -1px; @@ -288,7 +290,7 @@ div.selectbox-wrapper { a:link, a:visited{ - .color-100-gray; + .color_100_gray; text-decoration: none; } a:hover, @@ -328,17 +330,17 @@ div.selectbox-wrapper { // Links a:link, a:visited, select, input, textarea { - color : @link-color; + color : @link_color; } select,input,button { - .color-100-gray; + .color_100_gray; font-size:99%; padding: 0.2em 0; border-width: 1px; border-style: solid; - border-color: @gray-20; + border-color: @gray_20; } select @@ -349,14 +351,14 @@ select a:link,a:visited { cursor:pointer; - color: @link-color; + color: @link_color; text-decoration: none; } a:hover,a:active { cursor:pointer; - color:@link-color-active; + color:@link_color_active; text-decoration: underline; } @@ -423,7 +425,7 @@ hr.clearer { width: 100%; background-color: @egw_color_1_a; .rounded (3px); - border: 1px solid @gray-100; + border: 1px solid @gray_100; } //############################################################################################################## @@ -435,14 +437,14 @@ hr.clearer { } .lettersearch:hover { - .background-color-30-gray; - .color-0-gray; + .background_color_30_gray; + .color_0_gray; } .lettersearch_active{ .Complete_Button_lettersearch; - .background-color-30-gray; + .background_color_30_gray; // background-color: #808080 !important; font-weight: bold; } @@ -525,7 +527,7 @@ div{ } input[type=submit],input[type=button],input[type=reset],button,.egwbutton { - .background-color-10-gray; + .background_color_10_gray; background-image: none; border: outset 1px #b9d5e3; margin: 1px; @@ -536,7 +538,7 @@ input[type=submit],input[type=button],input[type=reset],button,.egwbutton input[type=submit]:hover,input[type=button]:hover,input[type=reset]:hover,button:hover,.egwbutton:hover { - .background-color-15-gray; + .background_color_15_gray; background-image: none; border: outset 1px #b9d5e3; color: #004e7d; @@ -611,9 +613,9 @@ input[type=image] .divSideboxHeader { text-align:center; - .background-color-15-gray; + .background_color_15_gray; padding-top:2px; - .color-50-gray; + .color_50_gray; } @@ -798,11 +800,7 @@ a.textSidebox button{ - .Complete_Button_normal; - - &:hover{ background-color: @gray-30; color: @gray-90;.box_shadow_standard_light_hover;} - - &:active {.box_shadow_standard_light_active !important;} + // siehe etemplate2.less } /* ######################################################################################## * @@ -821,21 +819,21 @@ button[id="addressbook-edit_button[delete]"] margin-left: 3em; .Complete_Button_text_icon_before; /*background-color: @color-negative-action !important;*/ - /*color: @gray-100 !important;*/ + /*color: @gray_100 !important;*/ &:hover { background-image:url('../images/delete-hover.png') !important; - background-color: @color-negative-action-hover !important; + background-color: @color_negative_action_hover !important; .Complete_Button_text_icon_before; - color: @gray-0 !important;; + color: @gray_0 !important;; } &:active { background-image:url('../images/delete-hover.png') !important; - background-color: @color-negative-action-active !important; + background-color: @color_negative_action_active !important; .Complete_Button_text_icon_before; - color: @gray-0; + color: @gray_0; } } @@ -846,20 +844,20 @@ button[id="addressbook-edit_button[delete]"] ######################################################################################## */ button[id*="save"] { - &:active {background-color: @color-positive-action-active;} + &:active {background-color: @color_positive_action_active;} } button[id*="apply"]{ - &:active {background-color: @color-positive-action-active;} + &:active {background-color: @color_positive_action_active;} } button[id*="copy"]{ - &:active {background-color: @color-positive-action-active;} + &:active {background-color: @color_positive_action_active;} } button[id*="edit_button[edit]"]{ - &:active {background-color: @color-positive-action-active;} + &:active {background-color: @color_positive_action_active;} } button#filemanager-select_button[ok]{ - &:active {background-color: @color-positive-action-active;} + &:active {background-color: @color_positive_action_active;} } /*ui-widget*/ @@ -868,29 +866,29 @@ button#series { background-image:url('../images/edit.png') !important; .Complete_Button_text_icon_before; &:hover {background-image:url('../images/edit.png') !important;} - &:active {background-color: @color-positive-action-active !important;} + &:active {background-color: @color_positive_action_active !important;} } /*edit exception*/ button#exception { background-image:url('../images/edit.png') !important; .Complete_Button_text_icon_before; &:hover {background-image:url('../images/edit.png') !important;} - &:active {background-color: @color-positive-action-active !important;} + &:active {background-color: @color_positive_action_active !important;} } /*calendar series add*/ #calendar-edit_add { - &:active {background-color: @color-positive-action-active !important;} + &:active {background-color: @color_positive_action_active !important;} /* .Complete_Button_add; &:hover {.Complete_Button_add_hover;} */ } /*calendar search freetime*/ #calendar-edit_freetime{ - &:active {background-color: @color-positive-action-active !important;} + &:active {background-color: @color_positive_action_active !important;} } /*calendar search freetime*/ button[id*="edit_button[add_alarm]"]{ - &:active {background-color: @color-positive-action-active !important;} + &:active {background-color: @color_positive_action_active !important;} } /* ######################################################################################## * @@ -901,13 +899,13 @@ button[id*="edit_button[add_alarm]"]{ button[id*="cancel"], button#cancel{ - &:hover { background-color: @color-cancel-action-hover !important; color: @gray-100; } - &:active { background-color: @color-cancel-action-active !important; color: @gray-80; } + &:hover { background-color: @color_cancel_action_hover !important; color: @gray_100; } + &:active { background-color: @color_cancel_action_active !important; color: @gray_80; } } /* et2_box_widget ###*/ -/*div.et2_box_widget .et2_button_text:last-child,*/ +/*div.et2_box_widget .et2_button_text:last_child,*/ button[id="cancel"]{ background-image:url('../images/cancel.png') !important; @@ -915,8 +913,8 @@ button[id="cancel"]{ content: "ID missing"; - &:hover {background-color: @color-cancel-action-hover !important; .box_shadow_standard_light_hover;} - &:active {background-color: @color-cancel-action-active !important; .box_shadow_standard_light_inset;} + &:hover {background-color: @color_cancel_action_hover !important; .box_shadow_standard_light_hover;} + &:active {background-color: @color_cancel_action_active !important; .box_shadow_standard_light_inset;} } /* ######################################################################################## @@ -933,7 +931,7 @@ button[id="add"]{ background-image:url('../images/add.png') !important; .Complete_Button_text_icon_before; - &:active {background-color: @color-positive-action-active !important;} + &:active {background-color: @color_positive_action_active !important;} } /* ######################################################################################## @@ -963,4 +961,4 @@ button.et2_button_with_image{ } } -// \ No newline at end of file +// \ No newline at end of file diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index 06dbdd9e1c..e60066dd03 100755 Binary files a/pixelegg/less/layout_dialog.less and b/pixelegg/less/layout_dialog.less differ diff --git a/pixelegg/less/layout_footer.less b/pixelegg/less/layout_footer.less index bb052b4ecb..7c8786bcc6 100644 Binary files a/pixelegg/less/layout_footer.less and b/pixelegg/less/layout_footer.less differ diff --git a/pixelegg/less/layout_loginPage.css b/pixelegg/less/layout_loginPage.css index 1ca1a29b41..ad80b7e059 100644 --- a/pixelegg/less/layout_loginPage.css +++ b/pixelegg/less/layout_loginPage.css @@ -53,9 +53,7 @@ border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; border-top-left-radius: 25px; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; + /*.background-clip(padding-box);*/ border-top: solid 1px #0c5da5; border-left: solid 1px #0c5da5; border-right: solid 1px #0c5da5; @@ -86,9 +84,9 @@ margin: 1em; } #loginMainDiv div#centerBox form table.divLoginbox { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -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; -webkit-border-top-left-radius: 20px; -moz-border-radius: 3px; @@ -100,11 +98,11 @@ padding: 0.5em; } #loginMainDiv div#centerBox form table.divLoginbox select { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -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); width: auto; - margin: 0.5em 0em 0.5em 0.5em; + margin: 5px 0em 5px 5px; padding: 3px; outline: none; display: inline-block; @@ -121,11 +119,11 @@ #loginMainDiv div#centerBox form table.divLoginbox input { border: 1px solid rgba(0, 0, 0, 0.15); border-color: #b4b4b4; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5); + -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); width: auto; - margin: 0.5em 0em 0.5em 0; + /*margin: 0.5em 0em 0.5em 0;*/ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less index 721b394433..3237029690 100644 Binary files a/pixelegg/less/layout_loginPage.less and b/pixelegg/less/layout_loginPage.less differ diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less index 09b8aa8fd8..9efd6320ef 100755 --- a/pixelegg/less/layout_messages.less +++ b/pixelegg/less/layout_messages.less @@ -18,7 +18,7 @@ #msg,.message { color: red; font-style: italic; - background: @gray-0; + background: @gray_0; } @@ -27,8 +27,8 @@ border-width: 9px 0px 0px 0px; border-style: solid; - border-color: @gray-30; - .background-color-30-gray; + border-color: @gray_30; + .background_color_30_gray; @@ -37,12 +37,12 @@ // display: none !important; border-width: 0px 0px 0px 0px; border-style: solid; - border-color: @gray-10; + border-color: @gray_10; .border_radius_button_righttop; padding: 5px 2px 4px 15px; font-size: 1em; font-weight: normal; - .background-color-10-gray; + .background_color_10_gray; color: @egw_color_2_d; width: 80%; @@ -67,7 +67,7 @@ span.message { height: 35px; - border-bottom: 2px solid @gray-10; + border-bottom: 2px solid @gray_10; color: white; background: red; height: auto; diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 6b554b7fc2..5eab344ce6 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -30,7 +30,7 @@ // .background-color-0-gray; margin: 0; - body {.background-color-0-gray; } + body {.background_color_0_gray; } } .egwGridView_scrollarea { @@ -51,12 +51,12 @@ margin-left: -8px; text-align: center; height: 45px; - .background-color-5-gray; + .background_color_5_gray; img { height: 40px; border: none; - .background-color-5-gray; + .background_color_5_gray; } } @@ -81,95 +81,121 @@ #egw_fw_topmenu_items { float: left; padding-top: 10px; - + width: 70%; + ul { - - li{ - .color-100-gray; - .Button_size_square_32; + .color_100_gray; + /*.Button_size_square_32;*/ padding: 0.3em 0.4em; .Complete_Button_normal; - &: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; - a {.color-100-gray; text-decoration: none; } + &:hover { + .color_50_gray; + border-color: @gray_50; + text-decoration: none !important; + } + } - a:hover { - .color-50-gray; - border-color: @gray-50; - text-decoration: none !important; - - } } /*Home*/ li:first-child{ - margin-left: 10px; - :before{border: none;} - a:before { - padding-right: 5px; - content: url(../images/topmenu_items/home.png); + margin-left: 10px; + :before{border: none;} + } + + /*home*/ + a#topmenu_home { + margin-left: 0px; + &:before { + padding-right: 20px; + content: " "; + background-image: url(../images/topmenu_items/home.png); + background-repeat: no-repeat; .dimension_width_height_s; } } + - /*Setup*/ - li:nth-child(2){ - a:before { - padding-right: 5px; - content: url(../images/topmenu_items/setup.png); + /*Setup / Einstellungen*/ + a#topmenu_prefs{ + margin-left: 0px; + &:before { + padding-right: 20px; + content: ""; + background-image: url(../images/topmenu_items/setup.png); + background-repeat: no-repeat; .dimension_width_height_s; } } - /*access*/ - li:nth-child(3){ - a:before { - padding-right: 5px; - content: url(../images/topmenu_items/access.png); + + /*access / Zugriff */ + a#topmenu_acl{ + &:before { + padding-right: 20px; + content: ""; + background-repeat: no-repeat; .dimension_width_height_s; + background-image: url(../images/topmenu_items/access.png); } } /*category*/ - li:nth-child(4){ - a:before { - padding-right: 5px; - content: url(../images/topmenu_items/category.png); + a#topmenu_cats{ + &:before { + background-image: url(../images/topmenu_items/category.png); + padding-right: 20px; + content: ""; + background-repeat: no-repeat; .dimension_width_height_s; } } /*password*/ - li:nth-child(5){ - a:before { - padding-right: 5px; - content: url(../images/topmenu_items/password.png); + a#topmenu_preferences{ + &:before { + background-image: url(../images/topmenu_items/password.png); + padding-right: 20px; + content: ""; + background-repeat: no-repeat; .dimension_width_height_s; } } /*help*/ - li:nth-child(6){ - a:before { - padding-right: 5px; - content: url(../images/topmenu_items/help.png); + a#topmenu_manual{ + &:before { + background-image: url(../images/topmenu_items/help.png); + padding-right: 20px; + content: ""; + background-repeat: no-repeat; .dimension_width_height_s; } } /*Search*/ - li:nth-child(7){ - a:before { - padding-right: 5px; - content: url(../images/topmenu_items/search.png); + a#topmenu_search{ + &:before { + background-image: url(../images/topmenu_items/search.png); + padding-right: 20px; + content: ""; + background-repeat: no-repeat; .dimension_width_height_s; } } /*logout*/ - li:nth-child(8){ - a:before { - padding-right: 5px; - content: url(../images/topmenu_items/logout.png); + a#topmenu_logout{ + &:before { + background-image: url(../images/topmenu_items/logout.png); + padding-right: 20px; + content: ""; + background-repeat: no-repeat; .dimension_width_height_s; } } @@ -243,37 +269,63 @@ // quick_add span#quick_add{ - .Complete_Button_add; + /*.Complete_Button_add;*/ + .Button_size_square_16; + .border_normal; + .box_shadow_standard_light; + float: right; position: fixed; - right: 88px; - top: 0; - z-index: 200; - - padding: 5px 0.8em 6px 0.5em; - - &:before {content: "+";font-size: 1.5em;color: @egw_color_1; line-height: 1.1em} + right: 83px; + top: 5px; + padding: 0.5em; + &:before {content: "+"; font-size: 2em; color: @egw_color_1; line-height: 0.6em} + &:focus {.box_shadow_standard_light_inset;}; + .transition (0.2s, ease-out); select#quick_add_selectbox{ - .border_normal; - .box_shadow_standard_light; - height: 26px; - padding: 0 0 0 10px; - font-size: 0.9em; - line-height: 1.1em; - &:hover {.box_shadow_standard_light_hover;} - &:focus {.box_shadow_standard_light_inset;} -/* option { - &:first-child{ - &:before {content: "+";font-size: 2em;color: @egw_color_1;} + position: fixed; + right: 83px; + /*.border_normal;*/ + /*.box_shadow_standard_light;*/ + /*height: 26px;*/ + padding: 0 0 0 10px; + font-size: 0.9em; + /*line-height: 1.1em;*/ + + visibility: hidden; + + transition-property: visibility; + transition-duration: 0s; + transition-timing-function: linear; + transition-delay: 0s; + } + } - }*/ + + + /*hover*/ + span#quick_add:hover { + + width: 166px !important; + .box_shadow_standard_light_hover; + + select#quick_add_selectbox { + /*.box_shadow_standard_light_hover;*/ + .box_shadow_none; + border: none; + position: relative !important; + right: 1px !important; + top: -5px; + z-index: 200; + visibility: visible !important; } - } - - } - - + + } + + } + + // Logout #egw_fw_logout { @@ -407,7 +459,7 @@ left: 0px; bottom: 20px; width: 225px; - .background-color-5-gray; + .background_color_5_gray; //Menu #egw_fw_sidemenu { @@ -423,7 +475,7 @@ // .background-color-0-gray; .egw_fw_ui_scrollarea_outerdiv{ - .background-color-5-gray; + .background_color_5_gray; // Alle Tabs @@ -447,7 +499,7 @@ /*padding: 0px 5px 5px 10px;*/ &:hover { - .background-color-15-gray; + .background_color_15_gray; .rounded(5px); } @@ -459,7 +511,7 @@ font-weight: normal; margin: 0 0 10px 0; padding-top: 0.31em; - .color-40-gray; + .color_40_gray; } @@ -478,21 +530,21 @@ background-repeat: no-repeat; /*background-image: none;*/ - .background-color-10-gray; + .background_color_10_gray; - .border-radius ( 5px, 0px, 0px, 27px ); + .border_radius ( 5px, 0px, 0px, 27px ); - .bordered (@gray-30, @gray-30, @gray-30, @gray-30); + .bordered (@gray_30, @gray_30, @gray_30, @gray_30); margin: 0 0 0 0; border-bottom: none; height: 44px; img {padding-left: 10px; padding-top: 8px;} - h1 {text-transform: uppercase; font-size: 1.4em; .color-100-gray; padding-top: 8px;} + h1 {text-transform: uppercase; font-size: 1.4em; .color_100_gray; padding-top: 8px;} - &:hover {.box_shadow_standard_light_hover; .border-radius ( 5px, 0px, 0px, 27px );} - &:active {.box_shadow_standard_light_active; .border-radius ( 5px, 0px, 0px, 27px );} + &:hover {.box_shadow_standard_light_hover; .border_radius ( 5px, 0px, 0px, 27px );} + &:active {.box_shadow_standard_light_active; .border_radius ( 5px, 0px, 0px, 27px );} &:focus { background-image: url("../images/ajax-loader.gif"); @@ -500,7 +552,7 @@ background-position: 90% 50%; .Complete_Button_active; - .background-color-25-gray; + .background_color_25_gray; } @@ -514,8 +566,8 @@ .egw_fw_ui_sidemenu_entry_content { display: block; background-image: none; - .border-radius (0, 0, 27px, 0); - border-color: @gray-30; + .border_radius (0, 0, 27px, 0); + border-color: @gray_30; border-style: solid; border-width: 0px; margin: 0 0 2em 0; @@ -523,16 +575,16 @@ > div:nth-of-type(1) { padding: 5px 0.3em 1.5em 0.3em; margin: 0 0 10px 0; - .background-color-30-gray; - .border-radius (0, 0, 27px, 0); - border-color: @gray-30; + .background_color_30_gray; + .border_radius (0, 0, 27px, 0); + border-color: @gray_30; } /*letztes Element*/ div.egw_fw_ui_category:nth-last-of-type(-n+3) { /* color:#ff0000; background-color: yellow !important;*/ - .border-radius (0, 0, 15px, 0); + .border_radius (0, 0, 15px, 0); } // Schaltflächen @@ -542,9 +594,12 @@ padding: 0.5em 1em; cursor: pointer; // border-top: 7px solid; - border-color: @gray-30; - background-color: @gray-50; - .border-radius(3px,3px,3px,3px); + border-color: @gray_30; + background-color: @gray_10; + + /*background-color: @egw_color_2_d;*/ + + .border_radius(3px,3px,3px,3px); h1 { margin: 5px 0px 3px 5px; @@ -564,7 +619,7 @@ // Hover .egw_fw_ui_category:hover { - .background-color-40-gray; + .background_color_40_gray; padding: 0.5em 1em; } @@ -579,28 +634,29 @@ background-color: @egw_color_2_d; /*.background-color-50-gray;*/ - .color-5-gray; - .border-radius(3px,3px,3px,3px) !important; + .color_5_gray; + .border_radius(3px,3px,3px,3px) !important; h1 { - background-image:url(../images/arrow_down.png); + background-image:url(../images/arrow_down.png); - a { - color: #FFF; + a { + color: #FFF; - img {height: 16px; width: 16px;} + img {height: 16px; width: 16px;} + } + + a:hover { + padding: 5px 30px 5px 0px; + width: 200px; + .background_color_10_gray; + .color_50_gray; + .Complete_Button_hover; + } } - a:hover { - padding: 5px 30px 5px 0px; - width: 200px; - .background-color-10-gray; - .color-50-gray; - .Complete_Button_hover; - } - } - + &:hover {background-color: @egw_color_2_a; .transition (0.2s, ease-out);} } @@ -614,7 +670,7 @@ } .egw_fw_ui_sidemenu_entry_header_bottom { border-width: 0px; - border-color: @gray-0; + border-color: @gray_0; } .egw_fw_ui_sidemenu_entry_icon { @@ -647,7 +703,7 @@ #egw_fw_splitter { position: absolute; // background-color: RGB(200, 200, 255); - .background-color-30-gray; + .background_color_30_gray; width: 5px; top: 51px; bottom: 3px; @@ -659,7 +715,7 @@ background-image: url(../images/splitter_vert.png); background-position: center; background-repeat: no-repeat; - .background-color-30-gray; + .background_color_30_gray; position: absolute; width: 5px; height: 100%; @@ -680,7 +736,7 @@ // Submenu / Unterpunkte in der Seitenleiste .egw_fw_ui_category_content { - .background-color-0-gray; + .background_color_0_gray; border-top-width: 0; border-left: 0px solid; border-bottom: 0px solid; @@ -690,15 +746,17 @@ padding-left: 0px; padding-top: 14px; margin-right: 5px; - min-height: 50px; - img { height: 16px; width: 16px;vertical-align: middle;} + /*min-height: 50px;*/ + + img { .dimension_height_s; vertical-align: middle;} + &:hover { - .background-color-0-gray; - border-color: @gray-50; + .background_color_0_gray; + border-color: @gray_50; } + input#uical_select_owner_multiple{ - height: 16px; - width: 16px; + .dimension_height_s; vertical-align: middle; } select#calendar_filter{ @@ -718,23 +776,25 @@ .egw_fw_ui_sidemenu_listitem { padding: 0.5em 0; - margin: 4px 0 5px 0px; + margin: 0px 0 5px 0px; position: relative; + min-height: 16px; + background-color: @gray_0; // Icon before img.egw_fw_ui_sidemenu_listitem_icon { - height: 16px; - width: 16px; + .dimension_width_height_s; padding: 0px; margin: 0px 5px; float: left; /*.Complete_Button_Icon_normal;*/ background-image: url("../images/bullet.png"); - background-size: 16px 16px; - background-position: center; + background-size: .dimension_width_height_s; + + background-position: center; /*&:hover {height: 16px; .Complete_Button_Icon_hover ;}*/ } @@ -767,7 +827,7 @@ min-width: 5em; &:hover{ - .color-100-gray; + .color_100_gray; } &:active { @@ -815,9 +875,9 @@ } a:nth-child(2):hover { - background-color: @color-warning; + background-color: @color_warning; .Complete_Button_Icon_hover ; - .color-0-gray; + .color_0_gray; // width: auto; } @@ -828,9 +888,10 @@ // Submenu Item &:hover{ - .color-100-gray; + .color_100_gray; background-color: @egw_color_1_e; padding: 0.5em 0; + } } // .egw_fw_ui_sidemenu_listitem @@ -932,7 +993,7 @@ div#calendar-container { color: #000; cursor: default; padding: 0.3em; - .background-color-5-gray; + .background_color_5_gray; .basefontfamily; thead { @@ -1070,7 +1131,7 @@ div#calendar-container { padding-right: 0; position: relative; - .border-radius(5px,0, 0, 5px); + .border_radius(5px,0, 0, 5px); /*.background-color-5-gray;*/ @@ -1082,12 +1143,12 @@ div#calendar-container { cursor: pointer; border-width: 1px 1px 0 1px; border-style: solid; - border-color: @gray-30;; + border-color: @gray_30;; background-repeat:repeat-x; height: 47px; - &:hover {.background-color-30-gray ;} + &:hover {.background_color_30_gray ;} h1 {font-size: 100%; line-height: 1em; margin-top:0;} @@ -1105,10 +1166,10 @@ div#calendar-container { .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; padding: 0 0 5px !important; - .background-color-30-gray ; + .background_color_30_gray ; background-image:none !important; - &:hover {.background-color-25-gray ;} + &:hover {.background_color_25_gray ;} // aktive Bilder diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less index 56b8e0ffdf..82464c952e 100755 Binary files a/pixelegg/less/layout_table.less and b/pixelegg/less/layout_table.less differ