dev/null |binary
loleaflet/dist/images/layers-2x.png |binary
loleaflet/dist/images/layers.png |binary
loleaflet/dist/images/lc26049.png |binary
loleaflet/dist/images/lc_accepttrackedchanges.png |binary
loleaflet/dist/images/lc_alignblock.png |binary
loleaflet/dist/images/lc_alignhorizontalcenter.png |binary
loleaflet/dist/images/lc_alignleft.png |binary
loleaflet/dist/images/lc_alignright.png |binary
loleaflet/dist/images/lc_autosum.png |binary
loleaflet/dist/images/lc_backcolor.png |binary
loleaflet/dist/images/lc_bold.png |binary
loleaflet/dist/images/lc_cancel.png |binary
loleaflet/dist/images/lc_closedoc.png |binary
loleaflet/dist/images/lc_color.png |binary
loleaflet/dist/images/lc_decrementindent.png |binary
loleaflet/dist/images/lc_decrementlevel.png |binary
loleaflet/dist/images/lc_defaultbullet.png |binary
loleaflet/dist/images/lc_defaultnumbering.png |binary
loleaflet/dist/images/lc_deletepage.png |binary
loleaflet/dist/images/lc_dia.png |binary
loleaflet/dist/images/lc_downsearch.png |binary
loleaflet/dist/images/lc_duplicatepage.png |binary
loleaflet/dist/images/lc_editdoc.png |binary
loleaflet/dist/images/lc_firstrecord.png |binary
loleaflet/dist/images/lc_gallery.png |binary
loleaflet/dist/images/lc_helpindex.png |binary
loleaflet/dist/images/lc_insertpage.png |binary
loleaflet/dist/images/lc_italic.png |binary
loleaflet/dist/images/lc_lastrecord.png |binary
loleaflet/dist/images/lc_nextrecord.png |binary
loleaflet/dist/images/lc_prevrecord.png |binary
loleaflet/dist/images/lc_print.png |binary
loleaflet/dist/images/lc_redo.png |binary
loleaflet/dist/images/lc_save.png |binary
loleaflet/dist/images/lc_saveas.png |binary
loleaflet/dist/images/lc_showannotations.png |binary
loleaflet/dist/images/lc_strikeout.png |binary
loleaflet/dist/images/lc_underline.png |binary
loleaflet/dist/images/lc_undo.png |binary
loleaflet/dist/images/lc_upsearch.png |binary
loleaflet/dist/images/lc_view100.png |binary
loleaflet/dist/images/marker-icon-2x.png |binary
loleaflet/dist/images/marker-icon.png |binary
loleaflet/dist/images/minus.png |binary
loleaflet/dist/images/plus.png |binary
loleaflet/dist/images/sc26049.png |binary
loleaflet/dist/images/sc_alignhorizontalcenter.png |binary
loleaflet/dist/images/sc_decrementlevel.png |binary
loleaflet/dist/images/sc_defaultbullet.png |binary
loleaflet/dist/images/sc_defaultnumbering.png |binary
loleaflet/dist/images/sc_dia.png |binary
loleaflet/dist/images/sc_downsearch.png |binary
loleaflet/dist/images/sc_editdoc.png |binary
loleaflet/dist/images/sc_helpindex.png |binary
loleaflet/dist/images/sc_showannotations.png |binary
loleaflet/dist/images/sc_upsearch.png |binary
loleaflet/dist/loleaflet.css | 6 -
loleaflet/dist/partsPreviewControl.css | 6 -
loleaflet/dist/spreadsheet.css | 54 ++++------
loleaflet/dist/toolbar.css | 109 +++++++++++----------
loleaflet/dist/toolbar/toolbar.js | 4
loleaflet/src/map/handler/Map.SlideShow.js | 1
63 files changed, 92 insertions(+), 88 deletions(-)
New commits:
commit b72abc4f92b5c06fa50577ef9dd001e854186b29
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu May 19 09:22:56 2016 +0200
loleaflet: Pack the toolbars a bit to take less space.
(cherry picked from commit 6f868ed74d682329fe1dd3273f3f9633c43a1159)
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 15aaa66..c985eb2 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -2,7 +2,7 @@
border-top: 1px solid #B6B6B6;
background: #DFDFDF;
position: absolute;
- top: 47px;
+ top: 45px;
bottom: 33px;
right: 0px;
left: 0px;
diff --git a/loleaflet/dist/partsPreviewControl.css
b/loleaflet/dist/partsPreviewControl.css
index 946aa6b..fcf441f 100644
--- a/loleaflet/dist/partsPreviewControl.css
+++ b/loleaflet/dist/partsPreviewControl.css
@@ -5,7 +5,7 @@
.parts-preview {
background: #DFDFDF;
position: absolute;
- top: 47px;
+ top: 45px;
left: 0px;
bottom: 33px;
max-width: 214px;
diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index bce6aee..3b2f7b8 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -1,6 +1,6 @@
.spreadsheet-document {
border-top: 1px solid #B6B6B6 !important;
- top: 100px !important;
+ top: 98px !important;
left: 50px !important;
bottom: 65px !important;
}
@@ -8,7 +8,7 @@
.spreadsheet-tab {
margin: 0;
padding: 0;
- left: 140px;
+ left: 132px;
right: 0;
bottom: 33px;
position: absolute;
@@ -59,10 +59,7 @@
}
.spreadsheet-header-corner {
- border-top: 1px solid darkgrey;
- border-left: 1px solid darkgrey;
- border-right: 1px solid darkgrey;
- border-bottom: 1px solid darkgrey;
+ border: 1px solid darkgrey;
background-color: lightgrey;
cursor: pointer;
@@ -70,23 +67,20 @@
padding: 0px;
margin: 0px;
left: 0px;
- top: 80px;
- width: 49px;
+ top: 78px;
+ width: 48px;
height: 19px;
}
.spreadsheet-header-columns-container {
- border-top: 1px solid darkgrey;
- border-left: 1px solid darkgrey;
- border-right: 1px solid darkgrey;
- border-bottom: 1px solid darkgrey;
+ border: 1px solid darkgrey;
background-color: lightgrey;
position: absolute;
display: inline-block;
white-space: nowrap;
left: 49px;
- top: 80px;
+ top: 78px;
right: 0;
height: 19px;
overflow: hidden;
@@ -97,6 +91,7 @@
white-space: nowrap;
width: 100%;
height: 100%;
+ border-spacing: 0px !important;
position: relative;
margin: 0px;
padding: 0px;
@@ -111,6 +106,7 @@
text-overflow: ellipsis;
white-space: nowrap;
padding: 0px;
+ padding-top: 1px;
margin: 0px;
height: 100%;
cursor: pointer;
@@ -128,15 +124,12 @@
}
.spreadsheet-header-rows-container {
- border-top: 1px solid darkgrey;
- border-left: 1px solid darkgrey;
- border-right: 1px solid darkgrey;
- border-bottom: 1px solid darkgrey;
+ border: 1px solid darkgrey;
background-color: lightgrey;
position: absolute;
left: 0;
- top: 100px;
+ top: 98px;
width: 48px;
bottom: 65px;
overflow: hidden;
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 8bf2659..b16f3ae 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -12,8 +12,8 @@
right: 0;
text-align: center;
padding: 6px;
- padding-top: 7px;
- padding-bottom: 5px;
+ padding-top: 6px;
+ padding-bottom: 4px;
z-index: 1000;
}
@@ -79,20 +79,19 @@
width: 100%;
}
-/*.w2ui-icon{
- background-repeat:no-repeat;
- height:16px;
- width:16px;
- overflow:hidden;
- margin:2px;
- display:inline-block
-}*/
+.w2ui-button{
+ margin:0 !important;
+}
.w2ui-tb-image {
width: 24px !important;
height: 24px !important;
}
+.w2ui-break {
+ margin:0 4px !important;
+}
+
.leaflet-bar a {
float: left;
}
commit 653ed4b8a699c0125dcb8cff09ae6830893c9680
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu May 19 08:48:40 2016 +0200
loleaflet: Don't check the 'Take edit' button, only enable/disable.
(cherry picked from commit 3b6cdcb7905576373a94c175470649f47c93692e)
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 7b4a7ba..550e055 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -900,14 +900,12 @@ map.on('hyperlinkclicked', function (e) {
map.on('editlock', function (e) {
var toolbar = w2ui['toolbar-down'];
if (e.value) {
- toolbar.check('takeedit');
toolbar.disable('takeedit');
toolbar.set('takeedit', {hint: _('You are editing (others can
only view)')});
$('#takeeditlabel').html('EDITING');
}
else {
- toolbar.uncheck('takeedit');
toolbar.enable('takeedit');
toolbar.set('takeedit', {hint: _('Take edit lock (others can
only view)')});
$('#takeeditlabel').html('VIEWING');
commit 98e02aa9d6664cd2e5979461c5dddc0f49c2c8cc
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu May 19 00:33:46 2016 +0200
loleaflet: Adjust various css values to the large icons.
(cherry picked from commit 58e7bfd97173e82eb6719ac77e855855956bf4c2)
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 2b0788f..15aaa66 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -1,9 +1,9 @@
#document-container {
- border-top: 2px solid #B6B6B6;
+ border-top: 1px solid #B6B6B6;
background: #DFDFDF;
position: absolute;
top: 47px;
- bottom: 29px;
+ bottom: 33px;
right: 0px;
left: 0px;
}
diff --git a/loleaflet/dist/partsPreviewControl.css
b/loleaflet/dist/partsPreviewControl.css
index 78ef960..946aa6b 100644
--- a/loleaflet/dist/partsPreviewControl.css
+++ b/loleaflet/dist/partsPreviewControl.css
@@ -7,10 +7,10 @@
position: absolute;
top: 47px;
left: 0px;
- bottom: 29px;
+ bottom: 33px;
max-width: 214px;
overflow: hidden;
- border-top: 2px solid #B6B6B6;
+ border-top: 1px solid #B6B6B6;
}
.preview-frame {
diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index 53f8806..bce6aee 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -2,19 +2,19 @@
border-top: 1px solid #B6B6B6 !important;
top: 100px !important;
left: 50px !important;
- bottom: 56px !important;
+ bottom: 65px !important;
}
.spreadsheet-tab {
margin: 0;
padding: 0;
- left: 108px;
+ left: 140px;
right: 0;
bottom: 33px;
position: absolute;
cursor: pointer;
- height: 24px;
- overflow-x: hidden;
+ height: 32px;
+ overflow: hidden;
white-space: nowrap;
background-color: #efefef;
@@ -31,11 +31,12 @@
.spreadsheet-context-menu {
margin: 0px;
+ margin-top: 2px;
margin-right: 3px;
- padding-left: 7px;
- padding-right: 7px;
- padding-top: 1px;
- padding-bottom: 1px;
+ padding-left: 9px;
+ padding-right: 9px;
+ padding-top: 3px;
+ padding-bottom: 3px;
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
display: inline-block;
@@ -47,10 +48,10 @@
.spreadsheet-context-menu-selected {
background: white !important;
color: black !important;
- border-top: 1px solid lightgrey;
- border-left: 1px solid lightgrey;
- border-right: 1px solid lightgrey;
- border-bottom: 1px solid lightgrey;
+ margin-top: 0px;
+ padding-top: 6px;
+ border: 1px solid #dfdfdf;
+ border-top: 0px;
}
.spreadsheet-context-menu.context-menu-disabled {
@@ -137,7 +138,7 @@
left: 0;
top: 100px;
width: 48px;
- bottom: 57px;
+ bottom: 65px;
overflow: hidden;
}
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 6f13fe7..8bf2659 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -11,7 +11,9 @@
left: 0;
right: 0;
text-align: center;
- padding: 10px;
+ padding: 6px;
+ padding-top: 7px;
+ padding-bottom: 5px;
z-index: 1000;
}
@@ -30,7 +32,7 @@
right: 10px;
width: 200px;
top: 40px;
- border: 1px solid black;
+ border: 1px solid darkgrey;
z-index: 8000;
display: none;
}
@@ -77,9 +79,18 @@
width: 100%;
}
+/*.w2ui-icon{
+ background-repeat:no-repeat;
+ height:16px;
+ width:16px;
+ overflow:hidden;
+ margin:2px;
+ display:inline-block
+}*/
+
.w2ui-tb-image {
- width: 16px;
- height: 16px;
+ width: 24px !important;
+ height: 24px !important;
}
.leaflet-bar a {
@@ -175,8 +186,8 @@ button.leaflet-control-search-next
.font-color-indicator,
.back-color-indicator {
- width: 16px;
- height: 5px;
+ width: 24px;
+ height: 6px;
margin-top: -7px !important;
margin-left: 5px !important;
position: fixed;
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 7b4ea33..7b4a7ba 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -132,6 +132,7 @@ $(function () {
items: [
{ type: 'html', id: 'left' },
{ type: 'button', id: 'presentation', img:
'presentation', hidden:true, hint: _("Fullscreen presentation") },
+ { type: 'break', id: 'presentationbreak', hidden:true },
{ type: 'button', id: 'insertpage', img: 'insertpage',
hidden:true, hint: _("Insert Page") },
{ type: 'button', id: 'duplicatepage', img:
'duplicatepage', hidden:true, hint: _("Duplicate Page") },
{ type: 'button', id: 'deletepage', img: 'deletepage',
hidden:true, hint: _("Delete Page") },
@@ -573,6 +574,7 @@ map.on('updatepermission', function (e) {
toolbar = w2ui['presentation-toolbar'];
toolbar.show('presentation');
+ toolbar.show('presentationbreak');
toolbar.show('insertpage');
toolbar.show('duplicatepage');
toolbar.show('deletepage');
commit e3eb5103bd823d5f5f64c8d05b6973cae88a9059
Author: Jan Holesovsky <ke...@collabora.com>
Date: Wed May 18 15:04:18 2016 +0200
loleaflet: Switch to using large icons.
Kept the small icons around for the case we'd like to implement switching
between these two (?) - OTOH not sure it makes sense, as the toolbars will
not
get smaller by just using the smaller icons... But always can remove them
in
a separate commit.
(cherry picked from commit 4d539a5cd36b4d25a80e569f12f8577de15e03a4)
diff --git a/loleaflet/dist/images/lc26049.png
b/loleaflet/dist/images/lc26049.png
new file mode 100644
index 0000000..47b79bb
Binary files /dev/null and b/loleaflet/dist/images/lc26049.png differ
diff --git a/loleaflet/dist/images/lc_accepttrackedchanges.png
b/loleaflet/dist/images/lc_accepttrackedchanges.png
new file mode 100644
index 0000000..5a50d28
Binary files /dev/null and b/loleaflet/dist/images/lc_accepttrackedchanges.png
differ
diff --git a/loleaflet/dist/images/lc_alignblock.png
b/loleaflet/dist/images/lc_alignblock.png
new file mode 100644
index 0000000..1632a7b
Binary files /dev/null and b/loleaflet/dist/images/lc_alignblock.png differ
diff --git a/loleaflet/dist/images/lc_alignhorizontalcenter.png
b/loleaflet/dist/images/lc_alignhorizontalcenter.png
new file mode 100644
index 0000000..5b787d5
Binary files /dev/null and b/loleaflet/dist/images/lc_alignhorizontalcenter.png
differ
diff --git a/loleaflet/dist/images/lc_alignleft.png
b/loleaflet/dist/images/lc_alignleft.png
new file mode 100644
index 0000000..47a03aa
Binary files /dev/null and b/loleaflet/dist/images/lc_alignleft.png differ
diff --git a/loleaflet/dist/images/lc_alignright.png
b/loleaflet/dist/images/lc_alignright.png
new file mode 100644
index 0000000..8de04c0
Binary files /dev/null and b/loleaflet/dist/images/lc_alignright.png differ
diff --git a/loleaflet/dist/images/lc_autosum.png
b/loleaflet/dist/images/lc_autosum.png
new file mode 100644
index 0000000..76f1840
Binary files /dev/null and b/loleaflet/dist/images/lc_autosum.png differ
diff --git a/loleaflet/dist/images/lc_backcolor.png
b/loleaflet/dist/images/lc_backcolor.png
new file mode 100644
index 0000000..f8f11c4
Binary files /dev/null and b/loleaflet/dist/images/lc_backcolor.png differ
diff --git a/loleaflet/dist/images/lc_bold.png
b/loleaflet/dist/images/lc_bold.png
new file mode 100644
index 0000000..e1b5820
Binary files /dev/null and b/loleaflet/dist/images/lc_bold.png differ
diff --git a/loleaflet/dist/images/lc_cancel.png
b/loleaflet/dist/images/lc_cancel.png
new file mode 100644
index 0000000..9e65d05
Binary files /dev/null and b/loleaflet/dist/images/lc_cancel.png differ
diff --git a/loleaflet/dist/images/lc_closedoc.png
b/loleaflet/dist/images/lc_closedoc.png
new file mode 100644
index 0000000..361881b
Binary files /dev/null and b/loleaflet/dist/images/lc_closedoc.png differ
diff --git a/loleaflet/dist/images/lc_color.png
b/loleaflet/dist/images/lc_color.png
new file mode 100644
index 0000000..5280680
Binary files /dev/null and b/loleaflet/dist/images/lc_color.png differ
diff --git a/loleaflet/dist/images/lc_decrementindent.png
b/loleaflet/dist/images/lc_decrementindent.png
new file mode 100644
index 0000000..b2a6c72
Binary files /dev/null and b/loleaflet/dist/images/lc_decrementindent.png differ
diff --git a/loleaflet/dist/images/lc_decrementlevel.png
b/loleaflet/dist/images/lc_decrementlevel.png
new file mode 100644
index 0000000..5cedff3
Binary files /dev/null and b/loleaflet/dist/images/lc_decrementlevel.png differ
diff --git a/loleaflet/dist/images/lc_defaultbullet.png
b/loleaflet/dist/images/lc_defaultbullet.png
new file mode 100644
index 0000000..c446793
Binary files /dev/null and b/loleaflet/dist/images/lc_defaultbullet.png differ
diff --git a/loleaflet/dist/images/lc_defaultnumbering.png
b/loleaflet/dist/images/lc_defaultnumbering.png
new file mode 100644
index 0000000..3f9690e
Binary files /dev/null and b/loleaflet/dist/images/lc_defaultnumbering.png
differ
diff --git a/loleaflet/dist/images/lc_deletepage.png
b/loleaflet/dist/images/lc_deletepage.png
new file mode 100644
index 0000000..e12688a
Binary files /dev/null and b/loleaflet/dist/images/lc_deletepage.png differ
diff --git a/loleaflet/dist/images/lc_dia.png b/loleaflet/dist/images/lc_dia.png
new file mode 100644
index 0000000..901e61e
Binary files /dev/null and b/loleaflet/dist/images/lc_dia.png differ
diff --git a/loleaflet/dist/images/lc_downsearch.png
b/loleaflet/dist/images/lc_downsearch.png
new file mode 100644
index 0000000..3c85e1a
Binary files /dev/null and b/loleaflet/dist/images/lc_downsearch.png differ
diff --git a/loleaflet/dist/images/lc_duplicatepage.png
b/loleaflet/dist/images/lc_duplicatepage.png
new file mode 100644
index 0000000..234a362
Binary files /dev/null and b/loleaflet/dist/images/lc_duplicatepage.png differ
diff --git a/loleaflet/dist/images/lc_editdoc.png
b/loleaflet/dist/images/lc_editdoc.png
new file mode 100644
index 0000000..a762031
Binary files /dev/null and b/loleaflet/dist/images/lc_editdoc.png differ
diff --git a/loleaflet/dist/images/lc_firstrecord.png
b/loleaflet/dist/images/lc_firstrecord.png
new file mode 100644
index 0000000..154ffa2
Binary files /dev/null and b/loleaflet/dist/images/lc_firstrecord.png differ
diff --git a/loleaflet/dist/images/lc_gallery.png
b/loleaflet/dist/images/lc_gallery.png
new file mode 100644
index 0000000..51e8228
Binary files /dev/null and b/loleaflet/dist/images/lc_gallery.png differ
diff --git a/loleaflet/dist/images/lc_helpindex.png
b/loleaflet/dist/images/lc_helpindex.png
new file mode 100644
index 0000000..ec7c675
Binary files /dev/null and b/loleaflet/dist/images/lc_helpindex.png differ
diff --git a/loleaflet/dist/images/lc_insertpage.png
b/loleaflet/dist/images/lc_insertpage.png
new file mode 100644
index 0000000..612251d
Binary files /dev/null and b/loleaflet/dist/images/lc_insertpage.png differ
diff --git a/loleaflet/dist/images/lc_italic.png
b/loleaflet/dist/images/lc_italic.png
new file mode 100644
index 0000000..5d26144
Binary files /dev/null and b/loleaflet/dist/images/lc_italic.png differ
diff --git a/loleaflet/dist/images/lc_lastrecord.png
b/loleaflet/dist/images/lc_lastrecord.png
new file mode 100644
index 0000000..30714f9
Binary files /dev/null and b/loleaflet/dist/images/lc_lastrecord.png differ
diff --git a/loleaflet/dist/images/lc_nextrecord.png
b/loleaflet/dist/images/lc_nextrecord.png
new file mode 100644
index 0000000..923430c
Binary files /dev/null and b/loleaflet/dist/images/lc_nextrecord.png differ
diff --git a/loleaflet/dist/images/lc_prevrecord.png
b/loleaflet/dist/images/lc_prevrecord.png
new file mode 100644
index 0000000..2e46d97
Binary files /dev/null and b/loleaflet/dist/images/lc_prevrecord.png differ
diff --git a/loleaflet/dist/images/lc_print.png
b/loleaflet/dist/images/lc_print.png
new file mode 100644
index 0000000..7ffea95
Binary files /dev/null and b/loleaflet/dist/images/lc_print.png differ
diff --git a/loleaflet/dist/images/lc_redo.png
b/loleaflet/dist/images/lc_redo.png
new file mode 100644
index 0000000..71803bc
Binary files /dev/null and b/loleaflet/dist/images/lc_redo.png differ
diff --git a/loleaflet/dist/images/lc_save.png
b/loleaflet/dist/images/lc_save.png
new file mode 100644
index 0000000..b2efa0a
Binary files /dev/null and b/loleaflet/dist/images/lc_save.png differ
diff --git a/loleaflet/dist/images/lc_saveas.png
b/loleaflet/dist/images/lc_saveas.png
new file mode 100644
index 0000000..4b952dd
Binary files /dev/null and b/loleaflet/dist/images/lc_saveas.png differ
diff --git a/loleaflet/dist/images/lc_showannotations.png
b/loleaflet/dist/images/lc_showannotations.png
new file mode 100644
index 0000000..d40c711
Binary files /dev/null and b/loleaflet/dist/images/lc_showannotations.png differ
diff --git a/loleaflet/dist/images/lc_strikeout.png
b/loleaflet/dist/images/lc_strikeout.png
new file mode 100644
index 0000000..20dae7e
Binary files /dev/null and b/loleaflet/dist/images/lc_strikeout.png differ
diff --git a/loleaflet/dist/images/lc_underline.png
b/loleaflet/dist/images/lc_underline.png
new file mode 100644
index 0000000..6a499dc
Binary files /dev/null and b/loleaflet/dist/images/lc_underline.png differ
diff --git a/loleaflet/dist/images/lc_undo.png
b/loleaflet/dist/images/lc_undo.png
new file mode 100644
index 0000000..dcf09aa
Binary files /dev/null and b/loleaflet/dist/images/lc_undo.png differ
diff --git a/loleaflet/dist/images/lc_upsearch.png
b/loleaflet/dist/images/lc_upsearch.png
new file mode 100644
index 0000000..c113361
Binary files /dev/null and b/loleaflet/dist/images/lc_upsearch.png differ
diff --git a/loleaflet/dist/images/lc_view100.png
b/loleaflet/dist/images/lc_view100.png
new file mode 100644
index 0000000..c3d36ed
Binary files /dev/null and b/loleaflet/dist/images/lc_view100.png differ
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index c88ea71..6f13fe7 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -47,7 +47,7 @@
background: #DFDFDF;
left: 0;
text-align: center;
- bottom: 28px;
+ bottom: 33px;
width: 203px;
padding: 0;
position: absolute;
@@ -188,50 +188,50 @@ button.leaflet-control-search-next
border-style: solid;
}
-.w2ui-icon.accepttrackedchanges{ background:
url('/loleaflet/dist/images/sc_accepttrackedchanges.png') no-repeat center
!important; }
-.w2ui-icon.alignblock{ background:
url('/loleaflet/dist/images/sc_alignblock.png') no-repeat center !important; }
-.w2ui-icon.alignhorizontal{ background:
url('/loleaflet/dist/images/sc_alignhorizontalcenter.png') no-repeat center
!important; }
-.w2ui-icon.alignleft{ background:
url('/loleaflet/dist/images/sc_alignleft.png') no-repeat center !important; }
-.w2ui-icon.alignright{ background:
url('/loleaflet/dist/images/sc_alignright.png') no-repeat center !important; }
-.w2ui-icon.autosum{ background: url('/loleaflet/dist/images/sc_autosum.png')
no-repeat center !important; }
-.w2ui-icon.backcolor{ background:
url('/loleaflet/dist/images/sc_backcolor.png') no-repeat center !important; }
-.w2ui-icon.bold{ background: url('/loleaflet/dist/images/sc_bold.png')
no-repeat center !important; }
-.w2ui-icon.bullet{ background:
url('/loleaflet/dist/images/sc_defaultbullet.png') no-repeat center !important;
}
-.w2ui-icon.cancel{ background: url('/loleaflet/dist/images/sc_cancel.png')
no-repeat center !important; }
-.w2ui-icon.color{ background: url('/loleaflet/dist/images/sc_color.png')
no-repeat center !important; }
-.w2ui-icon.closedoc{ background: url('/loleaflet/dist/images/sc_closedoc.png')
no-repeat center !important; }
-.w2ui-icon.decrementindent{ background:
url('/loleaflet/dist/images/sc_decrementindent.png') no-repeat center
!important; }
-.w2ui-icon.deletepage{ background:
url('/loleaflet/dist/images/sc_deletepage.png') no-repeat center !important; }
-.w2ui-icon.duplicatepage{ background:
url('/loleaflet/dist/images/sc_duplicatepage.png') no-repeat center !important;
}
-.w2ui-icon.edit{ background: url('/loleaflet/dist/images/sc_editdoc.png')
no-repeat center !important; }
-.w2ui-icon.equal{ background: url('/loleaflet/dist/images/sc26049.png')
no-repeat center !important; }
-.w2ui-icon.help{ background: url('/loleaflet/dist/images/sc_helpindex.png')
no-repeat center !important; }
-.w2ui-icon.incrementindent{ background:
url('/loleaflet/dist/images/sc_decrementlevel.png') no-repeat center
!important; }
-.w2ui-icon.insertpage{ background:
url('/loleaflet/dist/images/sc_insertpage.png') no-repeat center !important; }
-.w2ui-icon.italic{ background: url('/loleaflet/dist/images/sc_italic.png')
no-repeat center !important; }
-.w2ui-icon.insertgraphic{ background:
url('/loleaflet/dist/images/sc_gallery.png') no-repeat center !important; }
-.w2ui-icon.next{ background: url('/loleaflet/dist/images/sc_downsearch.png')
no-repeat center !important; }
-.w2ui-icon.numbering{ background:
url('/loleaflet/dist/images/sc_defaultnumbering.png') no-repeat center
!important; }
-.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/sc_dia.png')
no-repeat center !important; }
-.w2ui-icon.prev{ background: url('/loleaflet/dist/images/sc_upsearch.png')
no-repeat center !important; }
-.w2ui-icon.print{ background: url('/loleaflet/dist/images/sc_print.png')
no-repeat center !important; }
-.w2ui-icon.redo{ background: url('/loleaflet/dist/images/sc_redo.png')
no-repeat center !important; }
-.w2ui-icon.save{ background: url('/loleaflet/dist/images/sc_save.png')
no-repeat center !important; }
-.w2ui-icon.saveas{ background: url('/loleaflet/dist/images/sc_saveas.png')
no-repeat center !important; }
-.w2ui-icon.strikeout{ background:
url('/loleaflet/dist/images/sc_strikeout.png') no-repeat center !important; }
-.w2ui-icon.underline{ background:
url('/loleaflet/dist/images/sc_underline.png') no-repeat center !important; }
-.w2ui-icon.undo{ background: url('/loleaflet/dist/images/sc_undo.png')
no-repeat center !important; }
+.w2ui-icon.accepttrackedchanges{ background:
url('/loleaflet/dist/images/lc_accepttrackedchanges.png') no-repeat center
!important; }
+.w2ui-icon.alignblock{ background:
url('/loleaflet/dist/images/lc_alignblock.png') no-repeat center !important; }
+.w2ui-icon.alignhorizontal{ background:
url('/loleaflet/dist/images/lc_alignhorizontalcenter.png') no-repeat center
!important; }
+.w2ui-icon.alignleft{ background:
url('/loleaflet/dist/images/lc_alignleft.png') no-repeat center !important; }
+.w2ui-icon.alignright{ background:
url('/loleaflet/dist/images/lc_alignright.png') no-repeat center !important; }
+.w2ui-icon.autosum{ background: url('/loleaflet/dist/images/lc_autosum.png')
no-repeat center !important; }
+.w2ui-icon.backcolor{ background:
url('/loleaflet/dist/images/lc_backcolor.png') no-repeat center !important; }
+.w2ui-icon.bold{ background: url('/loleaflet/dist/images/lc_bold.png')
no-repeat center !important; }
+.w2ui-icon.bullet{ background:
url('/loleaflet/dist/images/lc_defaultbullet.png') no-repeat center !important;
}
+.w2ui-icon.cancel{ background: url('/loleaflet/dist/images/lc_cancel.png')
no-repeat center !important; }
+.w2ui-icon.color{ background: url('/loleaflet/dist/images/lc_color.png')
no-repeat center !important; }
+.w2ui-icon.closedoc{ background: url('/loleaflet/dist/images/lc_closedoc.png')
no-repeat center !important; }
+.w2ui-icon.decrementindent{ background:
url('/loleaflet/dist/images/lc_decrementindent.png') no-repeat center
!important; }
+.w2ui-icon.deletepage{ background:
url('/loleaflet/dist/images/lc_deletepage.png') no-repeat center !important; }
+.w2ui-icon.duplicatepage{ background:
url('/loleaflet/dist/images/lc_duplicatepage.png') no-repeat center !important;
}
+.w2ui-icon.edit{ background: url('/loleaflet/dist/images/lc_editdoc.png')
no-repeat center !important; }
+.w2ui-icon.equal{ background: url('/loleaflet/dist/images/lc26049.png')
no-repeat center !important; }
+.w2ui-icon.help{ background: url('/loleaflet/dist/images/lc_helpindex.png')
no-repeat center !important; }
+.w2ui-icon.incrementindent{ background:
url('/loleaflet/dist/images/lc_decrementlevel.png') no-repeat center
!important; }
+.w2ui-icon.insertpage{ background:
url('/loleaflet/dist/images/lc_insertpage.png') no-repeat center !important; }
+.w2ui-icon.italic{ background: url('/loleaflet/dist/images/lc_italic.png')
no-repeat center !important; }
+.w2ui-icon.insertgraphic{ background:
url('/loleaflet/dist/images/lc_gallery.png') no-repeat center !important; }
+.w2ui-icon.next{ background: url('/loleaflet/dist/images/lc_downsearch.png')
no-repeat center !important; }
+.w2ui-icon.numbering{ background:
url('/loleaflet/dist/images/lc_defaultnumbering.png') no-repeat center
!important; }
+.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/lc_dia.png')
no-repeat center !important; }
+.w2ui-icon.prev{ background: url('/loleaflet/dist/images/lc_upsearch.png')
no-repeat center !important; }
+.w2ui-icon.print{ background: url('/loleaflet/dist/images/lc_print.png')
no-repeat center !important; }
+.w2ui-icon.redo{ background: url('/loleaflet/dist/images/lc_redo.png')
no-repeat center !important; }
+.w2ui-icon.save{ background: url('/loleaflet/dist/images/lc_save.png')
no-repeat center !important; }
+.w2ui-icon.saveas{ background: url('/loleaflet/dist/images/lc_saveas.png')
no-repeat center !important; }
+.w2ui-icon.strikeout{ background:
url('/loleaflet/dist/images/lc_strikeout.png') no-repeat center !important; }
+.w2ui-icon.underline{ background:
url('/loleaflet/dist/images/lc_underline.png') no-repeat center !important; }
+.w2ui-icon.undo{ background: url('/loleaflet/dist/images/lc_undo.png')
no-repeat center !important; }
.w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/plus.png')
no-repeat center !important; }
.w2ui-icon.zoomout{ background: url('/loleaflet/dist/images/minus.png')
no-repeat center !important; }
-.w2ui-icon.zoomreset{ background: url('/loleaflet/dist/images/sc_view100.png')
no-repeat center !important; }
-.w2ui-icon.more{ background: url('/loleaflet/dist/images/sc_downsearch.png')
no-repeat center !important; }
-.w2ui-icon.firstrecord{ background:
url('/loleaflet/dist/images/sc_firstrecord.png') no-repeat center !important; }
-.w2ui-icon.nextrecord{ background:
url('/loleaflet/dist/images/sc_nextrecord.png') no-repeat center !important; }
-.w2ui-icon.prevrecord{ background:
url('/loleaflet/dist/images/sc_prevrecord.png') no-repeat center !important; }
-.w2ui-icon.lastrecord{ background:
url('/loleaflet/dist/images/sc_lastrecord.png') no-repeat center !important; }
+.w2ui-icon.zoomreset{ background: url('/loleaflet/dist/images/lc_view100.png')
no-repeat center !important; }
+.w2ui-icon.more{ background: url('/loleaflet/dist/images/lc_downsearch.png')
no-repeat center !important; }
+.w2ui-icon.firstrecord{ background:
url('/loleaflet/dist/images/lc_firstrecord.png') no-repeat center !important; }
+.w2ui-icon.nextrecord{ background:
url('/loleaflet/dist/images/lc_nextrecord.png') no-repeat center !important; }
+.w2ui-icon.prevrecord{ background:
url('/loleaflet/dist/images/lc_prevrecord.png') no-repeat center !important; }
+.w2ui-icon.lastrecord{ background:
url('/loleaflet/dist/images/lc_lastrecord.png') no-repeat center !important; }
#simplemodal-container a.modalCloseImg {
- background:url('/loleaflet/dist/images/sc_closedoc.png') no-repeat;
+ background:url('/loleaflet/dist/images/lc_closedoc.png') no-repeat;
width:25px;
height:29px;
display:inline;
commit 5367dab5d803605ee42d549d6e8c6898e57e6160
Author: Jan Holesovsky <ke...@collabora.com>
Date: Wed May 18 14:19:25 2016 +0200
loleaflet: Rename the icons to what is directly in LibreOffice.
So that it is easier to update to new version etc.
(cherry picked from commit b5eee85e20efe9485be79766acb45d20f1c3632a)
diff --git a/loleaflet/dist/images/sc_zoomout.png
b/loleaflet/dist/images/minus.png
similarity index 100%
rename from loleaflet/dist/images/sc_zoomout.png
rename to loleaflet/dist/images/minus.png
diff --git a/loleaflet/dist/images/sc_zoomin.png
b/loleaflet/dist/images/plus.png
similarity index 100%
rename from loleaflet/dist/images/sc_zoomin.png
rename to loleaflet/dist/images/plus.png
diff --git a/loleaflet/dist/images/sc_equal.png
b/loleaflet/dist/images/sc26049.png
similarity index 100%
rename from loleaflet/dist/images/sc_equal.png
rename to loleaflet/dist/images/sc26049.png
diff --git a/loleaflet/dist/images/sc_alignhorizontal.png
b/loleaflet/dist/images/sc_alignhorizontalcenter.png
similarity index 100%
rename from loleaflet/dist/images/sc_alignhorizontal.png
rename to loleaflet/dist/images/sc_alignhorizontalcenter.png
diff --git a/loleaflet/dist/images/sc_incrementindent.png
b/loleaflet/dist/images/sc_decrementlevel.png
similarity index 100%
rename from loleaflet/dist/images/sc_incrementindent.png
rename to loleaflet/dist/images/sc_decrementlevel.png
diff --git a/loleaflet/dist/images/sc_bullet.png
b/loleaflet/dist/images/sc_defaultbullet.png
similarity index 100%
rename from loleaflet/dist/images/sc_bullet.png
rename to loleaflet/dist/images/sc_defaultbullet.png
diff --git a/loleaflet/dist/images/sc_numbering.png
b/loleaflet/dist/images/sc_defaultnumbering.png
similarity index 100%
rename from loleaflet/dist/images/sc_numbering.png
rename to loleaflet/dist/images/sc_defaultnumbering.png
diff --git a/loleaflet/dist/images/sc_presentation.png
b/loleaflet/dist/images/sc_dia.png
similarity index 100%
rename from loleaflet/dist/images/sc_presentation.png
rename to loleaflet/dist/images/sc_dia.png
diff --git a/loleaflet/dist/images/sc_next.png
b/loleaflet/dist/images/sc_downsearch.png
similarity index 100%
rename from loleaflet/dist/images/sc_next.png
rename to loleaflet/dist/images/sc_downsearch.png
diff --git a/loleaflet/dist/images/sc_edit.png
b/loleaflet/dist/images/sc_editdoc.png
similarity index 100%
rename from loleaflet/dist/images/sc_edit.png
rename to loleaflet/dist/images/sc_editdoc.png
diff --git a/loleaflet/dist/images/sc_help.png
b/loleaflet/dist/images/sc_help.png
deleted file mode 100644
index e69233a..0000000
Binary files a/loleaflet/dist/images/sc_help.png and /dev/null differ
diff --git a/loleaflet/dist/images/sc_helpindex.png
b/loleaflet/dist/images/sc_helpindex.png
new file mode 100644
index 0000000..b11665c
Binary files /dev/null and b/loleaflet/dist/images/sc_helpindex.png differ
diff --git a/loleaflet/dist/images/sc_select.png
b/loleaflet/dist/images/sc_select.png
deleted file mode 100644
index 6c96a66..0000000
Binary files a/loleaflet/dist/images/sc_select.png and /dev/null differ
diff --git a/loleaflet/dist/images/sc_showannotations.png
b/loleaflet/dist/images/sc_showannotations.png
new file mode 100644
index 0000000..d6e1c96
Binary files /dev/null and b/loleaflet/dist/images/sc_showannotations.png differ
diff --git a/loleaflet/dist/images/sc_prev.png
b/loleaflet/dist/images/sc_upsearch.png
similarity index 100%
rename from loleaflet/dist/images/sc_prev.png
rename to loleaflet/dist/images/sc_upsearch.png
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 495c662..c88ea71 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -190,42 +190,41 @@ button.leaflet-control-search-next
.w2ui-icon.accepttrackedchanges{ background:
url('/loleaflet/dist/images/sc_accepttrackedchanges.png') no-repeat center
!important; }
.w2ui-icon.alignblock{ background:
url('/loleaflet/dist/images/sc_alignblock.png') no-repeat center !important; }
-.w2ui-icon.alignhorizontal{ background:
url('/loleaflet/dist/images/sc_alignhorizontal.png') no-repeat center
!important; }
+.w2ui-icon.alignhorizontal{ background:
url('/loleaflet/dist/images/sc_alignhorizontalcenter.png') no-repeat center
!important; }
.w2ui-icon.alignleft{ background:
url('/loleaflet/dist/images/sc_alignleft.png') no-repeat center !important; }
.w2ui-icon.alignright{ background:
url('/loleaflet/dist/images/sc_alignright.png') no-repeat center !important; }
.w2ui-icon.autosum{ background: url('/loleaflet/dist/images/sc_autosum.png')
no-repeat center !important; }
.w2ui-icon.backcolor{ background:
url('/loleaflet/dist/images/sc_backcolor.png') no-repeat center !important; }
.w2ui-icon.bold{ background: url('/loleaflet/dist/images/sc_bold.png')
no-repeat center !important; }
-.w2ui-icon.bullet{ background: url('/loleaflet/dist/images/sc_bullet.png')
no-repeat center !important; }
+.w2ui-icon.bullet{ background:
url('/loleaflet/dist/images/sc_defaultbullet.png') no-repeat center !important;
}
.w2ui-icon.cancel{ background: url('/loleaflet/dist/images/sc_cancel.png')
no-repeat center !important; }
.w2ui-icon.color{ background: url('/loleaflet/dist/images/sc_color.png')
no-repeat center !important; }
.w2ui-icon.closedoc{ background: url('/loleaflet/dist/images/sc_closedoc.png')
no-repeat center !important; }
.w2ui-icon.decrementindent{ background:
url('/loleaflet/dist/images/sc_decrementindent.png') no-repeat center
!important; }
.w2ui-icon.deletepage{ background:
url('/loleaflet/dist/images/sc_deletepage.png') no-repeat center !important; }
.w2ui-icon.duplicatepage{ background:
url('/loleaflet/dist/images/sc_duplicatepage.png') no-repeat center !important;
}
-.w2ui-icon.edit{ background: url('/loleaflet/dist/images/sc_edit.png')
no-repeat center !important; }
-.w2ui-icon.equal{ background: url('/loleaflet/dist/images/sc_equal.png')
no-repeat center !important; }
-.w2ui-icon.help{ background: url('/loleaflet/dist/images/sc_help.png')
no-repeat center !important; }
-.w2ui-icon.incrementindent{ background:
url('/loleaflet/dist/images/sc_incrementindent.png') no-repeat center
!important; }
+.w2ui-icon.edit{ background: url('/loleaflet/dist/images/sc_editdoc.png')
no-repeat center !important; }
+.w2ui-icon.equal{ background: url('/loleaflet/dist/images/sc26049.png')
no-repeat center !important; }
+.w2ui-icon.help{ background: url('/loleaflet/dist/images/sc_helpindex.png')
no-repeat center !important; }
+.w2ui-icon.incrementindent{ background:
url('/loleaflet/dist/images/sc_decrementlevel.png') no-repeat center
!important; }
.w2ui-icon.insertpage{ background:
url('/loleaflet/dist/images/sc_insertpage.png') no-repeat center !important; }
.w2ui-icon.italic{ background: url('/loleaflet/dist/images/sc_italic.png')
no-repeat center !important; }
.w2ui-icon.insertgraphic{ background:
url('/loleaflet/dist/images/sc_gallery.png') no-repeat center !important; }
-.w2ui-icon.next{ background: url('/loleaflet/dist/images/sc_next.png')
no-repeat center !important; }
-.w2ui-icon.numbering{ background:
url('/loleaflet/dist/images/sc_numbering.png') no-repeat center !important; }
-.w2ui-icon.presentation{ background:
url('/loleaflet/dist/images/sc_presentation.png') no-repeat center !important; }
-.w2ui-icon.prev{ background: url('/loleaflet/dist/images/sc_prev.png')
no-repeat center !important; }
+.w2ui-icon.next{ background: url('/loleaflet/dist/images/sc_downsearch.png')
no-repeat center !important; }
+.w2ui-icon.numbering{ background:
url('/loleaflet/dist/images/sc_defaultnumbering.png') no-repeat center
!important; }
+.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/sc_dia.png')
no-repeat center !important; }
+.w2ui-icon.prev{ background: url('/loleaflet/dist/images/sc_upsearch.png')
no-repeat center !important; }
.w2ui-icon.print{ background: url('/loleaflet/dist/images/sc_print.png')
no-repeat center !important; }
.w2ui-icon.redo{ background: url('/loleaflet/dist/images/sc_redo.png')
no-repeat center !important; }
.w2ui-icon.save{ background: url('/loleaflet/dist/images/sc_save.png')
no-repeat center !important; }
.w2ui-icon.saveas{ background: url('/loleaflet/dist/images/sc_saveas.png')
no-repeat center !important; }
-.w2ui-icon.select{ background: url('/loleaflet/dist/images/sc_select.png')
no-repeat center !important; }
.w2ui-icon.strikeout{ background:
url('/loleaflet/dist/images/sc_strikeout.png') no-repeat center !important; }
.w2ui-icon.underline{ background:
url('/loleaflet/dist/images/sc_underline.png') no-repeat center !important; }
.w2ui-icon.undo{ background: url('/loleaflet/dist/images/sc_undo.png')
no-repeat center !important; }
-.w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/sc_zoomin.png')
no-repeat center !important; }
-.w2ui-icon.zoomout{ background: url('/loleaflet/dist/images/sc_zoomout.png')
no-repeat center !important; }
+.w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/plus.png')
no-repeat center !important; }
+.w2ui-icon.zoomout{ background: url('/loleaflet/dist/images/minus.png')
no-repeat center !important; }
.w2ui-icon.zoomreset{ background: url('/loleaflet/dist/images/sc_view100.png')
no-repeat center !important; }
-.w2ui-icon.more{ background: url('/loleaflet/dist/images/sc_next.png')
no-repeat center !important; }
+.w2ui-icon.more{ background: url('/loleaflet/dist/images/sc_downsearch.png')
no-repeat center !important; }
.w2ui-icon.firstrecord{ background:
url('/loleaflet/dist/images/sc_firstrecord.png') no-repeat center !important; }
.w2ui-icon.nextrecord{ background:
url('/loleaflet/dist/images/sc_nextrecord.png') no-repeat center !important; }
.w2ui-icon.prevrecord{ background:
url('/loleaflet/dist/images/sc_prevrecord.png') no-repeat center !important; }
commit 3686bf666d078e4e3307454aea159f03dafb310e
Author: Jan Holesovsky <ke...@collabora.com>
Date: Wed May 18 09:44:35 2016 +0200
Fix some broken icons, remove the unused ones.
(cherry picked from commit 1e57be70943128227b7696f5cfb05e3dcea291f4)
diff --git a/loleaflet/dist/images/edit.png b/loleaflet/dist/images/edit.png
deleted file mode 100644
index d0dfaa5..0000000
Binary files a/loleaflet/dist/images/edit.png and /dev/null differ
diff --git a/loleaflet/dist/images/layers-2x.png
b/loleaflet/dist/images/layers-2x.png
index de54f88..a2cf7f9 100644
Binary files a/loleaflet/dist/images/layers-2x.png and
b/loleaflet/dist/images/layers-2x.png differ
diff --git a/loleaflet/dist/images/layers.png b/loleaflet/dist/images/layers.png
index 89869fd..bca0a0e 100644
Binary files a/loleaflet/dist/images/layers.png and
b/loleaflet/dist/images/layers.png differ
diff --git a/loleaflet/dist/images/marker-icon-2x.png
b/loleaflet/dist/images/marker-icon-2x.png
index e7159bb..0015b64 100644
Binary files a/loleaflet/dist/images/marker-icon-2x.png and
b/loleaflet/dist/images/marker-icon-2x.png differ
diff --git a/loleaflet/dist/images/marker-icon.png
b/loleaflet/dist/images/marker-icon.png
index 565dfa1..e2e9f75 100644
Binary files a/loleaflet/dist/images/marker-icon.png and
b/loleaflet/dist/images/marker-icon.png differ
diff --git a/loleaflet/dist/images/selection.png
b/loleaflet/dist/images/selection.png
deleted file mode 100644
index f9121b9..0000000
Binary files a/loleaflet/dist/images/selection.png and /dev/null differ
commit 4685af05ad893152b0ac181aa6436fe30fbfc0b8
Author: Henry Castro <hcas...@collabora.com>
Date: Wed May 18 18:27:46 2016 -0400
loleaflet: fix slide show focus
(cherry picked from commit 5a455e0d0a01ecad2e5113203cc2052a8b60ee17)
diff --git a/loleaflet/src/map/handler/Map.SlideShow.js
b/loleaflet/src/map/handler/Map.SlideShow.js
index 14a8809..f1bb023 100644
--- a/loleaflet/src/map/handler/Map.SlideShow.js
+++ b/loleaflet/src/map/handler/Map.SlideShow.js
@@ -63,6 +63,7 @@ L.Map.SlideShow = L.Handler.extend({
_onSlideDownloadReady: function (e) {
this._slideShow.src = e.url + '?mime_type=image/svg%2Bxml';
+ this._slideShow.contentWindow.focus();
}
});
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
