[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist

[Ashod Nakashian]

 loleaflet/dist/toolbar.css        |   16 ++++++++++++++++
 loleaflet/dist/toolbar/toolbar.js |   12 +++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit c58496282cf8595ac07914ea991a5fa2975b6de2
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Jun 1 00:16:53 2017 -0400

    loleaflet: user avatar-specific css for the user list
    
    Change-Id: I5540c3267efcb23513d7df25427af8a8ff0d8909
    Reviewed-on: https://gerrit.libreoffice.org/38304
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 70e091ad..656c9800 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -335,3 +335,19 @@ tr.useritem > td.usercolor {
     left: 3px;
     position: relative;
 }
+
+tr.useritem-avatar:hover {
+    cursor: default;
+    background-color: rgba(67, 172, 232, 0.25);
+}
+
+tr.useritem-avatar > td {
+    padding: 7px;
+}
+
+tr.useritem-avatar > td.usercolor {
+    display: inline-block;
+    top: 0px;
+    left: 3px;
+    position: relative;
+}
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index b581d48b..a035ba3e 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1551,13 +1551,15 @@ function onUseritemClicked(e) {
 }
 
 function getUserItem(viewId, userName, extraInfo, color) {
-	var html = '<tr class="useritem" id="user-' + viewId + '" onclick="onUseritemClicked(event)">' +
-	             '<td class=usercolor style="background-color: ' + color  +';';
+	var className = 'useritem';
 	if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
-		html += 'top=0px ! important;"> <img src="' + extraInfo.avatar + '" width="32" height="32" />'
+		className = 'useritem-avatar';
 	}
-	else {
-		html += '">';
+
+	var html = '<tr class="' + className + '" id="user-' + viewId + '" onclick="onUseritemClicked(event)">' +
+	             '<td class=usercolor style="background-color: ' + color  +';">';
+	if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
+		html += '<img src="' + extraInfo.avatar + '" width="32" height="32" />'
 	}
 
 	// TODO: Add mail and other links as sub-menu.