[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/css/loleaflet.css                     |    6 +++++-
 loleaflet/src/control/Control.ContextToolbar.js |    5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 291d9dd1011d13cf63292f35245c408babf20c66
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jun 3 14:04:43 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jun 3 14:10:45 2019 +0300

    tdf#122572: Avoid thin rectangular border around context toolbar on iOS
    
    Change-Id: Ifaf710b03eb860455ffb99473d82898c1de8190c

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index adeb1ac05..576931f8d 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -361,6 +361,11 @@ body {
 		background: url('images/lc_paste.svg') no-repeat center !important;
 }
 
+.loleaflet-ios-context-toolbar {
+	position: absolute;
+	float: none;
+}
+
 .loleaflet-ios-context-table {
 	color: white;
 	font-size: 15px;
diff --git a/loleaflet/src/control/Control.ContextToolbar.js b/loleaflet/src/control/Control.ContextToolbar.js
index 60dec30dc..532cbbd62 100644
--- a/loleaflet/src/control/Control.ContextToolbar.js
+++ b/loleaflet/src/control/Control.ContextToolbar.js
@@ -36,7 +36,10 @@ L.Control.ContextToolbar = L.Control.extend({
 	},
 
 	_initLayout: function () {
-		this._container = L.DomUtil.create('div', 'loleaflet-context-toolbar');
+		if (window.ThisIsTheiOSApp)
+			this._container = L.DomUtil.create('div', 'loleaflet-ios-context-toolbar');
+		else
+			this._container = L.DomUtil.create('div', 'loleaflet-context-toolbar');
 
 		var tagTd = 'td',
 		    onUp = 'mouseup',
commit fd3fa85426736db8933adbc7e050236dbf1e4782
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jun 3 13:20:32 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jun 3 14:10:40 2019 +0300

    tdf#122572: Don't underline the entries in the iOS selection context menu
    
    The entries in the native edit menus appeared underlined for me
    because I had turned on “Button Shapes” in Settings > General >
    Accessibility. They are not supposed to be underlined normally.
    
    Change-Id: I9b85774f3c8300e014092f6ea08953a404156899

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index ca6e9c9f7..adeb1ac05 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -363,7 +363,6 @@ body {
 
 .loleaflet-ios-context-table {
 	color: white;
-	text-decoration: underline;
 	font-size: 15px;
 	border-spacing: 0;
 }