loleaflet/html/loleaflet.html.m4 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ab44bfaf5fd8452a1e4ee43a278ed4f943ff37b4
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Apr 7 18:24:44 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Apr 7 17:56:05 2020 +0200
In the iOS app we have the branding files in the Branding folder
(So that it is easier to copy them freshly in the configure script.)
Change-Id: Ib8210850abcb259cb6be7ff0d708de0cf05c135d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91838
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 8f8890209..9c83d213c 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -263,10 +263,10 @@ brandingLink.setAttribute("rel", "stylesheet");
brandingLink.setAttribute("type", "text/css");
if (window.mode.isMobile()) {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-mobile.css');]
- [brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-mobile.css');]
+ [brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])m4_ifelse(IOSAPP,[true],[Branding/])[branding-mobile.css');]
} else if (window.mode.isTablet()) {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-tablet.css');]
- [brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-tablet.css');]
+ [brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])m4_ifelse(IOSAPP,[true],[Branding/])[branding-tablet.css');]
} else {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-desktop.css');]
[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-desktop.css');]
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
