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

Mihai Varga mihai.varga at collabora.com
Thu Jul 16 07:33:43 PDT 2015


 loleaflet/dist/leaflet.css           |   23 ++++++++++++-----------
 loleaflet/src/layer/marker/Cursor.js |   14 +++++---------
 2 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit b159241e77e19ec7ec301da5e1a74c8b2b2ddd90
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Thu Jul 16 17:33:18 2015 +0300

    loleaflet: the cursor now has the same width (2px)

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index a3d1ca5..5cac88f 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -590,7 +590,8 @@ a.leaflet-control-buttons:hover {
 }
 
 .blinking-cursor {
-  color: #2E3D48;
+  background: black;
+  width: 2px;
   pointer-events: none;
   -webkit-animation: 1s blink step-end 0s infinite;
   -moz-animation: 1s blink step-end 0s infinite;
@@ -601,46 +602,46 @@ a.leaflet-control-buttons:hover {
 
 @keyframes "blink" {
   from, to {
-    color: black;
+    background: black;
   }
   50% {
-    color: transparent;
+    background: transparent;
   }
 }
 
 @-moz-keyframes blink {
   from, to {
-    color: black;
+    background: black;
   }
   50% {
-    color: transparent;
+    background: transparent;
   }
 }
 
 @-webkit-keyframes "blink" {
   from, to {
-    color: black;
+    background: black;
   }
   50% {
-    color: transparent;
+    background: transparent;
   }
 }
 
 @-ms-keyframes "blink" {
   from, to {
-    color: black;
+    background: black;
   }
   50% {
-    color: transparent;
+    background: transparent;
   }
 }
 
 @-o-keyframes "blink" {
   from, to {
-    color: black;
+    background: black;
   }
   50% {
-    color: transparent;
+    background: transparent;
   }
 }
 
diff --git a/loleaflet/src/layer/marker/Cursor.js b/loleaflet/src/layer/marker/Cursor.js
index cbe683d..b4cd5f1 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -49,13 +49,11 @@ L.Cursor = L.Layer.extend({
 
 	_initLayout: function () {
 		this._container = L.DomUtil.create('div', 'leaflet-cursor');
-
-		//<span class="blinking-cursor">|</span>
-		this._span = L.DomUtil.create('span', 'blinking-cursor', this._container);
-		this._span.innerHTML = '|';
+		// a black rectangle
+		this._cursor = L.DomUtil.create('div', 'blinking-cursor', this._container);
 
 		L.DomEvent
-			.disableClickPropagation(this._span)
+			.disableClickPropagation(this._cursor)
 			.disableScrollPropagation(this._container);
 
 		if (this._container) {
@@ -84,10 +82,8 @@ L.Cursor = L.Layer.extend({
 	},
 
 	setSize: function (size) {
-		this._container.style.lineHeight = size.y + 'px';
-		this._span.style.fontSize = size.y - 2 + 'px';
-		this._container.style.left = '-' + (this._container.clientWidth - size.x)/2 + 'px';
-		this._container.style.top = '-' + (this._container.clientHeight - size.y - 2)/2 + 'px';
+		this._cursor.style.height = size.y + 'px';
+		this._container.style.top = '-' + (this._container.clientHeight - size.y - 2) / 2 + 'px';
 	}
 });
 


More information about the Libreoffice-commits mailing list