diff --git a/filemanager/templates/pixelegg/sharing.css b/filemanager/templates/pixelegg/sharing.css index 7917306069..4e9328f85a 100644 --- a/filemanager/templates/pixelegg/sharing.css +++ b/filemanager/templates/pixelegg/sharing.css @@ -83,8 +83,6 @@ div#filemanager-index_buttons div.et2_file { div#popupMainDiv:before { content: ' '; width: 100%; - background-image: url(../../../api/templates/default/images/logo64x64.png); - background-repeat: no-repeat; background-position: 15px; background-size: 40px; height: 45px; @@ -95,6 +93,19 @@ div#popupMainDiv:before { left: 0; border-bottom: 1px solid silver; } +div#popupMainDiv:after { + content: ' '; + width: 180px; + height: 45px; + display: block; + background-size: contain; + background-image: url(../../../api/templates/default/images/logo.svg); + position: absolute; + top: 0; + left: 0; + background-repeat: no-repeat; + background-position: center; +} form#filemanager-index { margin-left: 200px !important; margin-right: 200px !important; diff --git a/filemanager/templates/pixelegg/sharing.less b/filemanager/templates/pixelegg/sharing.less index 595bf1885f..906edf3879 100644 --- a/filemanager/templates/pixelegg/sharing.less +++ b/filemanager/templates/pixelegg/sharing.less @@ -19,8 +19,6 @@ div#popupMainDiv { &:before { content: ' '; width: 100%; - background-image: url(../../../api/templates/default/images/logo64x64.png); - background-repeat: no-repeat; background-position: 15px; background-size: 40px; height: 45px; @@ -31,6 +29,19 @@ div#popupMainDiv { left: 0; border-bottom: 1px solid silver; } + &:after { + content: ' '; + width:180px; + height: 45px; + display: block; + background-size: contain; + background-image: url(../../../api/templates/default/images/logo.svg); + position: absolute; + top: 0; + left: 0; + background-repeat: no-repeat; + background-position: center; + } } form#filemanager-index { &:after { diff --git a/pixelegg/inc/class.pixelegg_framework.inc.php b/pixelegg/inc/class.pixelegg_framework.inc.php index 08daad1000..7cd7ce840d 100755 --- a/pixelegg/inc/class.pixelegg_framework.inc.php +++ b/pixelegg/inc/class.pixelegg_framework.inc.php @@ -128,15 +128,22 @@ class pixelegg_framework extends Api\Framework\Ajax { $loginbox_color = $color_darker; } + //alway set header logo used in sharing regardless of custom color being set + $header = $GLOBALS['egw_info']['server']['login_logo_header'] ? Api\Framework::get_login_logo_or_bg_url('login_logo_header', 'logo') + : Api\Framework::get_login_logo_or_bg_url('login_logo_file', 'logo'); + $ret['app_css'] .= " + /* + sharing + */ + div#popupMainDiv:after { + background-image: url($header); + } + "; if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color) || preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$loginbox_color)) // a little xss check { if (!Api\Header\UserAgent::mobile()) { - if ($GLOBALS['egw_info']['server']['login_logo_header']) - { - $header = Api\Framework::get_login_logo_or_bg_url('login_logo_header', 'logo'); - } $ret['app_css'] .= " /** * theme changes to color pixelegg for color: $color @@ -146,7 +153,6 @@ sharing */ div#popupMainDiv:before { background-color: $color; - background-image: url($header); } /* -Top window framework header