From 5406f80fd638f98b2583c7b523c9d9dbfda44d02 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 15 Jan 2014 13:45:44 +0000 Subject: [PATCH] pixelegg changes from wednesday, new/changed images and styles --- pixelegg/css/pixelegg.css | 221 ++++++++++-------- pixelegg/css/pixelegg.less | 1 + pixelegg/images/abbruch.svg | 1 + pixelegg/images/about.svg | 10 +- pixelegg/images/access.svg | 1 + pixelegg/images/accounts.svg | 1 + pixelegg/images/add.svg | 1 + pixelegg/images/advanced-search.svg | 1 + pixelegg/images/agt_action_fail.svg | 1 + pixelegg/images/agt_action_success.svg | 1 + pixelegg/images/agt_reload.svg | 1 + pixelegg/images/alarm.svg | 1 + pixelegg/images/apply.svg | 1 + pixelegg/images/archive.svg | 1 + pixelegg/images/arrow_down.svg | 1 + pixelegg/images/arrow_left.svg | 1 + pixelegg/images/arrows.svg | 1 + pixelegg/images/attach.svg | 1 + pixelegg/images/back.svg | 1 + pixelegg/images/bearbeiten.svg | 1 + pixelegg/images/billed.svg | 1 + pixelegg/images/bookable.svg | 1 + pixelegg/images/bullet.svg | 1 + pixelegg/images/bullet_bullet.svg | 1 + pixelegg/images/button_createdir.svg | 1 + pixelegg/images/buttonseparator.svg | 1 + pixelegg/images/buyable.svg | 1 + pixelegg/images/cake.svg | 1 + pixelegg/images/calendar.svg | 1 + pixelegg/images/calicon.svg | 1 + pixelegg/images/call.svg | 1 + pixelegg/images/cancel.svg | 1 + pixelegg/images/cancelled.svg | 1 + pixelegg/images/check.svg | 1 + pixelegg/images/clear_left.svg | 1 + pixelegg/images/close.svg | 1 + pixelegg/images/close_button.svg | 1 + pixelegg/images/cnr-pending.svg | 1 + pixelegg/images/configure.svg | 1 + pixelegg/images/continue.svg | 17 ++ pixelegg/images/copy.svg | 0 pixelegg/images/cut.svg | 0 pixelegg/images/date.svg | 23 ++ pixelegg/images/datepopup.svg | 16 ++ pixelegg/images/delete.svg | 19 ++ pixelegg/images/deleted.svg | 0 pixelegg/images/dialog_help.svg | 17 ++ pixelegg/images/dialog_info.svg | 0 pixelegg/images/dialog_warning.svg | 0 pixelegg/images/done.svg | 19 +- pixelegg/images/done_all.svg | 17 +- pixelegg/images/export.svg | 15 ++ .../def_design_pattern_color_font_shadow.less | 10 + pixelegg/less/etemplate2.less | 64 +++-- pixelegg/less/layout_content_elements.less | 1 + pixelegg/less/layout_dialog.less | 8 + pixelegg/less/layout_messages.less | 3 +- pixelegg/less/layout_raster.less | 132 ++++------- pixelegg/less/layout_table.less | 16 +- pixelegg/less/svg.css | 30 ++- pixelegg/less/svg.less | 38 +++ 61 files changed, 474 insertions(+), 239 deletions(-) create mode 100755 pixelegg/images/continue.svg create mode 100755 pixelegg/images/copy.svg create mode 100755 pixelegg/images/cut.svg create mode 100755 pixelegg/images/date.svg create mode 100755 pixelegg/images/datepopup.svg create mode 100755 pixelegg/images/delete.svg create mode 100755 pixelegg/images/deleted.svg create mode 100755 pixelegg/images/dialog_help.svg create mode 100755 pixelegg/images/dialog_info.svg create mode 100755 pixelegg/images/dialog_warning.svg create mode 100755 pixelegg/images/export.svg create mode 100755 pixelegg/less/svg.less diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index b0c3ec8aa6..a4635e93bc 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -633,7 +633,7 @@ action buttons, left aligned for "extra" controls position: fixed; border: 1px solid #897f51; padding: 3px; - background-color: rgba(103, 159, 210, 0.1); + background-color: #ffffff; max-width: 300px; color: black; } @@ -1199,11 +1199,15 @@ action buttons, left aligned for "extra" controls display: none; } .favorites .sideboxstar { - background-image: url("../images/bullet.png"); + background-image: url("../images/bullet.svg"); background-repeat: no-repeat; + background-size: contain; width: 12px; height: 12px; } + .sidebox-favorites { + /*ul*/ + } .sidebox-favorites ul.favorites { width: 99%; padding: 0px; @@ -1211,9 +1215,9 @@ action buttons, left aligned for "extra" controls background: white; } .sidebox-favorites ul.favorites li { - padding-left: 0 !important; + padding-left: 1em !important; margin-left: 0px; - line-height: 2.5em; + line-height: 2em; } .sidebox-favorites ul.favorites li img { margin: 0px 5px; @@ -1257,6 +1261,13 @@ action buttons, left aligned for "extra" controls -moz-border-radius: 3px; border-radius: 3px; } + .sidebox-favorites ul.favorites li a div.sideboxstar { + display: none; + } + .sidebox-favorites ul.favorites li a div.ui-icon-trash { + margin-top: -1px; + margin-right: 2px; + } .sidebox-favorites .ui-state-hover, .sidebox-favorites .ui-widget-content .ui-state-hover, .sidebox-favorites .ui-widget-header .ui-state-hover, @@ -1287,13 +1298,19 @@ action buttons, left aligned for "extra" controls -moz-border-radius: 3px; border-radius: 3px; } + .sidebox-favorites .ui-menu { + /*li*/ + } + .sidebox-favorites .ui-menu .ui-menu-item { + width: 93%; + } .sidebox-favorites .ui-menu .ui-menu-item:hover { background-color: #ffdd73; } .sidebox-favorites .ui-menu .ui-menu-item a { line-height: inherit; padding: 2px 0px; - padding-left: 0 !important; + padding-left: 5px !important; } .sidebox-favorites .ui-menu .ui-menu-item a:hover { text-decoration: underline; @@ -1303,6 +1320,9 @@ action buttons, left aligned for "extra" controls width: 16px; height: 16px; } + .sidebox-favorites .ui-menu .ui-menu-item a div.ui-icon-heart { + display: none; + } .sidebox-favorites div.ui-icon-heart { position: relative; float: left; @@ -1311,20 +1331,18 @@ action buttons, left aligned for "extra" controls background-image: none; } .sidebox-favorites div.ui-icon-trash { - background-image: url(../images/delete.png); + margin-top: 0px; + margin-right: 2px; + background-image: url(../images/delete.svg); background-size: 16px 16px; background-position: 0 0; - background-color: #e6e6e6; - -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); - box-shadow: 1px 1px 1px 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; - margin-right: 0.5em; - padding: 0px 2px 0 2px; - width: 10px; + background-color: #000; + -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: 2px; + -moz-border-radius: 2px; + border-radius: 2px; } .nextmatch_sortheader { color: #003075; @@ -2266,9 +2284,9 @@ span.ui-icon-search { border-width: 9px 0px 0px 0px; border-style: solid; border-color: #b4b4b4; - -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-box-shadow: 6px 2px 1px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 6px 2px 1px rgba(0, 0, 0, 0.5); + box-shadow: 6px 2px 1px rgba(0, 0, 0, 0.5); padding: 1em; } #egwpopup input#egwpopup_ok_button, @@ -2973,6 +2991,8 @@ input.egwbutton:active { input[type=image] { cursor: pointer; border: 0; + width: 16px; + height: 16px; } #thesideboxcolumn { width: 177px; @@ -3663,6 +3683,10 @@ table.egwGridView_outer thead tr th:active { box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); border-bottom: 1px solid silver; } +table.egwGridView_outer thead tr th div.innerContainer { + max-height: 7em; + overflow-y: auto; +} table.egwGridView_outer thead tr th.optcol { padding: 0; text-align: center; @@ -3726,6 +3750,11 @@ table.egwGridView_grid { table.egwGridView_grid img { height: 16px; } +table.egwGridView_grid img.iphoto { + height: 9em; + margin: 0.2em; + max-height: 60px; +} table.egwGridView_grid tbody { border-bottom: 1px solid #000000; /*padding: 2px 3px 2px 4px;*/ @@ -3832,6 +3861,11 @@ table.customfields td span > div { display: inherit; margin: 0px; } +/*########################################################*/ +table.nextmatch_header img { + width: 16px; + height: 16px; +} /** * EGroupware: Stylite Pixelegg template * @@ -4330,62 +4364,6 @@ table.customfields td span > div { Add / Print / Logout / - Name / Date ###################################################*/ -#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; - } - } - - - - - 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; - } - - }*/ -} #egw_fw_topmenu_addons span#quick_add { border: 1px solid rgba(0, 0, 0, 0.15); box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); @@ -4594,6 +4572,11 @@ table.customfields td span > div { padding-left: 3em; color: #999999; } +#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { + background-color: #ffffff; + width: 24px; + height: 24px; +} #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active { cursor: pointer; /*background-image: url("../images/header_active.png");*/ @@ -4679,6 +4662,15 @@ table.customfields td span > div { box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); background-color: #bfbfbf; } +#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active object { + margin-left: 14px; + margin-top: 8px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + width: 16px; + height: 16px; +} #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header_active .egw_fw_ui_ajaxloader { margin-top: -26px; } @@ -4774,6 +4766,9 @@ table.customfields td span > div { color: #ff0000; background-color: yellow !important; } +#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category div.egw_fw_ui_category:nth-last-of-type(-n+3) img.egw_fw_ui_sidemenu_listitem_icon { + display: block; +} #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category:hover { background-color: #999999; padding: 0.5em 1em; @@ -4849,11 +4844,6 @@ table.customfields td span > div { /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ - /* path {color: red} - - svg:hover path {fill: red;} - - filter: hue-rotate(90deg);*/ } #egw_fw_sidebar #egw_fw_splitter { position: absolute; @@ -4912,16 +4902,16 @@ table.customfields td span > div { background-color: #ffffff; } .egw_fw_ui_sidemenu_listitem img.egw_fw_ui_sidemenu_listitem_icon { - width: 16px; - height: 16px; + /*display: none;*/ + width: 12px; + height: 12px; padding: 0px; margin: 0px 5px; 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-image: url("../images/bullet.svg"); + background-size: .dimension_width_height_s; + background-position: center;*/ } .egw_fw_ui_sidemenu_listitem input { height: 16px; @@ -5105,6 +5095,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { background-repeat: repeat-x; background-color: transparent; height: 32px; + /*aktive Tabs*/ } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header h1 { /*float: left;*/ @@ -5176,11 +5167,31 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { filter: gray; /* IE 6-9 */ } +#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header object { + width: 16px; + height: 16px; + background-color: #ffffff; + margin: 8px 1px 0 5px; + -webkit-border-top-right-radius: 5px; + -webkit-border-bottom-right-radius: 0; + -webkit-border-bottom-left-radius: 0; + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topright: 5px; + -moz-border-radius-bottomright: 0; + -moz-border-radius-bottomleft: 0; + -moz-border-radius-topleft: 5px; + border-top-right-radius: 5px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 5px; + /*.background-clip(padding-box);*/ +} #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; padding: 0 0 5px !important; background-color: #b3b3b3 !important; background-image: none !important; + /*aktive Objekte*/ } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover { background-color: #bfbfbf; @@ -5189,11 +5200,25 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { display: inline-block; 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_tabs_header .egw_fw_ui_tab_header_active object { + width: 24px; + height: 24px; + margin: 2px 1px 0 5px; + -webkit-border-top-right-radius: 2px; + -webkit-border-bottom-right-radius: 0; + -webkit-border-bottom-left-radius: 0; + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topright: 2px; + -moz-border-radius-bottomright: 0; + -moz-border-radius-bottomleft: 0; + -moz-border-radius-topleft: 2px; + border-top-right-radius: 2px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 2px; + /*.background-clip(padding-box);*/ + background-color: #b4b4b4; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button { position: absolute; @@ -5458,6 +5483,18 @@ tr.dialog-header4 .et2_label { .dialog-footer-toolbar input.et2_checkbox { top: 0px; } +/*Dialog Calendar - Resourcen suchen*/ +div#divMain { + padding: 1em; +} +div#divMain img { + width: 16px; + height: 16px; +} +div#divMain input[type*="image"] { + width: 16px; + height: 16px; +} /* Printing */ diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less index 9298fe8fb0..9819c3e906 100644 --- a/pixelegg/css/pixelegg.less +++ b/pixelegg/css/pixelegg.less @@ -66,5 +66,6 @@ @import "../less/print.less"; // + // // \ No newline at end of file diff --git a/pixelegg/images/abbruch.svg b/pixelegg/images/abbruch.svg index 155e5c9787..ce68490cdd 100755 --- a/pixelegg/images/abbruch.svg +++ b/pixelegg/images/abbruch.svg @@ -2,6 +2,7 @@ + - - + - + diff --git a/pixelegg/images/access.svg b/pixelegg/images/access.svg index 311ead528f..24d2d92748 100755 --- a/pixelegg/images/access.svg +++ b/pixelegg/images/access.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/accounts.svg b/pixelegg/images/accounts.svg index b07dc964b1..3cfaa9282a 100755 --- a/pixelegg/images/accounts.svg +++ b/pixelegg/images/accounts.svg @@ -2,6 +2,7 @@ + + diff --git a/pixelegg/images/advanced-search.svg b/pixelegg/images/advanced-search.svg index 57cfdf39c9..366d87fc4a 100755 --- a/pixelegg/images/advanced-search.svg +++ b/pixelegg/images/advanced-search.svg @@ -2,6 +2,7 @@ + + diff --git a/pixelegg/images/agt_action_success.svg b/pixelegg/images/agt_action_success.svg index 37065deecd..08debbe1a4 100755 --- a/pixelegg/images/agt_action_success.svg +++ b/pixelegg/images/agt_action_success.svg @@ -2,6 +2,7 @@ + + + diff --git a/pixelegg/images/apply.svg b/pixelegg/images/apply.svg index 75c6c21acf..1cc4744762 100755 --- a/pixelegg/images/apply.svg +++ b/pixelegg/images/apply.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/archive.svg b/pixelegg/images/archive.svg index bc0358ea8a..b86fecf24d 100755 --- a/pixelegg/images/archive.svg +++ b/pixelegg/images/archive.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/arrow_down.svg b/pixelegg/images/arrow_down.svg index ddfdf7452b..03d4c05392 100755 --- a/pixelegg/images/arrow_down.svg +++ b/pixelegg/images/arrow_down.svg @@ -2,6 +2,7 @@ + + + + + diff --git a/pixelegg/images/bearbeiten.svg b/pixelegg/images/bearbeiten.svg index 2af1f29d3a..fc7883cacd 100755 --- a/pixelegg/images/bearbeiten.svg +++ b/pixelegg/images/bearbeiten.svg @@ -2,6 +2,7 @@ + + diff --git a/pixelegg/images/bookable.svg b/pixelegg/images/bookable.svg index 7a431c4665..2dea4cf386 100755 --- a/pixelegg/images/bookable.svg +++ b/pixelegg/images/bookable.svg @@ -2,6 +2,7 @@ + + diff --git a/pixelegg/images/bullet_bullet.svg b/pixelegg/images/bullet_bullet.svg index e34346ffa0..c17dabf828 100755 --- a/pixelegg/images/bullet_bullet.svg +++ b/pixelegg/images/bullet_bullet.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/button_createdir.svg b/pixelegg/images/button_createdir.svg index bbb4f5bdcf..62a581665b 100755 --- a/pixelegg/images/button_createdir.svg +++ b/pixelegg/images/button_createdir.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/buttonseparator.svg b/pixelegg/images/buttonseparator.svg index 48bdd1fcc0..4b9e857d42 100755 --- a/pixelegg/images/buttonseparator.svg +++ b/pixelegg/images/buttonseparator.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/buyable.svg b/pixelegg/images/buyable.svg index 881b575d5d..4076d617b1 100755 --- a/pixelegg/images/buyable.svg +++ b/pixelegg/images/buyable.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/cake.svg b/pixelegg/images/cake.svg index 4827ac1837..69c7108b74 100755 --- a/pixelegg/images/cake.svg +++ b/pixelegg/images/cake.svg @@ -2,6 +2,7 @@ + + diff --git a/pixelegg/images/calicon.svg b/pixelegg/images/calicon.svg index 8aea4fc07c..bbafdeff93 100755 --- a/pixelegg/images/calicon.svg +++ b/pixelegg/images/calicon.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/call.svg b/pixelegg/images/call.svg index d3688ce886..635d8d5a2a 100755 --- a/pixelegg/images/call.svg +++ b/pixelegg/images/call.svg @@ -2,6 +2,7 @@ + + + diff --git a/pixelegg/images/check.svg b/pixelegg/images/check.svg index 974a8f26ca..e72183a238 100755 --- a/pixelegg/images/check.svg +++ b/pixelegg/images/check.svg @@ -2,6 +2,7 @@ + + diff --git a/pixelegg/images/close.svg b/pixelegg/images/close.svg index fb42e88e38..2065d22a9f 100755 --- a/pixelegg/images/close.svg +++ b/pixelegg/images/close.svg @@ -2,6 +2,7 @@ + + diff --git a/pixelegg/images/cnr-pending.svg b/pixelegg/images/cnr-pending.svg index 8205b9be3b..9532312b86 100755 --- a/pixelegg/images/cnr-pending.svg +++ b/pixelegg/images/cnr-pending.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/configure.svg b/pixelegg/images/configure.svg index 61c06de87c..42541a3a09 100755 --- a/pixelegg/images/configure.svg +++ b/pixelegg/images/configure.svg @@ -2,6 +2,7 @@ + diff --git a/pixelegg/images/continue.svg b/pixelegg/images/continue.svg new file mode 100755 index 0000000000..0173771732 --- /dev/null +++ b/pixelegg/images/continue.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/pixelegg/images/copy.svg b/pixelegg/images/copy.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/cut.svg b/pixelegg/images/cut.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/date.svg b/pixelegg/images/date.svg new file mode 100755 index 0000000000..32a5cb01d5 --- /dev/null +++ b/pixelegg/images/date.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + diff --git a/pixelegg/images/datepopup.svg b/pixelegg/images/datepopup.svg new file mode 100755 index 0000000000..5e8ad61b32 --- /dev/null +++ b/pixelegg/images/datepopup.svg @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/pixelegg/images/delete.svg b/pixelegg/images/delete.svg new file mode 100755 index 0000000000..e1d6e5b5ff --- /dev/null +++ b/pixelegg/images/delete.svg @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/pixelegg/images/deleted.svg b/pixelegg/images/deleted.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/dialog_help.svg b/pixelegg/images/dialog_help.svg new file mode 100755 index 0000000000..c718dde6b8 --- /dev/null +++ b/pixelegg/images/dialog_help.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/pixelegg/images/dialog_info.svg b/pixelegg/images/dialog_info.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/dialog_warning.svg b/pixelegg/images/dialog_warning.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/done.svg b/pixelegg/images/done.svg index ea3fe28415..1bf65c0ed9 100755 --- a/pixelegg/images/done.svg +++ b/pixelegg/images/done.svg @@ -1,16 +1,17 @@ - - - - + + diff --git a/pixelegg/images/done_all.svg b/pixelegg/images/done_all.svg index 83448985e5..ab8ea6643d 100755 --- a/pixelegg/images/done_all.svg +++ b/pixelegg/images/done_all.svg @@ -1,16 +1,15 @@ - - - + + C25.005,11.591,24.926,13.146,23.749,14.139z"/> diff --git a/pixelegg/images/export.svg b/pixelegg/images/export.svg new file mode 100755 index 0000000000..c987f8e208 --- /dev/null +++ b/pixelegg/images/export.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less index e508608a08..166d9c7454 100755 --- a/pixelegg/less/def_design_pattern_color_font_shadow.less +++ b/pixelegg/less/def_design_pattern_color_font_shadow.less @@ -128,6 +128,9 @@ // Hint / or have to do / must field @color_hint : fade(@egw_color_2_e, 10%); +// Tooltipp / or have to do / must field +@color_tooltip : lighten(@egw_color_1_e, 90%); + /*optional / can field*/ @color_optional : fade(@egw_color_1_e, 10%); @@ -268,6 +271,13 @@ box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); } + +.box_shadow_message { + -webkit-box-shadow: 6px 2px 1px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 6px 2px 1px rgba(0, 0, 0, 0.5); + box-shadow: 6px 2px 1px rgba(0, 0, 0, 0.5); +} + // Rahmen für Dialoge .box_shadow_edit_dialog { diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index d9a2055048..755688a5ba 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -647,7 +647,7 @@ ul.et2_link_string { position: fixed; border: 1px solid #897f51; padding: 3px; - background-color: @color_hint; + background-color: @color_tooltip; max-width: 300px; color: black; } @@ -1218,8 +1218,9 @@ div.message.floating { // List Icon .sideboxstar{ - background-image: url("../images/bullet.png"); + background-image: url("../images/bullet.svg"); background-repeat: no-repeat; + background-size: contain; .dimension_width_height_xs; } @@ -1229,6 +1230,7 @@ div.message.floating { .sidebox-favorites { + ul.favorites { width: 99%; padding: 0px; @@ -1237,9 +1239,9 @@ div.message.floating { li { - padding-left: 0 !important; + padding-left: 1em !important; margin-left: 0px; - line-height: 2.5em; + line-height: 2em; img { @@ -1265,11 +1267,16 @@ div.message.floating { &:hover {.dimension_height_s; .Complete_Button_Icon_hover ;} } - - - + + a { + div.sideboxstar {display: none;} + div.ui-icon-trash{ + margin-top: -1px; + margin-right: 2px; + } + } + } - } .ui-state-hover, @@ -1299,24 +1306,26 @@ div.message.floating { } } + /*ul*/ .ui-menu { - + /*li*/ .ui-menu-item { - - + + width: 93%; + &:hover {background-color: @egw_color_1_e;} a { line-height: inherit; padding: 2px 0px; - padding-left: 0 !important; + padding-left: 5px !important; &:hover {text-decoration: underline; /*.Complete_Button_Icon_hover ;*/ } - img { .dimension_width_height_s ; - } + img { .dimension_width_height_s ;} + div.ui-icon-heart{display: none} } } @@ -1332,33 +1341,20 @@ div.message.floating { background-image: none; } div.ui-icon-trash{ - - background-image:url(../images/delete.png); + margin-top: 0px; + margin-right: 2px; + background-image:url(../images/delete.svg); background-size: 16px 16px; background-position: 0 0; - background-color: #e6e6e6; - -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.5); - -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.5); - box-shadow: 1px 1px 1px 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; - margin-right: 0.5em; - padding: 0px 2px 0 2px; - width: 10px; - - + background-color: #000; + .box_shadow_standard_light; + .rounded; } } // sidebox-favorites - - - - .nextmatch_sortheader { color: #003075; cursor: pointer; @@ -1718,4 +1714,4 @@ iframe#admin-index_iframe{ } // -//�������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������� \ No newline at end of file +//������ \ No newline at end of file diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index bdab991bfc..332fd3cb9a 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -628,6 +628,7 @@ input[type=image] { cursor: pointer; border: 0; + .dimension_width_height_s; } #thesideboxcolumn diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index 67a56a02a4..d092d715fe 100755 --- a/pixelegg/less/layout_dialog.less +++ b/pixelegg/less/layout_dialog.less @@ -268,6 +268,14 @@ tr.dialog-header4{ } +/*Dialog Calendar - Resourcen suchen*/ + +div#divMain { + padding: 1em; + + img {.dimension_width_height_s;} + input[type*="image"] {.dimension_width_height_s;} +} // // \ No newline at end of file diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less index bf9b246e9d..bbe640536d 100755 --- a/pixelegg/less/layout_messages.less +++ b/pixelegg/less/layout_messages.less @@ -23,7 +23,8 @@ border-width: 9px 0px 0px 0px; border-style: solid; border-color: @gray_30; - .box_shadow_standard_light; + + .box_shadow_message; padding: 1em; diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index c321860b1c..992623e114 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -300,60 +300,7 @@ - /* 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; - } - } - - - - - 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; - } - - }*/ + } @@ -557,6 +504,9 @@ padding-left: 3em; .color_40_gray; } + + object {background-color: @gray_0; .dimension_width_height_m;} + } @@ -597,7 +547,12 @@ .background_color_25_gray; } - + object { + margin-left: 14px; + margin-top: 8px; + .rounded (3px;); + .dimension_width_height_s; + } .egw_fw_ui_ajaxloader {margin-top: -26px;} @@ -656,6 +611,12 @@ color:#ff0000; background-color: yellow !important; } + + div.egw_fw_ui_category:nth-last-of-type(-n+3) { + img.egw_fw_ui_sidemenu_listitem_icon { + display: block; + } + } } @@ -726,11 +687,7 @@ /*filter grey*/ .img_filter_gray; -/* path {color: red} - - svg:hover path {fill: red;} - - filter: hue-rotate(90deg);*/ + } } @@ -826,16 +783,16 @@ // Icon before img.egw_fw_ui_sidemenu_listitem_icon { - .dimension_width_height_s; + /*display: none;*/ + .dimension_width_height_xs; padding: 0px; margin: 0px 5px; float: left; /*.Complete_Button_Icon_normal;*/ - background-image: url("../images/bullet.png"); +/* background-image: url("../images/bullet.svg"); background-size: .dimension_width_height_s; + background-position: center;*/ - background-position: center; - /*&:hover {height: 16px; .Complete_Button_Icon_hover ;}*/ } input { @@ -1154,18 +1111,14 @@ div#calendar-container { margin: 0 auto; .dimension_width_height_s; } - - - - // Tab + + // Tab // ########## // # # - // # 16x16 # + // # # // ########## - // aktive - - + // inaktive .egw_fw_ui_tab_header { text-align: center; @@ -1206,12 +1159,26 @@ div#calendar-container { margin: 5px 1px 0 1em; .img_filter_gray; - - } - } + object { + .dimension_width_height_s; + background-color: @gray_0; + margin: 8px 1px 0 5px; + .border_radius(5px,0, 0, 5px); + + } + + + } + + // ########## + // # # + // # # + // ########## + + /*aktive Tabs*/ .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; padding: 0 0 5px !important; @@ -1225,15 +1192,18 @@ div#calendar-container { 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); + } - + /*aktive Objekte*/ + object { + .dimension_width_height_m; + margin: 2px 1px 0 5px; + .border_radius(2px,0, 0, 2px); + + background-color: @gray_30; + } } diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less index 86b214ed7c..3a4ce12130 100755 --- a/pixelegg/less/layout_table.less +++ b/pixelegg/less/layout_table.less @@ -109,7 +109,10 @@ table.egwGridView_outer{ border-bottom: 1px solid silver; } - + div.innerContainer { + max-height: 7em; + overflow-y: auto; + } } @@ -187,7 +190,8 @@ table.egwGridView_grid{ border-spacing: 0px 1px; width: 100%; - img{ height: 16px;} + img{ .dimension_height_s;} + img.iphoto {height: 9em;margin: 0.2em; max-height: 60px;} tbody { border-bottom: 1px solid @lightgray; @@ -336,4 +340,10 @@ table.egwGridView_grid{ } } -// \ No newline at end of file +/*########################################################*/ +// Tabelle der APP Ausgabe + +table.nextmatch_header{ + + img{ .dimension_width_height_s;} +} \ No newline at end of file diff --git a/pixelegg/less/svg.css b/pixelegg/less/svg.css index b6e7d1f987..c0e1925c0e 100644 --- a/pixelegg/less/svg.css +++ b/pixelegg/less/svg.css @@ -1,7 +1,27 @@ +/** + * EGroupware: Stylite Pixelegg template + * + * SVG + * + * 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 + * @author Stefan Reinhard + * @package pixelegg + * @version $Id$ + */ * { - fill: #ff0000; + fill: #0c5da5; + /*fill: @gray_0;*/ } - -svg#etemplate_navbar * { - fill: #0000ff; -} \ No newline at end of file +/*svg#etemplate_navbar * { + fill: @gray_40; + + +}*/ +/*svg#infolog_navbar * { + fill: @gray_40; + + +}*/ diff --git a/pixelegg/less/svg.less b/pixelegg/less/svg.less new file mode 100755 index 0000000000..e37b095c80 --- /dev/null +++ b/pixelegg/less/svg.less @@ -0,0 +1,38 @@ +/** + * EGroupware: Stylite Pixelegg template + * + * SVG + * + * 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 + * @author Stefan Reinhard + * @package pixelegg + * @version $Id$ + */ + + @import (reference) "def_design_pattern_color_font_shadow.less"; + @import (reference) "def_buttons.less"; + + + +* { + fill: @egw_color_2_a; + /*fill: @gray_0;*/ +} + +/*svg#etemplate_navbar * { + fill: @gray_40; + + +}*/ + +/*svg#infolog_navbar * { + fill: @gray_40; + + +}*/ + +// +// \ No newline at end of file