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

[Pranav Kant]

 loleaflet/dist/loleaflet.css             |    6 +++++-
 loleaflet/src/layer/marker/Annotation.js |    9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 043ec94bef7dd82dd558fe5834e068636820300c
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Apr 14 11:46:12 2017 +0530

    loleaflet: Same width for all comments, different from redline comments
    
    Separate css classes for these different types of annotations.
    
    Change-Id: I2013a05a2f7095956765661169670e0bb87bb372

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index d7522f87..cd7ae6a0 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -138,7 +138,7 @@ body {
 	text-align: center;
 }
 
-.loleaflet-annotation-content-wrapper {
+.loleaflet-annotation-content-wrapper, .loleaflet-annotation-redline-content-wrapper {
 	padding: 8px;
 	font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif !important;
 	font-size: 13px;
@@ -151,6 +151,10 @@ body {
 	border-radius: 2px;
 }
 
+.loleaflet-annotation-content-wrapper {
+        width: 180px;
+}
+
 .loleaflet-annotation-content {
 	margin: 3px 3px;
 	line-height: 1.4;
diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index 2c881c9a..97b2d8e9 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -131,9 +131,12 @@ L.Annotation = L.Layer.extend({
 		    classTextArea = 'loleaflet-annotation-textarea',
 		    classEdit = 'loleaflet-annotation-edit';
 		var container = this._container =
-			L.DomUtil.create(tagDiv, 'loleaflet-annotation');
-		var wrapper = this._wrapper =
-			L.DomUtil.create(tagDiv, 'loleaflet-annotation-content-wrapper', container);
+		    L.DomUtil.create(tagDiv, 'loleaflet-annotation');
+		if (this._data.trackchange) {
+			var wrapper = this._wrapper = L.DomUtil.create(tagDiv, 'loleaflet-annotation-redline-content-wrapper', container);
+		} else {
+			wrapper = this._wrapper = L.DomUtil.create(tagDiv, 'loleaflet-annotation-content-wrapper', container);
+		}
 		this._author = L.DomUtil.create('table', 'loleaflet-annotation-table', wrapper);
 		var tbody = L.DomUtil.create('tbody', empty, this._author);
 		var tr = L.DomUtil.create('tr', empty, tbody);