Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07f3e548 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/revert-favicon-patch' into 'main' 

Reverting favicon patch

See merge request !108
parents 13a1acc2 b260d78d

Dockerfile

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/01 
RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch

RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch

RUN patch -u ${BASE_DIR}/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php -i ${TMP_PATCH_DIR}/017-storage-wrapper.patch

RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/018-login-favicon.patch

RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/019-occ-user-setting.patch

RUN rm -rf ${TMP_PATCH_DIR}

patches/018-login-favicon.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- ./core/templates/layout.user-new.php	2022-06-21 18:13:58.237856036 +0530

+++ ./core/templates/layout.user.php	2022-06-22 00:09:19.494028933 +0530

@@ -18,7 +18,7 @@

 		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files')? $_['application']:$theme->getTitle()); ?>">

 		<meta name="mobile-web-app-capable" content="yes">

 		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">

-		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">

+		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon-color.ico')); /* IE11+ supports png */ ?>">

 		<link rel="apple-touch-icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">

 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">

 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">