From 94da9b49279bc46d7e2bf7cfab058a529adde52a Mon Sep 17 00:00:00 2001 From: Stefan Reinhardt Date: Mon, 10 Mar 2014 16:13:32 +0000 Subject: [PATCH] pending changes --- pixelegg/css/pixelegg.css | 318 ++++++++++++++++++++------------------ 1 file changed, 164 insertions(+), 154 deletions(-) diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index c412fe32a9..91e5668dc9 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -442,104 +442,41 @@ } /* ################################################################################## * Nextmatch widget + * + * SEARCH FIELD | SEARCH BUTTON ###### FILTER ##### EXPORT IMG ### FAVORITES ### COUNT + * * ##################################################################################*/ .et2_nextmatch { background-color: #f0f0f0; } + .et2_nextmatch .nextmatch_header { + border: none; + background-image: none; + background-color: #cdcdcd; + margin-bottom: 3px; + margin: 0; + } .et2_nextmatch > img { width: 16px; height: 16px; } .ui-helper-clearfix { - background-color: gray_20; - } - .nextmatch_header .header_count { - position: relative; - top: 3px; - height: 22px; - height: 24px; - border: 1px solid #E0E0E0; - float: right; - margin: 6px 11px 0; - padding: 0 20px; - text-align: center; - font-size: 11px; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - color: #000000; - } - .nextmatch_header .header_count span { - font-size: 11px; - top: 4px; - position: relative; + background-color: #cdcdcd; } /*################################################################ * -* Filters +* Search Field * ################################################################*/ - .nextmatch_header > .filters { - width: 100%; - margin-bottom: 4px; - padding: 0 5px 0 0; - background-color: #b4b4b4; - border: none !important; - border-color: #000000; - background-image: none !important; - min-height: 37px; - -webkit-border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - -webkit-border-bottom-left-radius: 0px; - -webkit-border-top-left-radius: 0px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; - -moz-border-radius-bottomleft: 0px; - -moz-border-radius-topleft: 0px; - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 0px; - border-top-left-radius: 0px; - /*.background-clip(padding-box);*/ - } - .nextmatch_header > .filters select { - margin-top: 10px; - } - .nextmatch_header > .filters .et2_label { - padding: 0.2em; - } - .nextmatch_header > .filters .et2_label select { - /*.Complete_Button_select;*/ - margin-left: 2px; - margin-right: 1px; - margin-top: 8px; - max-width: 14% !important; - /*Dialog - Addressbook - View */ - } - .nextmatch_header > .filters .et2_label select:hover { - -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 { - width: 50% !important; - } - .nextmatch_header > .filters > select > option { - font-size: 11px; - } .nextmatch_header > .search { - padding: 0 0 0 3px; + padding: 0 0 0 0px; margin-right: 3px; margin-left: 15px; + width: 200px; + z-index: 100; + white-space: nowrap; /*.background_color_search;*/ - -webkit-border-radius: 3px; - -webkit-border-top-right-radius: 20px; - -moz-border-radius: 3px; - -moz-border-radius-topright: 20px; - border-radius: 3px; - border-top-right-radius: 20px; + /*.border_radius_button_righttop;*/ } .nextmatch_header > .search input { /*.background_color_search;*/ @@ -548,6 +485,7 @@ font-size: 11px; color: #000000; padding: 3px; + width: 150px; } .nextmatch_header > .search input::-webkit-input-placeholder { /* WebKit browsers */ @@ -612,6 +550,54 @@ box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); /*background-color: @color_positive_action_active !important;*/ } + /*################################################################ +* +* Filters +* +################################################################*/ + .nextmatch_header > .filters { + /*width: 83%;*/ + z-index: 7; + margin-bottom: 4px; + top: 0px; + padding: 0 5px 0 0; + /*background-color: @gray_30;*/ + background: transparent; + border: none !important; + /*border-color: @gray_100;*/ + background-image: none !important; + min-height: 37px; + margin-left: 224px; + margin-right: 119px; + /* .border_radius (3px, 3px, 0px, 0px);*/ + } + .nextmatch_header > .filters select { + margin-top: 10px; + } + .nextmatch_header > .filters .et2_label { + padding: 0.2em; + } + .nextmatch_header > .filters .et2_label select { + /*.Complete_Button_select;*/ + margin-left: 2px; + margin-right: 1px; + margin-top: 8px; + width: 20%; + max-width: 20% !important; + /*Dialog - Addressbook - View */ + } + .nextmatch_header > .filters .et2_label select:hover { + -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 { + width: 50% !important; + } + .nextmatch_header > .filters > select > option { + font-size: 11px; + } .nextmatch_header > .filters input { margin-right: 2ex; width: 15%; @@ -640,6 +626,11 @@ -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); } + /*################################################################ +* +* Export Button +* +################################################################*/ .nextmatch_header > .filters .et2_button_icon { margin-top: 8px; vertical-align: middle; @@ -678,20 +669,40 @@ box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); background-color: #1aa200; } - .et2_nextmatch .nextmatch_header { - border: none; - background-image: none; - background-color: #cdcdcd; - margin-bottom: 3px; - margin: 0; - } - .et2_nextmatch .nextmatch_header > .filters { - border: 1px solid #e6e6e6; - background-color: #cdcdcd; + /*.et2_nextmatch .nextmatch_header > .filters { + border: 1px solid @gray_10; + background-color: @gray_20; background-image: url(../images/header_overlay.png); background-position: center; background-repeat: repeat-x; margin-bottom: 3px; +}*/ + /*################################################################ +* +* count +* +################################################################*/ + .nextmatch_header .header_count { + position: relative; + top: 1px; + height: 22px; + height: 24px; + border: 1px solid #E0E0E0; + float: right; + margin: 6px 11px 0; + padding: 0 20px; + text-align: center; + font-size: 11px; + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color: #000000; + } + .nextmatch_header .header_count span { + font-size: 11px; + top: 4px; + position: relative; } /*################################################################ * @@ -755,13 +766,11 @@ * ################################################################*/ .nextmatch_header div[id$=favorite_wrapper] { - /* margin-top: 6px; - vertical-align: middle;*/ - /*.box_shadow_standard_light;*/ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; background-color: #bfbfbf; + z-index: 200; } /** * Drop down button @@ -825,12 +834,12 @@ .sidebox-favorites ul.favorites li.ui-menu-item { margin-left: 0px; min-height: 16px; - padding: 5px 0px; + padding: 3px 0px; } .sidebox-favorites ul.favorites li.ui-menu-item:hover { color: #000000; background-color: #ffdd73; - padding: 0.5em 0; + padding: 3px 0; } .sidebox-favorites ul.favorites li.ui-menu-item a { line-height: inherit; @@ -1050,8 +1059,7 @@ option:checked { /* Component containers ----------------------------------*/ .ui-widget { - font-family: Verdana, Helvetica, Sans-Serif; - /* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/ + font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif; font-size: 1.1em; } .ui-widget .ui-widget { @@ -1061,9 +1069,8 @@ option:checked { .ui-widget select, .ui-widget textarea, .ui-widget button { - font-family: Verdana, Helvetica, Sans-Serif; - /* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/ - font-size: 1em; + font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif; + font-size: 11px; } .ui-widget-content { /*.bordered (@color-hint,@color-hint,@color-hint,@color-hint);*/ @@ -1251,10 +1258,26 @@ span.ui-icon-close { } /*###########################################*/ /*Menu */ +.ui-menu .ui-menu-item { + padding: 0px; +} .ui-menu .ui-menu-item a { - line-height: 26px; + line-height: 24px; + margin: 0px; padding: 2px 5px; } +.ui-menu .ui-menu-item a input { + padding: 0; +} +.ui-menu .ui-menu-item a img { + padding: 0; +} +.ui-menu .ui-menu-item a.ui-state-focus { + margin: 0px !important; + line-height: 24px; + padding: 2px 5px; + border: none; +} /*###########################################*/ /* col selection */ span.ui-multiselect-header { @@ -1976,7 +1999,7 @@ body { } ol, ul { - list-style: none; + /*list-style: none;*/ } blockquote, q { @@ -2038,8 +2061,7 @@ body { } body, textarea { - font-family: Verdana, Helvetica, Sans-Serif; - /* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/ + font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif; } #egw_fw_basecontainer { position: fixed; @@ -2047,8 +2069,7 @@ textarea { height: 100%; padding: 0px; margin: 0px; - font-family: Verdana, Helvetica, Sans-Serif; - /* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/ + font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif; background-color: #fafafa; } input { @@ -2058,7 +2079,6 @@ input { &:focus{.Complete_Button_input_focus;}*/ } select { - /*.Complete_Button_select;*/ padding: 3px; margin: 0; -webkit-border-radius: 3px; @@ -2187,8 +2207,7 @@ div.selectbox-wrapper ul li { -moz-appearance: none; appearance: none; cursor: pointer; - font-family: Verdana, Helvetica, Sans-Serif; - /* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/ + font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif; font-size: 1.2em; font-weight: normal; height: 30px; @@ -3478,6 +3497,16 @@ table.egwGridView_grid tr td span { table.egwGridView_grid tr td span[id*="[info_subject]"] { margin-right: 30px; } +table.egwGridView_grid tr td span.high { + color: red; +} +table.egwGridView_grid tr td span.urgent { + color: red; + background-color: #ffdd73; +} +table.egwGridView_grid tr td span.low { + color: #373737; +} table.egwGridView_grid tr td table.customfields tbody { border-bottom: 0px; } @@ -4116,44 +4145,28 @@ table.nextmatch_header img { box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); } #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; - 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); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - padding: 0.5em; - top: 5px; - right: 40px; - z-index: 200; -} -#egw_fw_print:hover { - -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); - -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_print: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); + display: none; + /* 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; + .border_radius_button_normal; + padding: 0.5em; + top: 5px; + right: 40px; + z-index: 200; + &:hover {.box_shadow_standard_light_hover;} + &:active {.Complete_Button_active;} + &:focus {.box_shadow_standard_light_inset;}*/ } /*################################################# /* Second Line @@ -4234,7 +4247,7 @@ table.nextmatch_header img { float: right; padding: 0.5em; position: fixed; - right: 80px; + right: 45px; top: 5px; background-image: url(../images/add.png); background-repeat: no-repeat; @@ -4283,7 +4296,7 @@ table.nextmatch_header img { box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); padding: 5px; top: 6px; - right: 115px; + right: 88px; z-index: 200; background-color: #ff0000; -moz-transition: all 1s ease-in-out; @@ -4746,9 +4759,6 @@ table.nextmatch_header img { height: 16px; vertical-align: middle; } -.egw_fw_ui_category_content select#calendar_filter { - margin-top: 4px; -} .egw_fw_ui_sidemenu_listitem { padding: 0.5em 0; margin: 0px 0 5px 0px; @@ -5280,8 +5290,6 @@ table.dialog-main-view { } .dialogHeader input.et2_textbox { font-size: 1.3em; - width: 550px; - margin-right: 20px; } .dialogHeader .et2_label { color: #000000; @@ -5361,6 +5369,8 @@ tr.dialogHeader4 .et2_label { /*Buttons / Toolbar*/ .dialogFooterToolbar { background-color: #679fd2; + margin: 10px 0 0 0; + padding: 3px; /*.et2_selectbox {height: 32px; top: 0px; font-size: 1em;}*/ } .dialogFooterToolbar td {