diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 61b9a85ca8..8e8f0e969a 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -2179,7 +2179,7 @@ button[id="timesheet-edit_button[delete]"], button[id="displayToolbar-delete"], button.et2_button_delete { /*background-color: @color_negative_action_hover !important;*/ - background-image: url('../images/delete.png') !important; + background-image: url('../images/delete.png'); margin-left: 3em; /*.border_normal;*/ /*.box_shadow_standard_light;*/ @@ -4368,7 +4368,7 @@ td.message span.message { padding: 0px 0px 0px 15px; line-height: 1em; font-size: 12.1px; - background-image: url(../images/arrow_left.png); + background-image: url(../images/arrow_right.png); background-repeat: no-repeat; background-position: left center; } @@ -4400,7 +4400,7 @@ td.message span.message { /*.background-clip(padding-box);*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 { - background-image: url(../images/arrow_down.png); + background-image: url(../images/arrow_down_white.png); line-height: 1em; font-size: 12px; } diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index a2150c791b..306c2eb3cb 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -2168,7 +2168,7 @@ button[id="timesheet-edit_button[delete]"], button[id="displayToolbar-delete"], button.et2_button_delete { /*background-color: @color_negative_action_hover !important;*/ - background-image: url('../images/delete.png') !important; + background-image: url('../images/delete.png'); margin-left: 3em; /*.border_normal;*/ /*.box_shadow_standard_light;*/ @@ -3763,7 +3763,7 @@ td.message span.message { text-decoration: none; height: 32px; /*font-size: 1.1em;*/ - font-size: 12.100000000000001px; + font-size: 12.1px; line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { @@ -3787,7 +3787,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before { padding-right: 20px; - font-size: 12.100000000000001px; + font-size: 12.1px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; @@ -4185,7 +4185,7 @@ td.message span.message { padding-left: 3em; color: #999999; /*font-size: 12px;*/ - font-size: 12.100000000000001px; + font-size: 12.1px; line-height: 17px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { @@ -4356,7 +4356,7 @@ td.message span.message { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.100000000000001px; + font-size: 12.1px; background-image: url(../images/arrow_right.png); background-repeat: no-repeat; background-position: left center; diff --git a/pixelegg/images/E-Mail.svg b/pixelegg/images/E-Mail.svg deleted file mode 100644 index 078163aafc..0000000000 --- a/pixelegg/images/E-Mail.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - diff --git a/pixelegg/images/addressbook.svg b/pixelegg/images/addressbook.svg deleted file mode 100644 index 16eea85f26..0000000000 --- a/pixelegg/images/addressbook.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - diff --git a/pixelegg/images/admin.svg b/pixelegg/images/admin.svg deleted file mode 100644 index b8ccb4ccc9..0000000000 --- a/pixelegg/images/admin.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - diff --git a/pixelegg/images/apply.png b/pixelegg/images/apply.png index a570914c64..0d92cc16ef 100755 Binary files a/pixelegg/images/apply.png and b/pixelegg/images/apply.png differ diff --git a/pixelegg/images/apply.svg b/pixelegg/images/apply.svg new file mode 100644 index 0000000000..79e03d5091 --- /dev/null +++ b/pixelegg/images/apply.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/pixelegg/images/attach.svg b/pixelegg/images/attach.svg new file mode 100644 index 0000000000..f339513ca7 --- /dev/null +++ b/pixelegg/images/attach.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/pixelegg/images/dots.svg b/pixelegg/images/dots.svg index 22fa1ffc74..0edd820831 100644 --- a/pixelegg/images/dots.svg +++ b/pixelegg/images/dots.svg @@ -4,10 +4,8 @@ - - - - - + + + diff --git a/pixelegg/images/edit.svg b/pixelegg/images/edit.svg new file mode 100644 index 0000000000..56a890c87f --- /dev/null +++ b/pixelegg/images/edit.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/pixelegg/images/star.svg b/pixelegg/images/favorites.svg similarity index 93% rename from pixelegg/images/star.svg rename to pixelegg/images/favorites.svg index b87c54bc9d..74fb49e189 100644 --- a/pixelegg/images/star.svg +++ b/pixelegg/images/favorites.svg @@ -4,7 +4,7 @@ - diff --git a/pixelegg/images/tracker.svg b/pixelegg/images/list_alt.svg similarity index 52% rename from pixelegg/images/tracker.svg rename to pixelegg/images/list_alt.svg index ff4fbfadf6..174aaae7d3 100644 --- a/pixelegg/images/tracker.svg +++ b/pixelegg/images/list_alt.svg @@ -2,12 +2,12 @@ - - + diff --git a/pixelegg/images/lock.svg b/pixelegg/images/lock.svg new file mode 100644 index 0000000000..b6694afc23 --- /dev/null +++ b/pixelegg/images/lock.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/pixelegg/images/menu_list.svg b/pixelegg/images/menu_list.svg index bae5a46461..5a466568c7 100644 --- a/pixelegg/images/menu_list.svg +++ b/pixelegg/images/menu_list.svg @@ -2,24 +2,18 @@ - - - - - - + - - - - - - + + + diff --git a/pixelegg/images/menu_list_round.svg b/pixelegg/images/menu_list_round.svg deleted file mode 100644 index 7121bf5b4e..0000000000 --- a/pixelegg/images/menu_list_round.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/pixelegg/images/plus.svg b/pixelegg/images/plus.svg new file mode 100644 index 0000000000..67050d1e50 --- /dev/null +++ b/pixelegg/images/plus.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/pixelegg/images/save.svg b/pixelegg/images/save.svg index 3643016ba3..5281daf88e 100644 --- a/pixelegg/images/save.svg +++ b/pixelegg/images/save.svg @@ -6,10 +6,13 @@ width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"> - + diff --git a/pixelegg/images/save_new.svg b/pixelegg/images/save_new.svg new file mode 100644 index 0000000000..8f9213051e --- /dev/null +++ b/pixelegg/images/save_new.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/pixelegg/images/setup.svg b/pixelegg/images/setup.svg new file mode 100644 index 0000000000..654e8cfec5 --- /dev/null +++ b/pixelegg/images/setup.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/pixelegg/images/tag_message.svg b/pixelegg/images/tag_message.svg new file mode 100644 index 0000000000..a25a73c51a --- /dev/null +++ b/pixelegg/images/tag_message.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/pixelegg/images/topmenu_items/mobile/back.svg b/pixelegg/images/topmenu_items/mobile/back.svg index aa3abadda4..f937446392 100644 --- a/pixelegg/images/topmenu_items/mobile/back.svg +++ b/pixelegg/images/topmenu_items/mobile/back.svg @@ -1,25 +1,12 @@ - - - - - - - - - - - - - + diff --git a/pixelegg/images/topmenu_items/mobile/check.svg b/pixelegg/images/topmenu_items/mobile/check.svg new file mode 100644 index 0000000000..04184d9531 --- /dev/null +++ b/pixelegg/images/topmenu_items/mobile/check.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/pixelegg/images/topmenu_items/mobile/menu.svg b/pixelegg/images/topmenu_items/mobile/menu.svg index d017b7f380..4e7c45a33a 100644 --- a/pixelegg/images/topmenu_items/mobile/menu.svg +++ b/pixelegg/images/topmenu_items/mobile/menu.svg @@ -1,13 +1,12 @@ - - - - - + + + diff --git a/pixelegg/images/topmenu_items/mobile/menu_active.svg b/pixelegg/images/topmenu_items/mobile/menu_active.svg new file mode 100644 index 0000000000..b6ec41689d --- /dev/null +++ b/pixelegg/images/topmenu_items/mobile/menu_active.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/pixelegg/images/topmenu_items/mobile/plus_white.svg b/pixelegg/images/topmenu_items/mobile/plus_white.svg new file mode 100644 index 0000000000..4f6bb84b7d --- /dev/null +++ b/pixelegg/images/topmenu_items/mobile/plus_white.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/pixelegg/images/wiki.svg b/pixelegg/images/wiki.svg deleted file mode 100644 index 21c0d4734d..0000000000 --- a/pixelegg/images/wiki.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less index 134ac49e8d..cf0dffa358 100755 --- a/pixelegg/less/def_buttons.less +++ b/pixelegg/less/def_buttons.less @@ -130,7 +130,7 @@ .Complete_Button_delete{ /*background-color: @color_negative_action_hover !important;*/ - background-image:url('../images/delete.png')!important; + background-image:url('../images/delete.png'); margin-left: 3em; background-color: @gray_30; .Complete_Button_text_icon_before; diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index e8f40b024d..fc78471954 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -2190,7 +2190,7 @@ button[id="timesheet-edit_button[delete]"], button[id="displayToolbar-delete"], button.et2_button_delete { /*background-color: @color_negative_action_hover !important;*/ - background-image: url('../images/delete.png') !important; + background-image: url('../images/delete.png'); margin-left: 3em; /*.border_normal;*/ /*.box_shadow_standard_light;*/ @@ -4379,7 +4379,7 @@ td.message span.message { padding: 0px 0px 0px 15px; line-height: 1em; font-size: 12.1px; - background-image: url(../images/arrow_left.png); + background-image: url(../images/arrow_right.png); background-repeat: no-repeat; background-position: left center; } @@ -4411,7 +4411,7 @@ td.message span.message { /*.background-clip(padding-box);*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 { - background-image: url(../images/arrow_down.png); + background-image: url(../images/arrow_down_white.png); line-height: 1em; font-size: 12px; } @@ -7026,7 +7026,7 @@ span.egw_tutorial_title { padding: 0; } } -@media only screen and (max-device-width: 700px) and (min-width: 321px) { +@media only screen and (max-device-width: 736px) and (min-width: 300px) { body #egw_fw_basecontainer.sidebar-toggle div#egw_fw_top_toolbar { z-index: 0; } @@ -7105,6 +7105,33 @@ span.egw_tutorial_title { body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items { padding-top: 8px; } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_logout:before { + background-image: url(../images/logout.svg); + } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_home:before { + background-image: url(../images/home.svg); + } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_prefs:before { + background-image: url(../images/setup.svg); + } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_acl:before { + background-image: url(../images/access.svg); + } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_cats:before { + background-image: url(../images/tag_message.svg); + } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_password:before { + background-image: url(../images/password.svg); + } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_manual:before { + background-image: url(../images/help.svg); + } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul li a#topmenu_search:before { + background-image: url(../images/topmenu_items/mobile/search.svg); + } + body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_menu { + background-image: url(../images/topmenu_items/mobile/menu_active.svg); + } body #egw_fw_basecontainer #egw_fw_sidemenu img[src$=".svg"] { background: none; box-shadow: none; @@ -7193,16 +7220,12 @@ span.egw_tutorial_title { background-color: #0c5da5; border: none; box-shadow: 0px 1px 5px 3px silver; - background-image: none !important; + background-image: url(../images/topmenu_items/mobile/plus_white.svg) !important; + background-repeat: no-repeat; + background-size: 24px 24px; margin: 0; padding: 0; } - body button.plus_button:after { - content: '+'; - font-weight: bold; - font-size: 34pt; - color: #fafafa; - } body button.plus_button:hover, body button.plus_button:active { background-color: #0c5da5; @@ -7321,7 +7344,7 @@ span.egw_tutorial_title { width: 50px; } body .et2_nextmatch .nm-mob-header button.nm_toggle_header { - background-image: url(../images/menu_list_round.svg); + background-image: url(../images/menu_list.svg); background-position: center; background-repeat: no-repeat; margin-right: 5px; @@ -7515,7 +7538,7 @@ span.egw_tutorial_title { bottom: 0px; right: 0; color: white; - background-image: url(../images/agt_action_success.png); + background-image: url(../images/topmenu_items/mobile/check.svg); background-repeat: no-repeat; background-position: center; height: auto; @@ -7800,6 +7823,7 @@ span.egw_tutorial_title { margin: 0; top: 0; outline: none; + z-index: 100; } body .et2_searchbox.expanded span.ui-icon.clear { top: 0px; diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less index e556d1486e..778770429f 100644 --- a/pixelegg/mobile/fw_mobile.less +++ b/pixelegg/mobile/fw_mobile.less @@ -21,9 +21,9 @@ /*Tablets Max-Width*/ @tablet-max: 1024px; /*Smartphones Max-Width*/ -@smartphone-max: 700px; +@smartphone-max: 736px; /*Smartphones Min-Width*/ -@smartphone-min: 321px; +@smartphone-min: 300px; @handheld: ~"only screen and (max-device-width : @{tablet-max})"; /*All devices portrait mode*/ @handheld-portrait: ~"only screen and (max-device-width : @{tablet-max}) and (orientation : portrait)"; @@ -254,6 +254,43 @@ #egw_fw_top_toolbar { div#egw_fw_topmenu_items { padding-top: 8px; + ul { + li{ + a#topmenu_logout{ + &:before { + background-image: url(../images/logout.svg); + } + } + a#topmenu_home:before { + background-image: url(../images/home.svg); + } + a#topmenu_prefs { + &:before { + background-image: url(../images/setup.svg); + } + } + a#topmenu_acl:before { + background-image: url(../images/access.svg); + } + a#topmenu_cats:before { + background-image: url(../images/tag_message.svg); + } + a#topmenu_password:before { + background-image: url(../images/password.svg); + } + a#topmenu_manual:before { + background-image: url(../images/help.svg); + } + a#topmenu_search{ + &:before { + background-image: url(../images/topmenu_items/mobile/search.svg); + } + } + } + } + } + div#egw_fw_menu { + background-image: url(../images/topmenu_items/mobile/menu_active.svg); } } #egw_fw_sidemenu img[src$=".svg"] { @@ -344,15 +381,11 @@ background-color: #0c5da5; border: none; box-shadow: 0px 1px 5px 3px silver; - background-image: none !important; + background-image: url(../images/topmenu_items/mobile/plus_white.svg) !important; + background-repeat: no-repeat; + background-size: 24px 24px; margin: 0; padding: 0; - &:after { - content: '+'; - font-weight: bold; - font-size: 34pt; - color: #fafafa; - } &:hover, &:active { background-color: #0c5da5; } @@ -477,7 +510,7 @@ width:50px; } button.nm_toggle_header { - background-image: url(../images/menu_list_round.svg); + background-image: url(../images/menu_list.svg); background-position: center; background-repeat: no-repeat; margin-right:5px; @@ -668,7 +701,7 @@ bottom: 0px; right: 0; color: white; - background-image: url(../images/agt_action_success.png); + background-image: url(../images/topmenu_items/mobile/check.svg); background-repeat: no-repeat; background-position: center; height: auto; @@ -987,6 +1020,7 @@ margin:0; top:0; outline: none; + z-index: 100; } span.ui-icon.clear{ top: 0px;