From 0046f561cf53e297fae8a0f0336ece27c2d6fbab Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 17 Nov 2017 13:41:57 +0100 Subject: [PATCH] Fix notifications popup for mobile template & compact theme --- pixelegg/css/mobile.less | 3 ++ pixelegg/head_mobile.tpl | 1 + pixelegg/mobile/fw_mobile.css | 73 +++++++++++++++++++++++++++++----- pixelegg/mobile/fw_mobile.less | 72 ++++++++++++++++++++++++++++----- 4 files changed, 131 insertions(+), 18 deletions(-) diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less index 7f5c3cf811..c2598bc8bc 100644 --- a/pixelegg/css/mobile.less +++ b/pixelegg/css/mobile.less @@ -160,6 +160,9 @@ display: inline-block; background-position: center; } + } + #egwpopup_fw_notifications { + } #egw_fw_appsToggle {display: none;} div.egw_fw_ui_tabs_header{ diff --git a/pixelegg/head_mobile.tpl b/pixelegg/head_mobile.tpl index c20af8224d..65ce3e554f 100644 --- a/pixelegg/head_mobile.tpl +++ b/pixelegg/head_mobile.tpl @@ -37,6 +37,7 @@
+
0
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 3a17073c50..f1d9ae84cd 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -7561,21 +7561,33 @@ form[id^="wiki-"] .dialogHeadbar { top: 0 !important; bottom: 0 !important; left: 0 !important; - right: 5px !important; + right: 0 !important; border: none; box-shadow: none; padding: 0; border-radius: 0; + position: fixed; + z-index: 10 !important; + } + body #egwpopup #egwpopup_list .egwpopup_message.egwpopup_expanded { + position: fixed; + top: 0; + height: 100%; + left: 0; + width: calc(100% - 20px); + overflow: auto; + margin: 0; } body #egwpopup #egwpopup_header { text-align: center; height: 50px; z-index: 1; background-color: #5180AC; - line-height: 40px; + line-height: 50px; width: 100%; font-size: 10pt; color: white; + padding: 0px; } body #egwpopup #egwpopup_header span { -webkit-filter: brightness(0) invert(1) !important; @@ -7583,20 +7595,41 @@ form[id^="wiki-"] .dialogHeadbar { background-color: transparent !important; background-size: 24px 24px !important; border: none; - height: 50px; - position: absolute; - left: 10px; + } + body #egwpopup #egwpopup_header .egwpopup_toggle { background-image: url(../images/cancelled.svg); background-repeat: no-repeat; background-position: center; - } - body #egwpopup #egwpopup_header span button { - width: 50px; height: 50px; + width: 50px; + cursor: pointer; + position: relative; + float: left; + margin: 0; } - body #egwpopup #egwpopup_header span img { + body #egwpopup #egwpopup_header .egwpopup_toggle:before { display: none; } + body #egwpopup #egwpopup_header .egwpopup_toggle:after { + display: none; + } + body #egwpopup #egwpopup_header .egwpopup_deleteall { + width: 30px; + height: 30px; + background-position: center; + position: relative; + margin-top: 10px; + margin-right: 30px; + opacity: 1; + } + body #egwpopup #egwpopup_header .egwpopup_seenall { + width: 20px; + height: 20px; + padding: 0px; + margin-right: 20px; + margin-top: 15px; + opacity: 1; + } body #egwpopup #egwpopup_footer { position: absolute; top: 0px; @@ -7632,6 +7665,9 @@ form[id^="wiki-"] .dialogHeadbar { left: 10px; float: none; } + body #egw_fw_basecontainer.sidebar-toggle #egw_fw_top_toolbar #egwpopup_fw_notifications { + display: none !important; + } body #egw_fw_basecontainer.sidebar-toggle #egw_fw_top_toolbar div#egw_fw_menu { background-image: url(../images/topmenu_items/mobile/menu.svg); width: 50px; @@ -7654,6 +7690,9 @@ form[id^="wiki-"] .dialogHeadbar { position: absolute; width: 300px; } + body #egw_fw_basecontainer #egw_fw_top_toolbar .egw_fw_logout { + margin-left: 30px; + } body #egw_fw_basecontainer #egw_fw_top_toolbar #egw_fw_userinfo { float: right; } @@ -7672,6 +7711,22 @@ form[id^="wiki-"] .dialogHeadbar { body #egw_fw_basecontainer #egw_fw_top_toolbar #egw_fw_appsToggle.toggled { background-image: url(../images/sidebar.svg); } + body #egw_fw_basecontainer #egw_fw_top_toolbar #egwpopup_fw_notifications { + height: 25px; + width: 25px; + z-index: 1000; + right: 0px; + display: inline-block; + float: left; + position: relative; + top: 12px; + line-height: 27px; + margin: 0; + margin-left: 15px; + } + body #egw_fw_basecontainer #egw_fw_top_toolbar #egwpopup_fw_notifications .popup_note { + display: none; + } body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items ul { border-left: 6px solid silver; } diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less index 2db0d6b591..b628352b48 100644 --- a/pixelegg/mobile/fw_mobile.less +++ b/pixelegg/mobile/fw_mobile.less @@ -288,30 +288,66 @@ top: 0 !important; bottom: 0 !important; left: 0 !important; - right: 5px !important; + right: 0 !important; border: none; box-shadow: none; padding: 0; border-radius: 0; + position:fixed; + z-index: 10 !important; + #egwpopup_list { + .egwpopup_message.egwpopup_expanded { + position: fixed; + top: 0; + height: 100%; + left: 0; + width: ~"calc(100% - 20px)"; + overflow: auto; + margin: 0; + } + } #egwpopup_header { text-align: center; height: 50px; z-index: 1; background-color: #5180AC; - line-height: 40px; + line-height: 50px; width:100%; .mob-fontsize-n; color:white; + padding: 0px; span { .white-svg; - height: 50px; - position: absolute; - left:10px; + } + .egwpopup_toggle { background-image: url(../images/cancelled.svg); - background-repeat:no-repeat; - background-position:center; - button {width:50px;height:50px;} - img {display: none;} + background-repeat: no-repeat; + background-position: center; + height: 50px; + width: 50px; + cursor: pointer; + position: relative; + float: left; + margin: 0; + &:before {display: none;} + &:after {display: none;} + } + .egwpopup_deleteall { + width: 30px; + height: 30px; + background-position: center; + position: relative; + margin-top: 10px; + margin-right: 30px; + opacity: 1; + } + .egwpopup_seenall { + width: 20px; + height: 20px; + padding: 0px; + margin-right: 20px; + margin-top: 15px; + opacity: 1; } } #egwpopup_footer { @@ -348,6 +384,7 @@ } #egw_fw_basecontainer.sidebar-toggle { #egw_fw_top_toolbar { + #egwpopup_fw_notifications {display: none !important;} div#egw_fw_menu { background-image: url(../images/topmenu_items/mobile/menu.svg); width: 50px; @@ -370,6 +407,9 @@ #egw_fw_top_toolbar { position:absolute; width:300px; + .egw_fw_logout { + margin-left: 30px; + } #egw_fw_userinfo { float: right; } @@ -388,6 +428,20 @@ #egw_fw_appsToggle.toggled { background-image:url(../images/sidebar.svg); } + #egwpopup_fw_notifications { + height: 25px; + width: 25px; + z-index: 1000; + right: 0px; + display: inline-block; + float: left; + position: relative; + top: 12px; + line-height: 27px; + margin: 0; + margin-left: 15px; + .popup_note {display: none;} + } div#egw_fw_topmenu_items { ul { border-left: 6px solid silver;