diff --git a/pixelegg/content-element-library/._.DS_Store b/pixelegg/content-element-library/._.DS_Store deleted file mode 100755 index 78904340e5..0000000000 Binary files a/pixelegg/content-element-library/._.DS_Store and /dev/null differ diff --git a/pixelegg/content-element-library/img/._EGW2014.jpg b/pixelegg/content-element-library/img/._EGW2014.jpg deleted file mode 100755 index 8f7537ed4d..0000000000 Binary files a/pixelegg/content-element-library/img/._EGW2014.jpg and /dev/null differ diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 99fb765022..e0e13eef25 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -955,6 +955,10 @@ div.message.floating { margin-left: 10px; border-left: 1px solid silver; } +/** Initial height used for calculating average heights, before content is loaded */ +.egwGridView_grid > tbody > tr > td > .loading { + min-height: 1.6em; +} /** * This class' margin-right is used to line up columns at each indent level * Classes level_# are created programmatically with margin-right * depth @@ -1212,7 +1216,7 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button { display: inline; } div.et2_hbox { - white-space: nowrap; + white-space: normal; } div.et2_hbox > * { text-align: left; @@ -1459,7 +1463,7 @@ button.et2_button_text:focus, input[type=button]:focus { list-style-type: none; } .et2_selectbox .ui-multiselect-checkboxes li:hover { - background-color: #ffc200 !important; + background-color: #679fd2 !important; } .et2_selectbox .ui-multiselect-checkboxes ul { margin: 0px auto; @@ -1783,10 +1787,10 @@ action buttons, left aligned for "extra" controls cursor: pointer; } .et2_link_list tr:hover { - background-color: #679fd2; + background-color: rgba(103, 159, 210, 0.2); } .et2_link_list tr:active { - background-color: #ffc200; + background-color: rgba(255, 194, 0, 0.01); } .et2_link_list td.remark { font-style: italic; @@ -1812,7 +1816,7 @@ action buttons, left aligned for "extra" controls position: fixed; border: 1px solid #897f51; padding: 3px; - background-color: #ffc200; + background-color: #679fd2; max-width: 300px; color: black; } @@ -1949,7 +1953,7 @@ action buttons, left aligned for "extra" controls } .et2_grid td .gray { padding: 1em; - background-color: #ffc200; + background-color: #679fd2; } .et2_grid td .gray span { background-color: transparent; @@ -2104,9 +2108,10 @@ action buttons, left aligned for "extra" controls .nextmatch_header > .filters input[type=search] { background-color: #ffd44d; color: black; - height: 22.21875px; + /*height: 16.21875px;*/ float: left; margin: 5px 0 0 2px; + font-size: 11.2px; } .nextmatch_header > .filters button.et2_button { border: 1px solid rgba(0, 0, 0, 0.15); @@ -2903,18 +2908,23 @@ option:checked { color: #999999; text-decoration: none; } +.ui-state-focus, +.ui-widget-header .ui-state-focus, +.ui-widget-content .ui-state-focus { + border-color: #e6e6e6; + background: #679fd2; + background-image: none !important; + color: #000000; +} .ui-state-hover, .ui-widget-content .ui-state-hover, -.ui-widget-header .ui-state-hover, -.ui-state-focus, -.ui-widget-content .ui-state-focus, -.ui-widget-header .ui-state-focus { +.ui-widget-header .ui-state-hover { border-top: solid 1px 1px; border-left: solid 1px 1px; border-right: solid 1px 1px; border-bottom: solid 1px 1px; border-color: #e6e6e6; - background: #ffc200; + background: #679fd2; background-image: none !important; color: #000000; } @@ -2933,7 +2943,6 @@ option:checked { border-right: solid 1px 1px; border-bottom: solid 1px 1px; border-color: #cdcdcd; - background: #ffc200; background-image: none; font-weight: bold; color: #808080; @@ -3051,7 +3060,7 @@ span.ui-icon-search { background-image: none; } .ui-widget-content .et2_selectbox div.ui-widget-header ul li label.ui-state-hover { - background-color: #ffc200; + background-color: #679fd2; font-weight: normal; } /*###########################################*/ @@ -3490,6 +3499,133 @@ div#egwpopup_message { * @package phpgwapi * @version $Id$ */ +/** + * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/) + * http://cssreset.com + */ +html, +body, +div, +span, +applet, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +ruby, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; +} +/* HTML5 display-role reset for older browsers */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { + display: block; +} +body { + line-height: 1; +} +ol, +ul { + list-style: none; +} +blockquote, +q { + quotes: none; +} +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} /* ####################################################################################### * * @@ -3510,6 +3646,7 @@ body { width: 100% !important; height: 100% !important; font-size: 11px; + line-height: 1.28; } body, textarea { @@ -3583,20 +3720,20 @@ select:focus { transition: all 0.2s ease-out; } p { - font-size: 12px; + font-size: 1em; } h1 { - font-size: 200%; - line-height: 1.2em; + font-size: 1.2em; + line-height: 1.28em; margin: 0.4em 0 0; } h2 { - font-size: 170%; + font-size: 1.15em; line-height: 1.2em; margin: 0.6em 0 0; } h3 { - font-size: 150%; + font-size: 1.1em; line-height: 0.8571em; margin: 0.8571em 0 0; } @@ -3623,29 +3760,6 @@ 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:before { - 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; @@ -3931,7 +4045,7 @@ td.lettersearch { } .egw_fw_ui_sidemenu_marker h1 { display: inline; - font-size: 10pt; + /* font-size: 10pt;*/ font-weight: bold; } .egw_fw_ui_ajaxloader { @@ -4563,14 +4677,9 @@ button.et2_button_with_image { * ###################################################################################### */ /* TABLE STYLE */ -table.et2_grid { - /* border-top: 3px solid; - border-color: @gray-10;*/ -} .innerContainer { - overflow: hidden; + overflow: auto; /*padding: 0;*/ - margin: 2px; } .egwGridView_grid tr.th > td, .nextmatch_header { @@ -4610,32 +4719,18 @@ table.egwGridView_outer thead { /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf', GradientType=0); /* IE6-9 */ - /*.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+ - background: -webkit-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); Chrome10+,Safari5.1+ - background: -o-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); Opera 11.10+ - background: -ms-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); IE10+ - background: linear-gradient(to bottom, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); W3C - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf',GradientType=0 ); IE6-9 */ } table.egwGridView_outer thead tr th { - /*.background-color-50-gray;*/ background: transparent; background: #f5f5f5, -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(1, #ffffff)), -ms-linear-gradient(bottom, #eeeeee, #ffffff), -moz-linear-gradient(center bottom, #eeeeee 0%, #ffffff 100%), -o-linear-gradient(#ffffff, #eeeeee); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0); font-weight: normal; padding: 0px; - /* border-width: 1px; - border-style: solid;*/ border-color: #b4b4b4; border-left: 0px solid transparent; border-top: 0px solid transparent; border-right: 0px solid transparent; border-bottom: 0px solid transparent; - /* background-image: none; - background-position: center; - background-repeat: repeat-x;*/ vertical-align: top; overflow: auto; } @@ -4661,7 +4756,7 @@ table.egwGridView_outer thead tr th.optcol { /*width: 32px !important;*/ } table.egwGridView_outer thead tr th.optcol:hover { - background-color: #ffc200; + background-color: #679fd2; } table.egwGridView_outer thead tr th.optcol span.selectcols { height: 9px; @@ -4673,11 +4768,30 @@ table.egwGridView_outer thead tr th.optcol span.selectcols { display: inline-block; } table.egwGridView_outer thead tr th.optcol span.selectcols:hover { - background-color: #ffc200; + background-color: #679fd2; } table.egwGridView_outer tbody td.frame { - border: 1px solid #000000; - padding: 0px 5px; + border: 1px solid #e6e6e6; + /*padding: 0px 5px; no need*/ +} +table.egwGridView_outer tbody img { + background-color: #0c5da5; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); + background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); + background-image: linear-gradient(top, #0c5da5, #0c5da5); + background-repeat: repeat-x; + /*.background_color_10_gray;*/ + -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); + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } /*########################################################*/ table.egwGridView_grid { @@ -4700,21 +4814,24 @@ table.egwGridView_grid tbody tr:nth-child(even) { background: #ffffff; } table.egwGridView_grid tbody tr:nth-child(odd) { - background: #f7f7f7; + background: #fafafa; } table.egwGridView_grid tbody tr.selected { - background: rgba(255, 221, 115, 0.2) !important; + background-image: none; + background: rgba(255, 221, 115, 0.2); /*.bw-gradient;*/ } table.egwGridView_grid tbody tr.focused { - background: rgba(255, 194, 0, 0.5) !important; + background-image: url(../images/focused_hatching.png); + background-repeat: repeat; + background-color: rgba(255, 194, 0, 0.5); } table.egwGridView_grid tr { border-bottom: 1px solid; border-color: #828282; } table.egwGridView_grid tr:hover { - background: rgba(103, 159, 210, 0.4) !important; + background: rgba(103, 159, 210, 0.2) !important; } table.egwGridView_grid tr td { border-left: 0px; @@ -4779,6 +4896,20 @@ table.egwGridView_grid span.arrow.loading { .nextmatch_header tr { background: none; } +/*Custom Fields*/ +table.customfields tbody tr:nth-child(2n) { + background: inherit; +} +table.customfields tr { + background-color: inherit !important; +} +table.customfields td { + line-height: 11px; +} +table.customfields td span > div { + display: inherit; + margin: 0px; +} /** * EGroupware: Stylite Pixelegg template * @@ -4857,7 +4988,7 @@ table.egwGridView_grid span.arrow.loading { #loginMainDiv div#centerBox #loginCdMessage span { padding: 0.5em; font-size: 1.2em; - color: #ffc200; + color: #679fd2; text-shadow: -1px -1px 0px #101010, 1px 1px 0px #505050; width: 100%; } @@ -5050,9 +5181,9 @@ img { width: 100%; float: left; /* ########################################################################################################################################### - Topmenu / Home / Einstellungen / usw.. - ########################################################################################################################################### -*/ + Topmenu / Home / Einstellungen / usw.. + ########################################################################################################################################### + */ } #egw_fw_header #egw_divLogo { float: left; @@ -5064,8 +5195,11 @@ img { background-color: #fafafa; } #egw_fw_header #egw_divLogo img { - height: 40px; + width: 209px; border: none; + position: absolute; + top: 0.41em; + left: 1em; background-color: #fafafa; } #egw_fw_header #egw_fw_topmenu ul, @@ -5262,59 +5396,59 @@ img { ###################################################*/ #egw_fw_topmenu_addons { /* span#quick_add{ - .Complete_Button_add; - .Button_size_square_16; - .border_normal; - .box_shadow_standard_light; - float: right; - position: fixed; - 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{ - 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; - } - } - - + .Complete_Button_add; + .Button_size_square_16; + .border_normal; + .box_shadow_standard_light; + float: right; + position: fixed; + 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); - - hover - span#quick_add:hover { - - width: 166px !important; - .box_shadow_standard_light_hover; - - select#quick_add_selectbox { + 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; + } + } + + + + + hover + span#quick_add:hover { + + width: 166px !important; .box_shadow_standard_light_hover; - .box_shadow_none; - border: none; - position: relative !important; - right: 1px !important; - top: -5px; - z-index: 200; - visibility: visible !important; - } - - }*/ + + 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; + } + + }*/ } #egw_fw_topmenu_addons span#quick_add { border: 1px solid rgba(0, 0, 0, 0.15); @@ -5437,10 +5571,10 @@ img { -ms-justify-content: flex-start; /*postion: bottom*/ /* bottom: 3px; - right: 5px; - padding-right: 20px; - position: fixed; - z-index: 1000;*/ + right: 5px; + padding-right: 20px; + position: fixed; + z-index: 1000;*/ } #egw_fw_topmenu_info_items .topmenu_info_item { overflow: visible; @@ -5519,8 +5653,6 @@ img { box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header h1 { - font-size: 1em; - font-weight: normal; margin: 0 0 10px 0; padding-top: 0.31em; color: #999999; @@ -5552,17 +5684,17 @@ img { border-bottom: solid 1px #b4b4b4; margin: 0 0 0 0; border-bottom: none; - height: 44px; + height: 30px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active img { - padding-left: 10px; - padding-top: 8px; + padding-left: 9px; + padding-top: 6px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active h1 { text-transform: uppercase; font-size: 1.4em; color: #000000; - padding-top: 8px; + padding-top: .8em; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -5656,7 +5788,7 @@ img { } #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) { /* color:#ff0000; - background-color: yellow !important;*/ + background-color: yellow !important;*/ -webkit-border-top-right-radius: 0; -webkit-border-bottom-right-radius: 0; -webkit-border-bottom-left-radius: 15px; @@ -5784,7 +5916,7 @@ img { position: absolute; background-color: #b3b3b3 !important; width: 5px; - top: 51px; + top: 36px; bottom: 3px; right: 0px; } @@ -6024,15 +6156,16 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { width: 100%; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header { - margin: -1px 0 0 0; + margin: 0px 0 0 0; padding: 0px 1px 0px 1px; background-position: bottom; background-repeat: repeat-x; background-color: transparent; - height: 48px; + height: 32px; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header h1 { - float: left; + /*float: left;*/ + display: inline; width: 100%; text-align: center; -webkit-margin-before: 0; @@ -6042,6 +6175,8 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { text-align: center; float: none; margin: 0 auto; + width: 16px; + height: 16px; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header { text-align: center; @@ -6071,7 +6206,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { border-style: solid; border-color: #b4b4b4; background-repeat: repeat-x; - height: 47px; + height: 24px; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover { background-color: #b3b3b3 !important; @@ -6079,13 +6214,14 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 { font-size: 100%; line-height: 1em; - margin-top: 0; + margin: 0 15px 2px 3px; + vertical-align: super; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header img.egw_fw_ui_tab_icon { display: inline-block; - height: 24px; - margin-right: 5px; - margin-top: 5px; + width: 16px; + height: 16px; + margin: 5px 1px 0 1em; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; @@ -6098,9 +6234,13 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active img.egw_fw_ui_tab_icon { display: inline-block; - height: 24px; - margin-right: 5px; - margin-top: 5px; + width: 16px; + height: 16px; + -webkit-transform: scale(1.1); + -moz-transform: scale(1.1); + -ms-transform: scale(1.1); + -o-transform: scale(1.1); + transform: scale(1.1); } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button { position: absolute; @@ -6109,7 +6249,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { display: inline-block; width: 16px; height: 16px; - margin-left: 5px; + margin-left: 0px; background-repeat: no-repeat; background-position: center; background-image: url(../images/close_button.png); @@ -6326,9 +6466,9 @@ tr.dialog-header4 .et2_label { } /********** Operators *******************************/ .dialog-operators { - background-color: #b4b4b4; - border-top: 2px solid #e6e6e6; - border-bottom: 2px solid #e6e6e6; + background-color: rgba(230, 230, 230, 0.02); + border-top: 0px solid #e6e6e6; + border-bottom: 0px solid #e6e6e6; } .dialog-operators td { padding: 2px; diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less index 40b96ab6fa..aaef994c33 100644 --- a/pixelegg/css/pixelegg.less +++ b/pixelegg/css/pixelegg.less @@ -65,5 +65,7 @@ // + + // // \ No newline at end of file diff --git a/pixelegg/images/agt_action_fail.svg b/pixelegg/images/agt_action_fail.svg new file mode 100755 index 0000000000..c8b4189d9e --- /dev/null +++ b/pixelegg/images/agt_action_fail.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/pixelegg/images/logo.svg b/pixelegg/images/logo.svg new file mode 100755 index 0000000000..1ce8cff847 --- /dev/null +++ b/pixelegg/images/logo.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index 48992aef0d..92dcd9512e 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -18,7 +18,7 @@ function show_pixelegg_header(_toggle, _delay) $j("#egw_fw_topmenu_info_items").css("display", "flex"); $j("#egw_fw_topmenu_info_items").css("float", "right"); - $j("#egw_fw_sidebar").animate({'top':'57px'},_delay); + $j("#egw_fw_sidebar").animate({'top':'55px'},_delay); $j("#egw_fw_tabs").animate({'margin-top':'0px'},_delay); $j(".egw_fw_ui_sidemenu_entry_header_active").css("background-position","95% -3000px"); $j(_toggle).parent().removeClass("slidedown"); @@ -46,6 +46,20 @@ function hide_pixelegg_header(_toggle, _delay) $j("#egw_fw_topmenu_info_items").css("position", "fixed"); $j("#egw_fw_topmenu_info_items").css("z-index", "1000"); + + $j(".egw_fw_ui_tabs_header").css("height", "32px"); + + //Tab + $j(".egw_fw_ui_tab_header").css("height", "32px"); + // ICON + $j(".egw_fw_ui_tab_icon").css("height", "17px"); + $j(".egw_fw_ui_tab_icon").css("display", "inline-block"); + $j(".egw_fw_ui_tab_icon").css("margin-right", "5px"); + // H1 + $j(".egw_fw_ui_tabs_header h1").css("float", "none"); + $j(".egw_fw_ui_tabs_header h1").css("display", "inline"); + + $j(_toggle).parent().removeClass("slideup"); $j(_toggle).parent().addClass("slidedown"); } diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less index 2705557d6b..81c6aaf006 100755 --- a/pixelegg/less/def_design_pattern_color_font_shadow.less +++ b/pixelegg/less/def_design_pattern_color_font_shadow.less @@ -126,7 +126,7 @@ /*@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_2_e; /*optional / can field*/ @color_optional : fade(@egw_color_1_e, 10%); @@ -136,17 +136,17 @@ /*Listenausgabe*/ @color_even : @gray_0; -@color_odd : darken(@gray_0, 3%); +@color_odd : darken(@gray_0, 2%); // aktiverte Zeilen in allen APP mit Listenausgabe -@color_active_row : @egw_color_1_a; +@color_active_row : fade(@egw_color_1_a, 1%); // not in use @color_selected_row : @egw_color_1_e; // Mouse over -@color_hover_row : @egw_color_2_e; +@color_hover_row : fade(@egw_color_2_e, 20%); diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 3875647eda..d50bbf112c 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -51,7 +51,7 @@ div.et2_hbox div.et2_hbox { display: inline; } div.et2_hbox { - white-space: nowrap; + white-space: normal; } div.et2_hbox>* { @@ -998,9 +998,10 @@ div.message.floating { .nextmatch_header > .filters input[type=search] { .background_color_search; color: black; - height: 22.21875px; + /*height: 16.21875px;*/ float: left; margin: 5px 0 0 2px; + font-size: 11.2px; } .nextmatch_header > .filters button.et2_button { diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less index 6eb0c6d5ac..7ed8193ea2 100755 --- a/pixelegg/less/jquery-ui.less +++ b/pixelegg/less/jquery-ui.less @@ -100,12 +100,22 @@ option:checked {background-color: @egw_color_1_e;} .color_40_gray; text-decoration: none; } + +.ui-state-focus, +.ui-widget-header .ui-state-focus, +.ui-widget-content .ui-state-focus{ + border-color: @gray_10; + background: @color_hint; + background-image: none !important; + .color_100_gray; + +} + + + .ui-state-hover, .ui-widget-content .ui-state-hover, -.ui-widget-header .ui-state-hover, -.ui-state-focus, -.ui-widget-content .ui-state-focus, -.ui-widget-header .ui-state-focus { +.ui-widget-header .ui-state-hover{ .bordered(1px, 1px, 1px,1px); border-color: @gray_10; // background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; @@ -127,7 +137,6 @@ option:checked {background-color: @egw_color_1_e;} .ui-widget-header .ui-state-active { .bordered(1px, 1px, 1px,1px); border-color: @gray_20; - background: @color_hint; background-image: none; font-weight: bold; .color_50_gray; diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index 02ef6cfbb7..4219a1d1bc 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -14,6 +14,58 @@ @import (reference) "def_design_pattern_color_font_shadow.less"; @import (reference) "def_buttons.less"; + + + /** + * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/) + * http://cssreset.com + */ + html, body, div, span, applet, object, iframe, + h1, h2, h3, h4, h5, h6, p, blockquote, pre, + a, abbr, acronym, address, big, cite, code, + del, dfn, em, img, ins, kbd, q, s, samp, + small, strike, strong, sub, sup, tt, var, + b, u, i, center, + dl, dt, dd, ol, ul, li, + fieldset, form, label, legend, + table, caption, tbody, tfoot, thead, tr, th, td, + article, aside, canvas, details, embed, + figure, figcaption, footer, header, hgroup, + menu, nav, output, ruby, section, summary, + time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + } + /* HTML5 display-role reset for older browsers */ + article, aside, details, figcaption, figure, + footer, header, hgroup, menu, nav, section { + display: block; + } + body { + line-height: 1; + } + ol, ul { + list-style: none; + } + blockquote, q { + quotes: none; + } + blockquote:before, blockquote:after, + q:before, q:after { + content: ''; + content: none; + } + table { + border-collapse: collapse; + border-spacing: 0; + } + + + + /* ####################################################################################### * * @@ -43,6 +95,7 @@ body{ width: 100% !important; height: 100% !important; font-size: 11px; + line-height: 1.28; } @@ -93,23 +146,23 @@ select { // ############################# // Schriftformate -p { font-size: 12px;} +p { font-size: 1em;} li {} h1 { - font-size: 200%; - line-height: 1.2em; + font-size: 1.2em; + line-height: 1.28em; margin: 0.4em 0 0; } h2 { - font-size: 170%; + font-size: 1.15em; line-height: 1.2em; margin: 0.6em 0 0; } h3 { - font-size: 150%; + font-size: 1.1em; line-height: 0.8571em; margin: 0.8571em 0 0; } @@ -142,29 +195,6 @@ 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:before { - content:''; - right:6px; top:0px; - width:20px; height:20px; - background:#f8f8f8; - position:absolute; - pointer-events:none; - display:block; -}*/ div.selectbox-wrapper { @@ -478,7 +508,7 @@ td.lettersearch { h1{ display: inline; - font-size: 10pt; +/* font-size: 10pt;*/ font-weight: bold; } } @@ -513,6 +543,7 @@ form img { border:0; + } diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index e60066dd03..1f400d78de 100755 Binary files a/pixelegg/less/layout_dialog.less and b/pixelegg/less/layout_dialog.less differ diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 58fc1fd1f5..45ea0cd25d 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -54,19 +54,22 @@ .background_color_5_gray; img { - height: 40px; + width: 209px; border: none; + position: absolute; + top: 0.41em; + left: 1em; .background_color_5_gray; } } - - -/* ########################################################################################################################################### - Topmenu / Home / Einstellungen / usw.. - ########################################################################################################################################### -*/ + + + /* ########################################################################################################################################### + Topmenu / Home / Einstellungen / usw.. + ########################################################################################################################################### + */ #egw_fw_topmenu ul, #egw_fw_topmenu > * > ul > li, @@ -82,38 +85,38 @@ float: left; padding-top: 10px; width: 70%; - + ul { li{ .color_100_gray; /*.Button_size_square_32;*/ padding: 0.3em 0.4em; .Complete_Button_normal; - + &:hover{.Complete_Button_hover;.color_100_gray;} &:active {.Complete_Button_active;} .transition (0.2s, ease-out); - + a { .color_100_gray; text-decoration: none; - + &:hover { - .color_50_gray; - border-color: @gray_50; - text-decoration: none !important; - } + .color_50_gray; + border-color: @gray_50; + text-decoration: none !important; } - + } + } /*Home*/ li:first-child{ - margin-left: 10px; - :before{border: none;} - } - + margin-left: 10px; + :before{border: none;} + } + /*home*/ a#topmenu_home { margin-left: 0px; @@ -124,10 +127,10 @@ background-repeat: no-repeat; .dimension_width_height_s; } - + } - + /*Setup / Einstellungen*/ a#topmenu_prefs{ margin-left: 0px; @@ -139,9 +142,9 @@ .dimension_width_height_s; } } - + /*access / Zugriff */ - a#topmenu_acl{ + a#topmenu_acl{ &:before { padding-right: 20px; content: ""; @@ -151,7 +154,7 @@ } } /*category*/ - a#topmenu_cats{ + a#topmenu_cats{ &:before { background-image: url(../images/topmenu_items/category.png); padding-right: 20px; @@ -161,7 +164,7 @@ } } /*password*/ - a#topmenu_preferences{ + a#topmenu_preferences{ &:before { background-image: url(../images/topmenu_items/password.png); padding-right: 20px; @@ -171,7 +174,7 @@ } } /*help*/ - a#topmenu_manual{ + a#topmenu_manual{ &:before { background-image: url(../images/topmenu_items/help.png); padding-right: 20px; @@ -181,7 +184,7 @@ } } /*Search*/ - a#topmenu_search{ + a#topmenu_search{ &:before { background-image: url(../images/topmenu_items/search.png); padding-right: 20px; @@ -226,36 +229,36 @@ float: left; position: fixed; left: 194px; - + } #egw_fw_topmenu_slide.slidedown{ - background-image: url("../images/list.png"); - background-position: center center; - height: 15px; - width: 15px; - display: block; - margin-left: 5px; - margin-top: 10px; - background-size: 15px 15px; - float: left; - position: relative; - left: -5px; - } + background-image: url("../images/list.png"); + background-position: center center; + height: 15px; + width: 15px; + display: block; + margin-left: 5px; + margin-top: 10px; + background-size: 15px 15px; + float: left; + position: relative; + left: -5px; +} #egw_fw_topmenu_slide.slideup{ - background-image: url("../images/slideup.png"); - background-position: center center; - height: 15px; - width: 15px; - display: block; - margin-top: -55px; - margin-left: 40px; + background-image: url("../images/slideup.png"); + background-position: center center; + height: 15px; + width: 15px; + display: block; + margin-top: -55px; + margin-left: 40px; - } - #slidetoggle{ - width: 20px; - height: 20px; - display: block; - } +} +#slidetoggle{ + width: 20px; + height: 20px; + display: block; +} @@ -268,221 +271,221 @@ // ######################################## // quick_add - - span#quick_add { - border: 1px solid rgba(0, 0, 0, 0.15); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); - float: right; - padding: 0.5em; - position: fixed; - right: 83px; - top: 5px; - .dimension_width_height_s; - &:before {content: "+"; font-size: 2em; color: @egw_color_1; line-height: 0.6em} - } - - select#quick_add_selectbox { - - visibility: hidden; - border: medium none; - box-shadow: 0 0 0 rgba(0, 0, 0, 0); - position: relative !important; - right: 1px !important; - top: -5px; -} - - - -/* span#quick_add{ - .Complete_Button_add; - .Button_size_square_16; - .border_normal; - .box_shadow_standard_light; + span#quick_add { + border: 1px solid rgba(0, 0, 0, 0.15); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); float: right; + padding: 0.5em; position: fixed; right: 83px; top: 5px; - padding: 0.5em; + .dimension_width_height_s; &: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{ - 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; - } - } + select#quick_add_selectbox { + + visibility: hidden; + border: medium none; + box-shadow: 0 0 0 rgba(0, 0, 0, 0); + position: relative !important; + right: 1px !important; + top: -5px; + + } + + /* span#quick_add{ + .Complete_Button_add; + .Button_size_square_16; + .border_normal; + .box_shadow_standard_light; + float: right; + position: fixed; + 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); - - hover - span#quick_add:hover { - - width: 166px !important; - .box_shadow_standard_light_hover; - - select#quick_add_selectbox { + 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; + } + } + + + + + hover + span#quick_add:hover { + + width: 166px !important; .box_shadow_standard_light_hover; - .box_shadow_none; - border: none; - position: relative !important; - right: 1px !important; - top: -5px; - z-index: 200; - visibility: visible !important; - } - - }*/ - - } - - + + 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 { - background-image: url(../images/logout.png); - background-size: 16px 16px; - background-position: center center; - background-repeat: no-repeat; - cursor: pointer; - display: inline-block; - float: right; - margin-right: 1em; - margin-top: 0px; - z-index: 200; - .Button_size_square_16; - .border_normal; - .box_shadow_standard_light; - padding: 0.5em; - top: 5px; - position: fixed; - right: 5px; - - - &:hover {.box_shadow_standard_light_hover;} - &:active {.Complete_Button_active;} - &:focus {.box_shadow_standard_light_inset;} - } +} - // Print +// Logout +#egw_fw_logout { + background-image: url(../images/logout.png); + background-size: 16px 16px; + background-position: center center; + background-repeat: no-repeat; + cursor: pointer; + display: inline-block; + float: right; + margin-right: 1em; + margin-top: 0px; + z-index: 200; + .Button_size_square_16; + .border_normal; + .box_shadow_standard_light; + padding: 0.5em; + top: 5px; + position: fixed; + right: 5px; - #egw_fw_print { - background-image: url(../images/print.png); - background-size: 16px 16px; - background-position: center center; - background-repeat: no-repeat; - cursor: pointer; - display: inline-block; - float: right; - margin-right: 5px; - margin-top: 0px; - position: fixed; - .Button_size_square_16; - .border_normal; - .box_shadow_standard_light; - padding: 0.5em; - top: 5px; - right: 45px; - z-index: 200; - &:hover {.box_shadow_standard_light_hover;} - &:active {.Complete_Button_active;} - &:focus {.box_shadow_standard_light_inset;} - } + &:hover {.box_shadow_standard_light_hover;} + &:active {.Complete_Button_active;} + &:focus {.box_shadow_standard_light_inset;} +} - /*Name / Datum / angemeldete User*/ +// Print - #egw_fw_topmenu_info_items { +#egw_fw_print { + background-image: url(../images/print.png); + background-size: 16px 16px; + background-position: center center; + background-repeat: no-repeat; + cursor: pointer; + display: inline-block; + float: right; + margin-right: 5px; + margin-top: 0px; + position: fixed; + .Button_size_square_16; + .border_normal; + .box_shadow_standard_light; + padding: 0.5em; + top: 5px; + right: 45px; + z-index: 200; + &:hover {.box_shadow_standard_light_hover;} + &:active {.Complete_Button_active;} + &:focus {.box_shadow_standard_light_inset;} - /*postion : top*/ - bottom: 0px; - right: 5px; - padding-right: 0px; - position: relative; - z-index: 1000; - margin-right: 20px; +} - float: right; - - display: flex; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - - flex-direction: row; - justify-content: flex-start; - - -webkit-flex-direction: row; - -webkit-justify-content: flex-start; - -ms-flex-direction: row; - -ms-justify-content: flex-start; - - - /*postion: bottom*/ -/* bottom: 3px; - right: 5px; - padding-right: 20px; - position: fixed; - z-index: 1000;*/ - .topmenu_info_item { - - overflow: visible; - // Info Bell - &:nth-child(1) { - } +/*Name / Datum / angemeldete User*/ - // Name - &:nth-child(2) { - /*float: right;*/ - margin-top: 0; - font-size: 1em; - padding-right: 5px; +#egw_fw_topmenu_info_items { - } + /*postion : top*/ + bottom: 0px; + right: 5px; + padding-right: 0px; + position: relative; + z-index: 1000; + margin-right: 20px; - // angemeldete User - &:nth-child(3) { - position: relative; - top: 0px; - display: inline-block; + float: right; - &:hover {.box_shadow_standard_light_hover;} - &:focus {.box_shadow_standard_light_inset;} + display: flex; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; - &:before {content: "| ";font-size: 1em;color: @egw_color_2_a;} + flex-direction: row; + justify-content: flex-start; - } + -webkit-flex-direction: row; + -webkit-justify-content: flex-start; + -ms-flex-direction: row; + -ms-justify-content: flex-start; - // Add - &:nth-child(4) { - } + /*postion: bottom*/ + /* bottom: 3px; + right: 5px; + padding-right: 20px; + position: fixed; + z-index: 1000;*/ + + .topmenu_info_item { + + overflow: visible; + + // Info Bell + &:nth-child(1) { + } + + // Name + &:nth-child(2) { + /*float: right;*/ + margin-top: 0; + font-size: 1em; + padding-right: 5px; } - } - // Ende items + // angemeldete User + &:nth-child(3) { + position: relative; + top: 0px; + display: inline-block; + + &:hover {.box_shadow_standard_light_hover;} + &:focus {.box_shadow_standard_light_inset;} + + &:before {content: "| ";font-size: 1em;color: @egw_color_2_a;} + + } + + // Add + &:nth-child(4) { + + } + + } + +} +// Ende items @@ -521,41 +524,35 @@ // Alle Tabs div.ui-sortable { - + div { padding: 3px 0 1px 3px; cursor: pointer; - - - - } - - } - - .egw_fw_ui_sidemenu_entry_header { - + + + } + + } + + .egw_fw_ui_sidemenu_entry_header { display: block; margin: 0 0; /*padding: 0px 5px 5px 10px;*/ - &:hover { + &:hover { .background_color_15_gray; .rounded(5px); - } - - &:active {.box_shadow_standard_light_inset;} + } + + &:active {.box_shadow_standard_light_inset;} h1 { - font-size: 1em; - font-weight: normal; margin: 0 0 10px 0; padding-top: 0.31em; .color_40_gray; - } - } @@ -572,17 +569,15 @@ /*background-image: none;*/ .background_color_10_gray; - .border_radius ( 5px, 0px, 0px, 27px ); - .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;} + height: 30px; + img {padding-left: 9px; padding-top: 6px;} - 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: .8em;} &:hover {.box_shadow_standard_light_hover; .border_radius ( 5px, 0px, 0px, 27px );} &:active {.box_shadow_standard_light_active; .border_radius ( 5px, 0px, 0px, 27px );} @@ -595,8 +590,8 @@ .background_color_25_gray; } - - + + .egw_fw_ui_ajaxloader {margin-top: -26px;} @@ -620,13 +615,13 @@ .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); - } + + /*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); + } // Schaltflächen // Normal @@ -637,9 +632,9 @@ // border-top: 7px solid; border-color: @gray_30; background-color: @gray_10; - + /*background-color: @egw_color_2_d;*/ - + .border_radius(3px,3px,3px,3px); h1 { @@ -650,12 +645,12 @@ background-repeat:no-repeat; background-position:left center; } - + &:last-child { - color:#ff0000; - background-color: yellow !important; - } - + color:#ff0000; + background-color: yellow !important; + } + } // Hover @@ -663,46 +658,46 @@ .background_color_40_gray; padding: 0.5em 1em; } - - - - /*######################*/ + + + + /*######################*/ // Active State .egw_fw_ui_category_active { border-bottom-width: 0px; margin-top: 4px; - + background-color: @egw_color_2_d; - + /*.background-color-50-gray;*/ .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;} - } - - a:hover { - padding: 5px 30px 5px 0px; - width: 200px; - .background_color_10_gray; - .color_50_gray; - .Complete_Button_hover; - } + img {height: 16px; width: 16px;} } - &:hover {background-color: @egw_color_2_a; .transition (0.2s, ease-out);} + 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);} } - - + + } @@ -717,28 +712,28 @@ .egw_fw_ui_sidemenu_entry_icon { display: inline-block; .dimension_height_m; - + padding-left: 0; padding-right: 10px; float: left; - - /*filter grey*/ - filter: url("data:image/svg+xml;utf8,#grayscale"); /* Firefox 10+, Firefox on Android */ - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(100%); - -o-filter: grayscale(100%); - filter: grayscale(100%); - /*filter: url(grayscale.svg); Firefox 4+ */ - filter: gray; /* IE 6-9 */ - } + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); /* Firefox 10+, Firefox on Android */ + + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(100%); + -o-filter: grayscale(100%); + filter: grayscale(100%); + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: gray; /* IE 6-9 */ + } } } - + /*#################################*/ // Trenner (Splitter) #egw_fw_splitter { @@ -746,7 +741,7 @@ // background-color: RGB(200, 200, 255); .background_color_30_gray; width: 5px; - top: 51px; + top: 36px; bottom: 3px; right: 0px; @@ -788,21 +783,21 @@ padding-top: 14px; margin-right: 5px; /*min-height: 50px;*/ - + img { .dimension_height_s; vertical-align: middle;} - + &:hover { .background_color_0_gray; border-color: @gray_50; } - + input#uical_select_owner_multiple{ .dimension_height_s; - vertical-align: middle; + vertical-align: middle; + } + select#calendar_filter{ + margin-top: 4px; } - select#calendar_filter{ - margin-top: 4px; - } // Favoriten anlegen und löschen .sidebox-favorites{} // ist in etemplate2.less definiert @@ -833,10 +828,10 @@ float: left; /*.Complete_Button_Icon_normal;*/ background-image: url("../images/bullet.png"); - background-size: .dimension_width_height_s; - - background-position: center; - /*&:hover {height: 16px; .Complete_Button_Icon_hover ;}*/ + background-size: .dimension_width_height_s; + + background-position: center; + /*&:hover {height: 16px; .Complete_Button_Icon_hover ;}*/ } input { @@ -932,7 +927,7 @@ .color_100_gray; background-color: @egw_color_1_e; padding: 0.5em 0; - + } } // .egw_fw_ui_sidemenu_listitem @@ -1000,7 +995,7 @@ .egw_fw_content_browser_div { display: block; - /*overflow: auto;*/ + /*overflow: auto;*/ /* background-color: RGB(240, 240, 255);*/ } @@ -1130,18 +1125,19 @@ div#calendar-container { .egw_fw_ui_tabs_header { - margin: -1px 0 0 0; - + margin: 0px 0 0 0; + padding: 0px 1px 0px 1px; background-position: bottom; background-repeat: repeat-x; background-color: transparent; - - height: 48px; + + .dimension_height_l; h1 { - float: left; + /*float: left;*/ + display: inline; width: 100%; text-align: center; -webkit-margin-before: 0; @@ -1152,6 +1148,7 @@ div#calendar-container { text-align:center; float: none; margin: 0 auto; + .dimension_width_height_s; } @@ -1172,12 +1169,12 @@ div#calendar-container { padding-right: 0; position: relative; - .border_radius(5px,0, 0, 5px); - + .border_radius(5px,0, 0, 5px); + /*.background-color-5-gray;*/ background: transparent; - + display: inline-block; margin: 3px 5px 0px 0px; /*padding: 2px 10px 2px 10px;*/ @@ -1188,20 +1185,24 @@ div#calendar-container { background-repeat:repeat-x; - height: 47px; + .dimension_height_m; &:hover {.background_color_30_gray ;} - h1 {font-size: 100%; line-height: 1em; margin-top:0;} - + h1 { + font-size: 100%; + line-height: 1em; + margin:0 15px 2px 3px; + vertical-align: super; + } + // Bilder img.egw_fw_ui_tab_icon { display: inline-block; - .dimension_height_m; - margin-right: 5px; - margin-top: 5px; + .dimension_width_height_s; + margin: 5px 1px 0 1em; + + } - } - } .egw_fw_ui_tab_header_active { @@ -1211,17 +1212,21 @@ div#calendar-container { background-image:none !important; &:hover {.background_color_25_gray ;} - - - // aktive Bilder - img.egw_fw_ui_tab_icon { - display: inline-block; - .dimension_height_m; - margin-right: 5px; - margin-top: 5px; - } - + + // aktive Bilder + img.egw_fw_ui_tab_icon { + display: inline-block; + .dimension_width_height_s; + -webkit-transform: scale(1.1); + -moz-transform: scale(1.1); + -ms-transform: scale(1.1); + -o-transform: scale(1.1); + transform: scale(1.1); + + + } + } @@ -1242,7 +1247,7 @@ div#calendar-container { display: inline-block; width: 16px; height: 16px; - margin-left: 5px; + margin-left: 0px; background-repeat: no-repeat; background-position: center; background-image: url(../images/close_button.png); @@ -1281,21 +1286,21 @@ div#calendar-container { .egw_fw_ui_tab_content { - + width: 100%; padding: 0px; margin: 0; overflow: auto; - + > div { width: 100%; padding: 0 0 0 0; - + }; - + } @@ -1304,4 +1309,4 @@ div#calendar-container { // -// \ No newline at end of file +// \ No newline at end of file diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less index 82464c952e..6bb566c6fa 100755 --- a/pixelegg/less/layout_table.less +++ b/pixelegg/less/layout_table.less @@ -26,19 +26,13 @@ // Header der APP Tabellen table.et2_grid { - /* border-top: 3px solid; - border-color: @gray-10;*/ - // border-collapse: collapse; - // .background-color-0-gray; - // width: 100% !important; - // display: block; + } .innerContainer{ - overflow:hidden; + overflow:auto; /*padding: 0;*/ - margin: 2px; } // Table Head in Listen @@ -76,38 +70,22 @@ table.egwGridView_outer{ 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+ - background: -webkit-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); Chrome10+,Safari5.1+ - background: -o-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); Opera 11.10+ - background: -ms-linear-gradient(top, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); IE10+ - background: linear-gradient(to bottom, rgba(240,240,240,0) 0%,rgba(191,191,191,0.65) 100%); W3C - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf',GradientType=0 ); IE6-9 */ - tr { - // .background-color-5-gray; th { - /*.background-color-50-gray;*/ background: transparent; .gradient(); font-weight: normal; padding: 0px; -/* border-width: 1px; - border-style: solid;*/ border-color: @gray_30; border-left: 0px solid transparent; border-top: 0px solid transparent; border-right: 0px solid transparent; border-bottom: 0px solid transparent; - /* background-image: none; - background-position: center; - background-repeat: repeat-x;*/ vertical-align: top; overflow: auto; @@ -168,10 +146,15 @@ table.egwGridView_outer{ td.frame { - border: 1px solid @gray_100; - padding: 0px 5px; + border: 1px solid @gray_10; + /*padding: 0px 5px; no need*/ } + + img { + .gradient-vertical (@egw_color_2_a, @egw_color_2_a); + .Complete_Button_Icon_normal; + }; } } @@ -205,15 +188,16 @@ table.egwGridView_grid{ tr.selected{ - - background: fade(@color_selected_row, 20%) !important; + background-image: none; + background: fade(@color_selected_row, 20%); /*.bw-gradient;*/ } // is active tr.focused{ - - background: fade(@color_active_row, 50%) !important; + background-image: url(../images/focused_hatching.png); + background-repeat: repeat; + background-color: fade(@color_active_row, 50%); } } @@ -224,7 +208,7 @@ table.egwGridView_grid{ border-color: @gray_50; // Hover State - &:hover {background: fade(@color_hover_row, 40%) !important;} + &:hover {background: @color_hover_row !important;} @@ -316,4 +300,20 @@ table.egwGridView_grid{ background: none; } + + + /*Custom Fields*/ + table.customfields{ + + tbody tr:nth-child(2n) {background: inherit;} + + tr {background-color: inherit !important;} + + td { + line-height: 11px; + + span > div {display: inherit; margin: 0px;} + } + } + // \ No newline at end of file