loleaflet/Makefile.am | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
New commits:
commit 801643baf0928351ecc2647cfa8f72cdd82fb207
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Jan 10 12:34:43 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Thu Jan 10 12:37:46 2019 +0100
Actually, let's ship both these jQuery themes.
Change-Id: I3e546e155d50fb280fe12c31b8c33523ac8e9f11
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index f3ff90601..1bb7e5ed8 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -24,9 +24,13 @@ $(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po)
$(shell find $(srcdir)/l10
done
endif
-JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/base/minified/images
-JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png)
-JQUERY_UI_DIST_IMAGES = $(patsubst
$(JQUERY_UI_IMAGE_PATH)/%.png,$(builddir)/dist/images/%.png,$(JQUERY_UI_IMAGES))
+JQUERY_LIGHTNESS_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
+JQUERY_LIGHTNESS_IMAGES = $(wildcard $(JQUERY_LIGHTNESS_IMAGE_PATH)/*.png)
+JQUERY_LIGHTNESS_DIST_IMAGES = $(patsubst
$(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png,$(builddir)/dist/images/%.png,$(JQUERY_LIGHTNESS_IMAGES))
+
+JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui/themes/base/minified/images
+JQUERY_MINIFIED_IMAGES = $(wildcard $(JQUERY_MINIFIED_IMAGE_PATH)/*.png)
+JQUERY_MINIFIED_DIST_IMAGES = $(patsubst
$(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(builddir)/dist/images/%.png,$(JQUERY_MINIFIED_IMAGES))
LOLEAFLET_IMAGES_SRC = $(shell find $(srcdir)/images -name '*.*')
LOLEAFLET_IMAGES_DST = $(patsubst
$(srcdir)/%,$(builddir)/dist/%,$(LOLEAFLET_IMAGES_SRC))
@@ -156,7 +160,8 @@ endif
build-loleaflet: | $(LOLEAFLET_L10N_DST) \
$(L10N_JSON) \
$(LOLEAFLET_IMAGES_DST) \
- $(JQUERY_UI_DIST_IMAGES) \
+ $(JQUERY_LIGHTNESS_DIST_IMAGES) \
+ $(JQUERY_MINIFIED_DIST_IMAGES) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
$(ADMIN_BUNDLE) \
$(builddir)/dist/bundle.css \
@@ -275,11 +280,19 @@ $(builddir)/dist/node_modules/%.js:
$(builddir)/node_modules/%.js
@mkdir -p $(dir $@)
@cp $< $@
-$(builddir)/dist/$(JQUERY_UI_IMAGE_PATH)/%.png: $(JQUERY_UI_IMAGE_PATH)/%.png
+$(builddir)/dist/$(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png:
$(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png
+ @mkdir -p $(dir $@)
+ @cp $< $@
+
+$(builddir)/dist/images/%.png: $(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png
+ @mkdir -p $(dir $@)
+ @cp $< $@
+
+$(builddir)/dist/$(JQUERY_MINIFIED_IMAGE_PATH)/%.png:
$(JQUERY_MINIFIED_IMAGE_PATH)/%.png
@mkdir -p $(dir $@)
@cp $< $@
-$(builddir)/dist/images/%.png: $(JQUERY_UI_IMAGE_PATH)/%.png
+$(builddir)/dist/images/%.png: $(JQUERY_MINIFIED_IMAGE_PATH)/%.png
@mkdir -p $(dir $@)
@cp $< $@
commit 83dc72115d4c56d0b9f4ca7934822fbe5f0e67c7
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Jan 10 11:32:23 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Thu Jan 10 11:32:23 2019 +0100
Update the dialog closing button's image.
Change-Id: I2a5d9d62bda4e20e24a5bdeeea1befad594918b1
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index cc6f2a410..f3ff90601 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -24,7 +24,7 @@ $(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po) $(shell
find $(srcdir)/l10
done
endif
-JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
+JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/base/minified/images
JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png)
JQUERY_UI_DIST_IMAGES = $(patsubst
$(JQUERY_UI_IMAGE_PATH)/%.png,$(builddir)/dist/images/%.png,$(JQUERY_UI_IMAGES))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
