diff --git a/pixelegg/content-element-library/css/contentElementLibrary.css b/pixelegg/content-element-library/css/contentElementLibrary.css index 1aa947b994..3308520fc0 100755 --- a/pixelegg/content-element-library/css/contentElementLibrary.css +++ b/pixelegg/content-element-library/css/contentElementLibrary.css @@ -36,4 +36,13 @@ div.headline1 {font-size: 2em;} #navi { padding: 2em; margin: 0 auto;} ul.navigation {list-style: none;} -ul.navigation li { border: 1px solid black; margin: 3px 0px; padding:0.2em; width: 270px;} \ No newline at end of file +ul.navigation li { border: 1px solid black; margin: 3px 0px; padding:0.2em; width: 270px;} + + +div.show_content { + +box-shadow: #0000FF 10px 13px 13px inset; +margin: 1em; +padding: 2em; + +} \ No newline at end of file diff --git a/pixelegg/content-element-library/index_navigation_left.html b/pixelegg/content-element-library/index_navigation_left.html index 6bc1e81d8f..72f6071605 100755 Binary files a/pixelegg/content-element-library/index_navigation_left.html and b/pixelegg/content-element-library/index_navigation_left.html differ diff --git a/pixelegg/content-element-library/popup_message.html b/pixelegg/content-element-library/popup_message.html new file mode 100644 index 0000000000..a3370f4048 --- /dev/null +++ b/pixelegg/content-element-library/popup_message.html @@ -0,0 +1,102 @@ + + + + + + + + + + + + [EGroupware] Content Element Library + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
Popup Message
+ +
+
Benachrichtigung +
+
Nachricht von: Herr Stefan Reinhardt
Sie haben neue E-Mails
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + +
Ordner Betreff von Erhalten
INBOXTop Managers Deutschland 2014Gabriele Neumann 17.01.2014 09:48
+ + + +
+ + + + +
+
+ +
+ + + + + + + diff --git a/pixelegg/content-element-library/res_dialog_add.html b/pixelegg/content-element-library/res_dialog_add.html new file mode 100755 index 0000000000..9609b3d391 --- /dev/null +++ b/pixelegg/content-element-library/res_dialog_add.html @@ -0,0 +1,60 @@ + + + + + + + + + + + + [EGroupware] Content Element Library + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
Ressource ADD
+ +
+ +
+ +
GenerellBeschreibungBildVerknüpfungenHistory
KurzbeschreibungKurzbeschreibung der Ressource
LagerortWo findet man diese Ressource?
Informationen zur LagerungInformationen zur Lagerung
StückzahlStückzahl der Ressource
NutzbarStückzahl der nutzbaren Ressourcen
buchbarIst diese Ressource buchbar?
Zubehör von
+ +
+ + + + \ No newline at end of file diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 36852a3451..dbec8af5c7 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -407,7 +407,7 @@ action buttons, left aligned for "extra" controls * File upload */ div.et2_file input { - background-color: #ffc200; + /*background-color: @egw_color_1_a;*/ } .et2_file .progress { width: 300px; @@ -554,8 +554,9 @@ action buttons, left aligned for "extra" controls float: left; margin: 0.5em 2em; padding: 0.5em; - width: 32px; - height: 32px; + width: 16px; + height: 16px; + background-color: #b4b4b4; } .et2_link_to .et2_button_icon:hover { /*.background_color_20_gray;*/ @@ -577,6 +578,50 @@ action buttons, left aligned for "extra" controls -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); background-color: #1aa200; + background-color: #1aa200 !important; + } + .et2_link_to .et2_file { + background-color: #ffffff !important; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + margin-top: 1em; + padding-top: 0.2em; + } + .et2_link_to .et2_file input { + border: none; + padding: 1em; + } + .et2_link_to .et2_file:before { + content: "+ "; + font-size: 2em; + color: #ffc200; + line-height: 0.6em; + padding-left: 0.1em; + padding-right: 0em; + background-color: #0c5da5; + -webkit-border-radius: 3px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius: 3px; + -moz-border-radius-topleft: 10px; + border-radius: 3px; + border-top-left-radius: 10px; + } + .et2_link_to .et2_file:hover { + background-color: #66a1d2 !important; + color: #ffc200; + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + -webkit-border-radius: 3px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius: 3px; + -moz-border-radius-topleft: 10px; + border-radius: 3px; + border-top-left-radius: 10px; + } + .et2_link_to .et2_file:active { + background-color: #1aa200 !important; } .et2_link { cursor: pointer; @@ -2292,10 +2337,49 @@ span.ui-icon-search { -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; + /*Button*/ } #egwpopup input#egwpopup_ok_button, #egwpopup button#desktop_perms { + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color: #000000; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -o-transition-property: background-color; + transition-property: background-color; + -webkit-transition-duration: 0.5s; + -moz-transition-duration: 0.5s; + -o-transition-duration: 0.5s; + transition-duration: 0.5s; + -webkit-transition-timing-function: linear; + -moz-transition-timing-function: linear; + -o-transition-timing-function: linear; + transition-timing-function: linear; + background-color: #b4b4b4; height: 24px; + padding: 0 5px; +} +#egwpopup input#egwpopup_ok_button:hover, +#egwpopup button#desktop_perms: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); + background-color: inherit !important; +} +#egwpopup input#egwpopup_ok_button:active, +#egwpopup button#desktop_perms:active { + background-color: #1aa200 !important; +} +/*popup Messsage*/ +div#egwpopup_message { + background-color: .color_gray_0; + padding: 1em; } #msg, .message { @@ -2343,11 +2427,6 @@ td.message span.message { height: auto; width: 100%; } -/*popup Messsage*/ -div#egwpopup_message { - background-color: .color_gray_0; - padding: 1em; -} /** * EGroupware: CSS with less preprocessor * @@ -3246,9 +3325,12 @@ input[type="submit"][id="delete"], input[type="button"][id="delete"], button[id="delete"], button[id="infolog-edit_button[delete]"], -button[id="addressbook-edit_button[delete]"] { - background-image: url('../images/delete.png') !important; +button[id="addressbook-edit_button[delete]"], +button[id="resources-edit_delete"] { + background-color: #b81f00 !important; + background-image: url('../images/delete-hover.png') !important; margin-left: 3em; + /*color: @gray_100;*/ 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); @@ -3277,13 +3359,14 @@ button[id="addressbook-edit_button[delete]"] { width: auto; height: 32px; /*background-color: @color-negative-action !important;*/ - /*color: @gray_100 !important;*/ + color: #ffffff !important; } input[type="submit"][id="delete"]:hover, input[type="button"][id="delete"]:hover, button[id="delete"]:hover, button[id="infolog-edit_button[delete]"]:hover, -button[id="addressbook-edit_button[delete]"]:hover { +button[id="addressbook-edit_button[delete]"]:hover, +button[id="resources-edit_delete"]:hover { background-image: url('../images/delete-hover.png') !important; background-color: #b81f00 !important; border: 1px solid rgba(0, 0, 0, 0.15); @@ -3319,7 +3402,8 @@ input[type="submit"][id="delete"]:active, input[type="button"][id="delete"]:active, button[id="delete"]:active, button[id="infolog-edit_button[delete]"]:active, -button[id="addressbook-edit_button[delete]"]:active { +button[id="addressbook-edit_button[delete]"]:active, +button[id="resources-edit_delete"]:active { background-image: url('../images/delete-hover.png') !important; background-color: #e12500 !important; border: 1px solid rgba(0, 0, 0, 0.15); @@ -3584,6 +3668,35 @@ button[id="add"]:active { background-color: #1aa200 !important; } /*Button Ende #######################################################*/ +/*dhtml Submenu ##########################################################*/ +div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item { + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -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 */ +} +div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon img[src*="svg"] { + background-color: #000000; + background-color: #1e1e1e; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMWUxZTFlIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMWUxZTFlIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #1e1e1e, #1e1e1e); + background-image: -ms-linear-gradient(top, #1e1e1e, #1e1e1e); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1e1e1e), to(#1e1e1e)); + background-image: -webkit-linear-gradient(top, #1e1e1e, #1e1e1e); + background-image: -o-linear-gradient(top, #1e1e1e, #1e1e1e); + background-image: linear-gradient(top, #1e1e1e, #1e1e1e); + background-repeat: repeat-x; +} +div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected { + background-color: #ffc200 !important; + background-image: none !important; +} @media screen and (-webkit-min-device-pixel-ratio: 0) { select { padding-right: 20px !important; @@ -4368,31 +4481,6 @@ table.nextmatch_header img { Add / Print / Logout / - Name / Date ###################################################*/ -#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); - float: right; - padding: 0.5em; - position: fixed; - right: 83px; - top: 5px; - width: 16px; - height: 16px; -} -#egw_fw_topmenu_addons span#quick_add:before { - content: "+"; - font-size: 2em; - color: #ffc200; - line-height: 0.6em; -} -#egw_fw_topmenu_addons 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; -} #egw_fw_logout { background-image: url(../images/logout.png); background-size: 16px 16px; @@ -4487,12 +4575,11 @@ table.nextmatch_header img { -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;*/ + /*Notification*/ + /*user info*/ + /*current user info*/ + /*current user info*/ + /*quick*/ } #egw_fw_topmenu_info_items .topmenu_info_item { overflow: visible; @@ -4523,6 +4610,31 @@ table.nextmatch_header img { font-size: 1em; color: #0c5da5; } +#egw_fw_topmenu_info_items #topmenu_info_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; + width: 16px; + height: 16px; +} +#egw_fw_topmenu_info_items #topmenu_info_quick_add span#quick_add:before { + content: "+"; + font-size: 2em; + color: #ffc200; + line-height: 0.6em; +} +#egw_fw_topmenu_info_items #topmenu_info_quick_add 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; +} /* ################################################################################################################ * Sidebar * ################################################################################################################*/ @@ -5093,12 +5205,12 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { width: 100%; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header { - margin: 2px 0 0 0; + margin: 0px 0 0 0; padding: 0px 1px 0px 1px; background-position: bottom; background-repeat: repeat-x; background-color: transparent; - height: 30px; + height: 34px; /*aktive Tabs*/ } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header h1 { @@ -5137,14 +5249,14 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { /*.background-color-5-gray;*/ background: transparent; display: inline-table; - margin: 3px 5px 0px 0px; + margin: 0px 5px 0px 0px; /*padding: 2px 10px 2px 10px;*/ cursor: pointer; border-width: 1px 1px 0 1px; border-style: solid; border-color: #b4b4b4; background-repeat: repeat-x; - height: 20px; + height: 24px; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover { background-color: #b3b3b3 !important; diff --git a/pixelegg/images/accounts.svg b/pixelegg/images/accounts.svg new file mode 100755 index 0000000000..b07dc964b1 --- /dev/null +++ b/pixelegg/images/accounts.svg @@ -0,0 +1,16 @@ + + + + + + + diff --git a/pixelegg/images/alarm.svg b/pixelegg/images/alarm.svg new file mode 100755 index 0000000000..ff894ae893 --- /dev/null +++ b/pixelegg/images/alarm.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/abbruch.svg b/pixelegg/images/login/abbruch.svg new file mode 100755 index 0000000000..155e5c9787 --- /dev/null +++ b/pixelegg/images/login/abbruch.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/pixelegg/images/login/about.svg b/pixelegg/images/login/about.svg new file mode 100755 index 0000000000..aa218765ab --- /dev/null +++ b/pixelegg/images/login/about.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/access.svg b/pixelegg/images/login/access.svg new file mode 100755 index 0000000000..311ead528f --- /dev/null +++ b/pixelegg/images/login/access.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/accounts.svg b/pixelegg/images/login/accounts.svg new file mode 100755 index 0000000000..b07dc964b1 --- /dev/null +++ b/pixelegg/images/login/accounts.svg @@ -0,0 +1,16 @@ + + + + + + + diff --git a/pixelegg/images/login/add.svg b/pixelegg/images/login/add.svg new file mode 100755 index 0000000000..bc8caa15be --- /dev/null +++ b/pixelegg/images/login/add.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/advanced-search.svg b/pixelegg/images/login/advanced-search.svg new file mode 100755 index 0000000000..57cfdf39c9 --- /dev/null +++ b/pixelegg/images/login/advanced-search.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/pixelegg/images/login/agt_action_fail.svg b/pixelegg/images/login/agt_action_fail.svg new file mode 100755 index 0000000000..e6ab3fd132 --- /dev/null +++ b/pixelegg/images/login/agt_action_fail.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/agt_action_success.svg b/pixelegg/images/login/agt_action_success.svg new file mode 100755 index 0000000000..37065deecd --- /dev/null +++ b/pixelegg/images/login/agt_action_success.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/pixelegg/images/login/agt_reload.svg b/pixelegg/images/login/agt_reload.svg new file mode 100755 index 0000000000..f75fd394e1 --- /dev/null +++ b/pixelegg/images/login/agt_reload.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/pixelegg/images/login/alarm.svg b/pixelegg/images/login/alarm.svg new file mode 100755 index 0000000000..ff894ae893 --- /dev/null +++ b/pixelegg/images/login/alarm.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/apply.svg b/pixelegg/images/login/apply.svg new file mode 100755 index 0000000000..75c6c21acf --- /dev/null +++ b/pixelegg/images/login/apply.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/archive.svg b/pixelegg/images/login/archive.svg new file mode 100755 index 0000000000..bc0358ea8a --- /dev/null +++ b/pixelegg/images/login/archive.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/arrow_down.svg b/pixelegg/images/login/arrow_down.svg new file mode 100755 index 0000000000..ddfdf7452b --- /dev/null +++ b/pixelegg/images/login/arrow_down.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/pixelegg/images/login/arrow_left.svg b/pixelegg/images/login/arrow_left.svg new file mode 100755 index 0000000000..7cf99ecb34 --- /dev/null +++ b/pixelegg/images/login/arrow_left.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/pixelegg/images/login/arrows.svg b/pixelegg/images/login/arrows.svg new file mode 100755 index 0000000000..9853983391 --- /dev/null +++ b/pixelegg/images/login/arrows.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/pixelegg/images/login/attach.svg b/pixelegg/images/login/attach.svg new file mode 100755 index 0000000000..ddd9aa2e16 --- /dev/null +++ b/pixelegg/images/login/attach.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/pixelegg/images/login/back.svg b/pixelegg/images/login/back.svg new file mode 100755 index 0000000000..64bed40e09 --- /dev/null +++ b/pixelegg/images/login/back.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/bearbeiten.svg b/pixelegg/images/login/bearbeiten.svg new file mode 100755 index 0000000000..2af1f29d3a --- /dev/null +++ b/pixelegg/images/login/bearbeiten.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/pixelegg/images/login/billed.svg b/pixelegg/images/login/billed.svg new file mode 100755 index 0000000000..8830d2db5e --- /dev/null +++ b/pixelegg/images/login/billed.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/bookable.svg b/pixelegg/images/login/bookable.svg new file mode 100755 index 0000000000..7a431c4665 --- /dev/null +++ b/pixelegg/images/login/bookable.svg @@ -0,0 +1,21 @@ + + + + + + + diff --git a/pixelegg/images/login/bullet.svg b/pixelegg/images/login/bullet.svg new file mode 100755 index 0000000000..d6af0f38bc --- /dev/null +++ b/pixelegg/images/login/bullet.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/pixelegg/images/login/bullet_bullet.svg b/pixelegg/images/login/bullet_bullet.svg new file mode 100755 index 0000000000..e34346ffa0 --- /dev/null +++ b/pixelegg/images/login/bullet_bullet.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/pixelegg/images/login/button_createdir.svg b/pixelegg/images/login/button_createdir.svg new file mode 100755 index 0000000000..bbb4f5bdcf --- /dev/null +++ b/pixelegg/images/login/button_createdir.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/pixelegg/images/login/buttonseparator.svg b/pixelegg/images/login/buttonseparator.svg new file mode 100755 index 0000000000..48bdd1fcc0 --- /dev/null +++ b/pixelegg/images/login/buttonseparator.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/pixelegg/images/login/buyable.svg b/pixelegg/images/login/buyable.svg new file mode 100755 index 0000000000..881b575d5d --- /dev/null +++ b/pixelegg/images/login/buyable.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/pixelegg/images/login/cake.svg b/pixelegg/images/login/cake.svg new file mode 100755 index 0000000000..4827ac1837 --- /dev/null +++ b/pixelegg/images/login/cake.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/pixelegg/images/login/calendar.svg b/pixelegg/images/login/calendar.svg new file mode 100755 index 0000000000..59d6bd628b --- /dev/null +++ b/pixelegg/images/login/calendar.svg @@ -0,0 +1,23 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/calicon.svg b/pixelegg/images/login/calicon.svg new file mode 100755 index 0000000000..8aea4fc07c --- /dev/null +++ b/pixelegg/images/login/calicon.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/pixelegg/images/login/call.svg b/pixelegg/images/login/call.svg new file mode 100755 index 0000000000..d3688ce886 --- /dev/null +++ b/pixelegg/images/login/call.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/pixelegg/images/login/cancel.svg b/pixelegg/images/login/cancel.svg new file mode 100755 index 0000000000..cf9e0689ad --- /dev/null +++ b/pixelegg/images/login/cancel.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/pixelegg/images/login/cancelled.svg b/pixelegg/images/login/cancelled.svg new file mode 100755 index 0000000000..353ab3fe30 --- /dev/null +++ b/pixelegg/images/login/cancelled.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/check.svg b/pixelegg/images/login/check.svg new file mode 100755 index 0000000000..974a8f26ca --- /dev/null +++ b/pixelegg/images/login/check.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/pixelegg/images/login/clear_left.svg b/pixelegg/images/login/clear_left.svg new file mode 100755 index 0000000000..4f5e92ee65 --- /dev/null +++ b/pixelegg/images/login/clear_left.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/close.svg b/pixelegg/images/login/close.svg new file mode 100755 index 0000000000..fb42e88e38 --- /dev/null +++ b/pixelegg/images/login/close.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/pixelegg/images/login/close_button.svg b/pixelegg/images/login/close_button.svg new file mode 100755 index 0000000000..6d98315c59 --- /dev/null +++ b/pixelegg/images/login/close_button.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/pixelegg/images/login/cnr-pending.svg b/pixelegg/images/login/cnr-pending.svg new file mode 100755 index 0000000000..8205b9be3b --- /dev/null +++ b/pixelegg/images/login/cnr-pending.svg @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/configure.svg b/pixelegg/images/login/configure.svg new file mode 100755 index 0000000000..61c06de87c --- /dev/null +++ b/pixelegg/images/login/configure.svg @@ -0,0 +1,28 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/continue.svg b/pixelegg/images/login/continue.svg new file mode 100755 index 0000000000..0173771732 --- /dev/null +++ b/pixelegg/images/login/continue.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/copy.svg b/pixelegg/images/login/copy.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/login/cut.svg b/pixelegg/images/login/cut.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/login/date.svg b/pixelegg/images/login/date.svg new file mode 100755 index 0000000000..568157ecfa --- /dev/null +++ b/pixelegg/images/login/date.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/pixelegg/images/login/datepopup.svg b/pixelegg/images/login/datepopup.svg new file mode 100755 index 0000000000..04a3bdd0e7 --- /dev/null +++ b/pixelegg/images/login/datepopup.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/delete.svg b/pixelegg/images/login/delete.svg new file mode 100755 index 0000000000..f483b78926 --- /dev/null +++ b/pixelegg/images/login/delete.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/deleted.svg b/pixelegg/images/login/deleted.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/login/dialog_help.svg b/pixelegg/images/login/dialog_help.svg new file mode 100755 index 0000000000..a9ba634224 --- /dev/null +++ b/pixelegg/images/login/dialog_help.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/dialog_info.svg b/pixelegg/images/login/dialog_info.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/login/dialog_warning.svg b/pixelegg/images/login/dialog_warning.svg new file mode 100755 index 0000000000..e69de29bb2 diff --git a/pixelegg/images/login/done.svg b/pixelegg/images/login/done.svg new file mode 100755 index 0000000000..449ed513b5 --- /dev/null +++ b/pixelegg/images/login/done.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/done_all.svg b/pixelegg/images/login/done_all.svg new file mode 100755 index 0000000000..a7478f586b --- /dev/null +++ b/pixelegg/images/login/done_all.svg @@ -0,0 +1,16 @@ + + + + + + + diff --git a/pixelegg/images/login/edit.svg b/pixelegg/images/login/edit.svg new file mode 100755 index 0000000000..8f379e8e63 --- /dev/null +++ b/pixelegg/images/login/edit.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/pixelegg/images/login/editcopy.svg b/pixelegg/images/login/editcopy.svg new file mode 100755 index 0000000000..15b65f210f --- /dev/null +++ b/pixelegg/images/login/editcopy.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/editcut.svg b/pixelegg/images/login/editcut.svg new file mode 100755 index 0000000000..e48a061068 --- /dev/null +++ b/pixelegg/images/login/editcut.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/export.svg b/pixelegg/images/login/export.svg new file mode 100755 index 0000000000..3a7c4fbf15 --- /dev/null +++ b/pixelegg/images/login/export.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/focused_hatching.svg b/pixelegg/images/login/focused_hatching.svg new file mode 100755 index 0000000000..53154a88ce --- /dev/null +++ b/pixelegg/images/login/focused_hatching.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pixelegg/images/login/gradient01.svg b/pixelegg/images/login/gradient01.svg new file mode 100755 index 0000000000..f1b20e18c2 --- /dev/null +++ b/pixelegg/images/login/gradient01.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/pixelegg/images/login/gradient02.svg b/pixelegg/images/login/gradient02.svg new file mode 100755 index 0000000000..43ae23945f --- /dev/null +++ b/pixelegg/images/login/gradient02.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/pixelegg/images/login/header_overlay.svg b/pixelegg/images/login/header_overlay.svg new file mode 100755 index 0000000000..3c67b6bddc --- /dev/null +++ b/pixelegg/images/login/header_overlay.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/pixelegg/images/login/home.svg b/pixelegg/images/login/home.svg new file mode 100755 index 0000000000..15169ac89f --- /dev/null +++ b/pixelegg/images/login/home.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/pixelegg/images/login/mail_label2.svg b/pixelegg/images/login/mail_label2.svg new file mode 100755 index 0000000000..d9476282e5 --- /dev/null +++ b/pixelegg/images/login/mail_label2.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/mail_label4.svg b/pixelegg/images/login/mail_label4.svg new file mode 100755 index 0000000000..871fbe4d02 --- /dev/null +++ b/pixelegg/images/login/mail_label4.svg @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/month.svg b/pixelegg/images/login/month.svg new file mode 100755 index 0000000000..c16e8134b9 --- /dev/null +++ b/pixelegg/images/login/month.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/pixelegg/images/login/multiweek.svg b/pixelegg/images/login/multiweek.svg new file mode 100755 index 0000000000..a011cb5c46 --- /dev/null +++ b/pixelegg/images/login/multiweek.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/pixelegg/images/login/non_loaded_bg.svg b/pixelegg/images/login/non_loaded_bg.svg new file mode 100755 index 0000000000..f913e2ee5c --- /dev/null +++ b/pixelegg/images/login/non_loaded_bg.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/pixelegg/images/login/not-started.svg b/pixelegg/images/login/not-started.svg new file mode 100755 index 0000000000..e8fef7f54b --- /dev/null +++ b/pixelegg/images/login/not-started.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/pixelegg/images/login/note.svg b/pixelegg/images/login/note.svg new file mode 100755 index 0000000000..204bfbc2fb --- /dev/null +++ b/pixelegg/images/login/note.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/pixelegg/images/login/password.svg b/pixelegg/images/login/password.svg new file mode 100755 index 0000000000..b186b09b0b --- /dev/null +++ b/pixelegg/images/login/password.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/phone.svg b/pixelegg/images/login/phone.svg new file mode 100755 index 0000000000..62d53efcfb --- /dev/null +++ b/pixelegg/images/login/phone.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/private.svg b/pixelegg/images/login/private.svg new file mode 100755 index 0000000000..a07f972048 --- /dev/null +++ b/pixelegg/images/login/private.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/pixelegg/images/login/task.svg b/pixelegg/images/login/task.svg new file mode 100755 index 0000000000..8924b325ec --- /dev/null +++ b/pixelegg/images/login/task.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/pixelegg/images/login/tentative.svg b/pixelegg/images/login/tentative.svg new file mode 100755 index 0000000000..f968ea1861 --- /dev/null +++ b/pixelegg/images/login/tentative.svg @@ -0,0 +1,19 @@ + + + + + + + diff --git a/pixelegg/images/login/timesheet.svg b/pixelegg/images/login/timesheet.svg new file mode 100755 index 0000000000..e5b054a1de --- /dev/null +++ b/pixelegg/images/login/timesheet.svg @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/pixelegg/images/login/today.svg b/pixelegg/images/login/today.svg new file mode 100755 index 0000000000..1098f31ee5 --- /dev/null +++ b/pixelegg/images/login/today.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/pixelegg/images/login/unread_small.svg b/pixelegg/images/login/unread_small.svg new file mode 100755 index 0000000000..5b196be022 --- /dev/null +++ b/pixelegg/images/login/unread_small.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/pixelegg/images/login/week.svg b/pixelegg/images/login/week.svg new file mode 100755 index 0000000000..94c1d9ff58 --- /dev/null +++ b/pixelegg/images/login/week.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/pixelegg/images/password.svg b/pixelegg/images/password.svg new file mode 100755 index 0000000000..b186b09b0b --- /dev/null +++ b/pixelegg/images/password.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index b174d3898b..2ed7ac4faf 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -19,7 +19,7 @@ function show_pixelegg_header(_toggle, _delay) $j("#egw_fw_topmenu_info_items").css("float", "right"); $j("#egw_fw_sidebar").animate({'top':'55px'},_delay); - $j("#egw_fw_tabs").animate({'margin-top':'12px'},_delay); + $j("#egw_fw_tabs").animate({'margin-top':'17px'},_delay); $j(".egw_fw_ui_sidemenu_entry_header_active").css("background-position","95% -3000px"); $j(_toggle).parent().removeClass("slidedown"); $j(_toggle).parent().addClass("slideup"); @@ -47,7 +47,7 @@ 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", "30px"); + $j(".egw_fw_ui_tabs_header").css("height", "32px"); //Tab $j(".egw_fw_ui_tab_header").css("height", "24px"); diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 755688a5ba..757b688ada 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -433,7 +433,9 @@ action buttons, left aligned for "extra" controls * File upload */ -div.et2_file input {background-color: @egw_color_1_a;} +div.et2_file input { + /*background-color: @egw_color_1_a;*/ +} .et2_file .progress { width: 300px; @@ -586,10 +588,35 @@ div.et2_link_entry input.ui-autocomplete-input { float: left; margin: 0.5em 2em; padding: 0.5em; - .dimension_width_height_l; - + .dimension_width_height_s; + background-color: @gray_30; &:hover {.Complete_Button_Icon_hover;} - &:active {.Complete_Button_Icon_active; } + &:active {.Complete_Button_Icon_active; background-color: @color_positive_action_active !important;} +} + +.et2_link_to .et2_file{ + background-color: @gray_0 !important; + .rounded (5px); + margin-top: 1em; + padding-top: 0.2em; + + input{ + border: none; + padding: 1em; + + } + &:before { + content: "+ "; + font-size: 2em; + color: @egw_color_1_a; + line-height: 0.6em; + padding-left: 0.1em; + padding-right: 0em; + background-color: @egw_color_2_a; + .border_radius_button_lefttop; + } + &:hover {.Complete_Button_add_only_plus_hover;} + &:active {background-color: @color_positive_action_active !important;} } .et2_link { diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index 332fd3cb9a..b1f5d60e6e 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -915,14 +915,16 @@ input[type="submit"][id="delete"], input[type="button"][id="delete"], button[id="delete"], button[id="infolog-edit_button[delete]"], -button[id="addressbook-edit_button[delete]"] +button[id="addressbook-edit_button[delete]"], +button[id="resources-edit_delete"] { - - background-image:url('../images/delete.png')!important; + background-color: @color_negative_action_hover !important; + background-image:url('../images/delete-hover.png')!important; margin-left: 3em; + /*color: @gray_100;*/ .Complete_Button_text_icon_before; /*background-color: @color-negative-action !important;*/ - /*color: @gray_100 !important;*/ + color: @gray_0 !important; &:hover { @@ -1041,6 +1043,28 @@ button[id="add"]{ /*Button Ende #######################################################*/ +/*dhtml Submenu ##########################################################*/ +div.dhtmlxMenu_egw_SubLevelArea_Polygon{ + + table.dhtmlxMebu_SubLevelArea_Tbl{ + + tr.sub_item { + .img_filter_gray; + + td.sub_item_icon{ + img[src*="svg"]{background-color: @gray_100; .gradient_vertical (@gray_90, @gray_90);} + } + } + + tr.sub_item_selected { + background-color: @egw_color_1_a !important; + background-image: none !important;} + } + +} + + + /////* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */ @media screen and (-webkit-min-device-pixel-ratio:0) { select { @@ -1052,4 +1076,8 @@ button[id="add"]{ } } + + + + // \ No newline at end of file diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less index e2d001f621..3bf6c0c5a1 100755 --- a/pixelegg/less/layout_messages.less +++ b/pixelegg/less/layout_messages.less @@ -27,16 +27,30 @@ .box_shadow_message; padding: 1em; - + /*Button*/ input#egwpopup_ok_button, button#desktop_perms{ - + .Complete_Button_normal; .dimension_height_m; + padding: 0 5px; + + &:hover {.Complete_Button_hover;} + &:active {background-color: @color_positive_action_active !important;} } } +/*popup Messsage*/ + div#egwpopup_message { + + background-color: .color_gray_0; + padding: 1em; + + + } + + #msg,.message { color: red; font-style: italic; @@ -99,12 +113,5 @@ } - /*popup Messsage*/ - div#egwpopup_message { - - background-color: .color_gray_0; - padding: 1em; - - - } + // \ No newline at end of file diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 84cdbf39dc..7c72fb7e16 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -273,36 +273,7 @@ ###################################################*/ #egw_fw_topmenu_addons{ - // ######################################## - // 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; - - } - - - - - + } @@ -391,13 +362,6 @@ -ms-justify-content: flex-start; - /*postion: bottom*/ - /* bottom: 3px; - right: 5px; - padding-right: 20px; - position: fixed; - z-index: 1000;*/ - .topmenu_info_item { overflow: visible; @@ -434,6 +398,50 @@ } } + + /*Notification*/ + #topmenu_info_notifications {} + + /*user info*/ + #topmenu_info_user_info {} + + /*current user info*/ + #topmenu_info_current_users {} + + /*current user info*/ + #topmenu_info_current_users {} + + /*quick*/ + #topmenu_info_quick_add { + + // ######################################## + // 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; + + } + + } + } // Ende items @@ -1087,7 +1095,7 @@ div#calendar-container { .egw_fw_ui_tabs_header { - margin: 2px 0 0 0; + margin: 0px 0 0 0; padding: 0px 1px 0px 1px; @@ -1095,7 +1103,7 @@ div#calendar-container { background-repeat: repeat-x; background-color: transparent; - height: 30px; + height: 34px; h1 { /*float: left;*/ @@ -1134,7 +1142,7 @@ div#calendar-container { background: transparent; display: inline-table; - margin: 3px 5px 0px 0px; + margin: 0px 5px 0px 0px; /*padding: 2px 10px 2px 10px;*/ cursor: pointer; border-width: 1px 1px 0 1px; @@ -1143,7 +1151,7 @@ div#calendar-container { background-repeat:repeat-x; - height: 20px; + height: 24px; &:hover {.background_color_30_gray ;} diff --git a/pixelegg/templates/pixelegg/login.tpl b/pixelegg/templates/pixelegg/login.tpl index d7f30ec0a2..a42131d69e 100644 --- a/pixelegg/templates/pixelegg/login.tpl +++ b/pixelegg/templates/pixelegg/login.tpl @@ -73,8 +73,8 @@
-STYLITE -EGROUPWARE -EGROUPWARE -EGROUPWARE +STYLITE +EGROUPWARE +EGROUPWARE +EGROUPWARE