summaryrefslogtreecommitdiffstats
path: root/apps/comments
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-11-27 12:14:30 +0100
committerGitHub <noreply@github.com>2017-11-27 12:14:30 +0100
commitc5446ebd9a60bac93c2d31d583ae14f841393ef0 (patch)
treec0525bfed7d1cf21d6288f511ace8fbe0bca8261 /apps/comments
parentfb1a92b07df9f485eabd3374c68419f11518f799 (diff)
parent5591ea6e8bef0f87d1ebc915fd43a9acd7719890 (diff)
downloadnextcloud-server-c5446ebd9a60bac93c2d31d583ae14f841393ef0.tar.gz
nextcloud-server-c5446ebd9a60bac93c2d31d583ae14f841393ef0.zip
Merge pull request #7251 from nextcloud/contact-menu-position-fix
Fixed contact menu position on comments
Diffstat (limited to 'apps/comments')
-rw-r--r--apps/comments/css/comments.css23
1 files changed, 14 insertions, 9 deletions
diff --git a/apps/comments/css/comments.css b/apps/comments/css/comments.css
index 6b0452da1fd..89b3bc37d50 100644
--- a/apps/comments/css/comments.css
+++ b/apps/comments/css/comments.css
@@ -69,6 +69,7 @@
width: 32px;
height: 32px;
line-height: 32px;
+ margin-right: 5px;
}
#commentsTabView .comment .message .avatar,
@@ -112,7 +113,7 @@
background-repeat: no-repeat;
}
-#commentsTabView .authorRow>div {
+#commentsTabView .authorRow>div:not(.contactsmenu-popover) {
display: inline-block;
vertical-align: middle;
}
@@ -126,6 +127,13 @@
#commentsTabView .comment .authorRow {
position: relative;
cursor: pointer;
+ display: inline-flex;
+ align-items: center;
+ width: 100%;
+}
+
+#commentsTabView .comments li .message .atwho-inserted {
+ margin-left: 5px;
}
.atwho-view-ul * .avatar-name-wrapper {
@@ -136,23 +144,20 @@
#commentsTabView .comment .date {
opacity: .5;
}
-#commentsTabView .comment .author {
- margin-left: 5px;
-}
#commentsTabView .comment .date {
- position: absolute;
- right: 0;
- top: 5px;
+ margin-left: auto;
}
#commentsTabView .comments li .message {
padding-left: 40px;
+ display: inline-flex;
+ flex-wrap: wrap;
+ align-items: center;
}
#commentsTabView .comment .action {
opacity: 0;
- vertical-align: middle;
- display: inline-block;
+ padding: 5px;
}
#commentsTabView .comment:hover .action {