loleaflet/Makefile.am | 1 + loleaflet/html/loleaflet.html.m4 | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit 70d9923ea9526c1bf31815979a208c7fe68eca69 Author: Henry Castro <[email protected]> AuthorDate: Sun Jan 27 13:42:44 2019 -0400 Commit: Henry Castro <[email protected]> CommitDate: Tue Mar 5 11:56:02 2019 -0400 loleaflet: expand inline bundle.css style into html Change-Id: Id26180777a1b9838c3a9b5dc1e541023d0299595 diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 07f2dc886..a06a33c72 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -258,6 +258,7 @@ $(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT -DANDROIDAPP=$(ENABLE_ANDROIDAPP) \ -DMOBILEAPPNAME="$(MOBILE_APP_NAME)" \ -DLOLEAFLET_CSS="$(subst $(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \ + -DBUNDLE_CSS="$(abs_builddir)/dist/bundle.css" \ -DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(GLOBAL_JS) $(NODE_MODULES_JS) \ $(call LOLEAFLET_JS,$(srcdir)/build/build.js) \ $(patsubst %.js,plugins/draw-$(DRAW_VERSION)/%.js,$(call LOLEAFLET_JS,$(srcdir)/plugins/draw-$(DRAW_VERSION)/build/build.js)) \ diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4 index a41cb47b7..ed5cfa40a 100644 --- a/loleaflet/html/loleaflet.html.m4 +++ b/loleaflet/html/loleaflet.html.m4 @@ -44,16 +44,16 @@ var Base64ToArrayBuffer = function(base64Str) { </script> ifelse(MOBILEAPP,[true], - ifelse(DEBUG,[true], + [ifelse(DEBUG,[true], foreachq([fileCSS],[LOLEAFLET_CSS],[<link rel="stylesheet" href="fileCSS" /> ]), - [<link rel="stylesheet" href="bundle.css" /> - ]), - ifelse(DEBUG,[true], + [<style>syscmd([cat ]BUNDLE_CSS)</style> + ])], + [ifelse(DEBUG,[true], foreachq([fileCSS],[LOLEAFLET_CSS],[<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/fileCSS" /> ]), - [<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/bundle.css" /> - ])dnl + [<style>syscmd([cat ]BUNDLE_CSS)</style> + ])]dnl )dnl <!--%BRANDING_CSS%--> <!-- add your logo here --> ifelse(MOBILEAPP,[true], _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
