loleaflet/css/loleaflet.css | 8 ++++++++
loleaflet/css/toolbar.css | 20 ++------------------
loleaflet/src/control/toolbar.js | 9 +++------
3 files changed, 13 insertions(+), 24 deletions(-)
New commits:
commit 1236c63f6b2ebe4e16596c72268ab88abbe84db7
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Mar 11 20:00:31 2019 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Mar 12 09:21:03 2019 +0100
Show user colors when no avatar is available
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index a6aefc2b2..b79b56a53 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -307,6 +307,14 @@ body {
border-radius: 50%;
}
+.user-info {
+ border-radius: 50%;
+ width: 24px;
+ height: 24px;
+ overflow: auto;
+ margin: auto;
+}
+
.loleaflet-annotation-author {
padding-left: 10px;
padding-right: 10px;
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 224c5c61d..c513ea3c7 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -714,27 +714,11 @@ tr.useritem > td {
tr.useritem > td.usercolor {
display: inline-block;
- top: 5px;
+ top: 0px;
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 > img {
+tr.useritem > td > img {
border-radius: 100px;
}
-
-tr.useritem-avatar > td.usercolor {
- display: inline-block;
- top: 0px;
- left: 3px;
- position: relative;
-}
diff --git a/loleaflet/src/control/toolbar.js b/loleaflet/src/control/toolbar.js
index 2f809ddc0..9975c7b4b 100644
--- a/loleaflet/src/control/toolbar.js
+++ b/loleaflet/src/control/toolbar.js
@@ -2165,15 +2165,12 @@ function deselectUser(e) {
}
function getUserItem(viewId, userName, extraInfo, color) {
- var className = 'useritem';
- if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
- className = 'useritem-avatar';
- }
-
- var html = '<tr class="' + className + '" id="user-' + viewId + '"
onclick="onUseritemClicked(event)">' +
+ var html = '<tr class="useritem" id="user-' + viewId + '"
onclick="onUseritemClicked(event)">' +
'<td class=usercolor>';
if (extraInfo !== undefined && extraInfo.avatar !== undefined) {
html += '<img class="avatar-img" src="' + extraInfo.avatar + '"
style="border-color: ' + color + ';" />';
+ } else {
+ html += '<div class="user-info" style="background-color: ' +
color + ';" />';
}
// TODO: Add mail and other links as sub-menu.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
