[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-2' - 4 commits - loleaflet/debug loleaflet/dist loleaflet/Makefile
Tor Lillqvist
tml at collabora.com
Wed Jun 10 01:45:35 PDT 2015
loleaflet/Makefile | 8 -
loleaflet/debug/document/document_simple_example.html | 9 +
loleaflet/dist/lool-style.css | 83 ++++++++++++++++++
3 files changed, 93 insertions(+), 7 deletions(-)
New commits:
commit 4a3518f68568a7b9a0be5883d32b25a9b8a1a5d3
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jun 10 11:45:06 2015 +0300
Bump version after tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 13658f8..2cd40fb 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
# Version number of loleaflet, no need to be in sync with the loolwsd one
-VERSION=1.0.12
+VERSION=1.0.13
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit b540e26437dbd6edf0ef76c463c39d2ad83e7a1c
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jun 10 11:41:01 2015 +0300
Bump version for tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index ad7b005..13658f8 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
# Version number of loleaflet, no need to be in sync with the loolwsd one
-VERSION=1.0.11
+VERSION=1.0.12
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit 97312c807b8a0bc643bdb0bbb7c247ad43feaf10
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Jun 10 11:43:53 2015 +0300
Include loleaflet.spec in the tarball
Also, loleaflect.spec needs to depend on Makefile.
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4b95dc5..ad7b005 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -10,13 +10,13 @@ all:
cd plugins/draw-$(DRAW_VERSION) && jake build
.PHONY: dist
-dist: all
+dist: all loleaflet.spec
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
- cp README loleaflet-$(VERSION)
+ cp README loleaflet.spec loleaflet-$(VERSION)
tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document src/scrollbar | (cd loleaflet-$(VERSION) && tar xf -)
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
rm -rf loleaflet-$(VERSION)
-loleaflet.spec: loleaflet.spec.in
+loleaflet.spec: loleaflet.spec.in Makefile
sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <loleaflet.spec.in >loleaflet.spec
commit 49acdb9428906bafa63516a9f36a1cfb99189566
Author: Sam Tuke <samtuke at collabora.com>
Date: Wed Jun 10 11:39:36 2015 +0300
Updated document_simple_example.html and a CSS for it
diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html
index 0d4fd91..2d4c840 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../dist/leaflet.css">
<link rel="stylesheet" href="../../plugins/draw-0.2.4/dist/leaflet.draw.css">
<link rel="stylesheet" href="../../src/scrollbar/jquery.mCustomScrollbar.css">
+<link rel="stylesheet" href="../../dist/lool-style.css">
<style type="text/css"></style></head>
<body>
<script src="../../dist/leaflet-src.js"></script>
@@ -27,9 +28,11 @@
The "map" div is the actual document and it has the document's size
and width, this being inside the smaller "document-container" will
cause the content to overflow, creating scrollbars -->
- <div id="toolbar" align="center">
- </div>
- <div id="document-container" style="top:100px">
+ <div id="chrome">
+ <div id="toolbar" align="center">
+ </div>
+ </div><!--End #Chrome-->
+ <div id="document-container" style="top:80px">
<div id="map"></div>
<div id="scroll-container">
<div id="mock-document">
diff --git a/loleaflet/dist/lool-style.css b/loleaflet/dist/lool-style.css
new file mode 100644
index 0000000..26c16b8
--- /dev/null
+++ b/loleaflet/dist/lool-style.css
@@ -0,0 +1,83 @@
+body {
+ margin: 0;
+}
+
+#document-container {
+ top: 85px;
+}
+
+.leaflet-bar a {
+ float: left;
+}
+
+div .leaflet-bar a:last-child {
+ border-bottom: 1px solid #ccc;
+}
+
+.leaflet-control-editviewswitch.leaflet-bar
+, leaflet-control-search.leaflet-bar {
+
+}
+
+label.leaflet-control-editviewswitch {
+ padding: 0.2em 0.4em 0.2em 0.2em;
+ margin-left: 0.5em;
+}
+
+input.leaflet-control-search-bar {
+ padding: 0.3em;
+}
+
+.leaflet-control-zoom.leaflet-bar {
+ margin-left: 0.5em;
+}
+
+div.leaflet-control-zoom leaflet-bar {
+ width: 53px;
+}
+
+button.leaflet-control-search-prev {
+ margin-left: 0.2em;
+}
+
+button.leaflet-control-search-next
+, leaflet-control-search-cancel {
+ margin-right: 0.2em;
+}
+
+#chrome {
+ padding: 0.8em 0 0 0;
+ font-family: sans-serif;
+ text-align: center;
+ margin: auto;
+ background: linear-gradient(#fff, #DAD2F7);
+ height: 100px;
+}
+
+#toolbar {
+ width: 455px;
+ text-align: center;
+ margin: auto;
+}
+
+#toolbar div
+, #toolbar label {
+ float: left;
+}
+
+#toolbar label
+, .leaflet-control-search {
+ background-color: #fff;
+}
+
+#chrome p {
+ margin: 0 0 0.3em 0;
+}
+
+div .leaflet-bar a:first-child {
+ border-radius: 4px 0 0 4px;
+}
+
+div .leaflet-bar a:last-child {
+ border-radius: 0 4px 4px 0;
+}
\ No newline at end of file
More information about the Libreoffice-commits
mailing list