0c45778219
Although #7256 was merged cleanly some of the changes really conflicted with those introduced by the last commit of #7251, and this broke the appearance of the author row of comments. This commit fixes those silent conflicts and restores the appearance of the author row. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
218 lines
4.8 KiB
CSS
218 lines
4.8 KiB
CSS
/*
|
|
* Copyright (c) 2016
|
|
*
|
|
* This file is licensed under the Affero General Public License version 3
|
|
* or later.
|
|
*
|
|
* See the COPYING-README file.
|
|
*
|
|
*/
|
|
|
|
#commentsTabView .emptycontent {
|
|
margin-top: 0;
|
|
}
|
|
|
|
#commentsTabView .newCommentForm {
|
|
position: relative;
|
|
margin-bottom: 20px;
|
|
}
|
|
|
|
#commentsTabView .newCommentForm .message {
|
|
width: calc(100% - 81px); /* 36 (left margin) + 30 (right padding) + 15 (right padding of surrounding box) */
|
|
margin-left: 36px;
|
|
padding-right: 30px;
|
|
display: block;
|
|
}
|
|
|
|
#commentsTabView .newCommentForm .submit {
|
|
position: absolute;
|
|
bottom: 0px;
|
|
right: 8px;
|
|
width: 30px;
|
|
margin: 0;
|
|
padding: 7px 9px;
|
|
background-color: transparent;
|
|
border: none;
|
|
opacity: .3;
|
|
}
|
|
#commentsTabView .newCommentForm .submit:not(:disabled):hover,
|
|
#commentsTabView .newCommentForm .submit:not(:disabled):focus {
|
|
opacity: 1;
|
|
}
|
|
|
|
#commentsTabView .newCommentForm .submitLoading {
|
|
background-position: left;
|
|
|
|
/* Match rules for '#commentsTabView .newCommentForm .submit' to place the
|
|
loading icon at the same position as the confirm icon */
|
|
position: absolute;
|
|
bottom: 0px;
|
|
right: 8px;
|
|
width: 30px;
|
|
margin: 0;
|
|
padding: 7px 9px;
|
|
|
|
/* Match rules for 'input[type="submit"]' to place the loading icon at the
|
|
same position as the confirm icon */
|
|
min-height: 34px;
|
|
box-sizing: border-box;
|
|
}
|
|
|
|
#commentsTabView .newCommentForm .cancel {
|
|
margin-right: 6px;
|
|
}
|
|
|
|
#commentsTabView .newCommentForm div.message {
|
|
resize: none;
|
|
}
|
|
|
|
#commentsTabView .newCommentForm div.message:empty:before {
|
|
content: attr(data-placeholder);
|
|
color: grey;
|
|
}
|
|
|
|
#commentsTabView .comment {
|
|
position: relative;
|
|
margin-bottom: 30px;
|
|
word-wrap: break-word;
|
|
overflow-wrap: break-word;
|
|
}
|
|
|
|
#commentsTabView .comment .avatar,
|
|
.atwho-view-ul * .avatar{
|
|
width: 32px;
|
|
height: 32px;
|
|
line-height: 32px;
|
|
margin-right: 5px;
|
|
}
|
|
|
|
#commentsTabView .comment .message .avatar,
|
|
.atwho-view-ul * .avatar
|
|
{
|
|
display: inline-block;
|
|
}
|
|
|
|
#activityTabView li.comment.collapsed .activitymessage,
|
|
#commentsTabView .comment.collapsed .message {
|
|
white-space: pre-wrap;
|
|
}
|
|
|
|
#activityTabView li.comment.collapsed .activitymessage,
|
|
#commentsTabView .comment.collapsed .message {
|
|
max-height: 70px;
|
|
overflow: hidden;
|
|
}
|
|
|
|
#activityTabView li.comment .message-overlay,
|
|
#commentsTabView .comment .message-overlay {
|
|
display: none;
|
|
}
|
|
|
|
#activityTabView li.comment.collapsed .message-overlay,
|
|
#commentsTabView .comment.collapsed .message-overlay {
|
|
display: block;
|
|
position: absolute;
|
|
z-index: 2;
|
|
height: 50px;
|
|
pointer-events: none;
|
|
left: 0;
|
|
right: 0;
|
|
bottom: 0;
|
|
background: -moz-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
|
|
background: -webkit-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
|
|
background: -o-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
|
|
background: -ms-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
|
|
background: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
|
|
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00FFFFFF', endColorstr='#FFFFFFFF');
|
|
background-repeat: no-repeat;
|
|
}
|
|
|
|
#commentsTabView .authorRow>div:not(.contactsmenu-popover) {
|
|
display: inline-block;
|
|
vertical-align: middle;
|
|
}
|
|
|
|
#commentsTabView .authorRow>div.hidden {
|
|
display: none !important;
|
|
}
|
|
|
|
#commentsTabView .comments li .message .avatar-name-wrapper,
|
|
.atwho-view-ul * .avatar-name-wrapper,
|
|
#commentsTabView .comment .authorRow {
|
|
position: relative;
|
|
display: inline-flex;
|
|
align-items: center;
|
|
width: 100%;
|
|
}
|
|
|
|
#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser),
|
|
#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar,
|
|
#commentsTabView .comment .authorRow .avatar:not(.currentUser),
|
|
#commentsTabView .comment .authorRow .author:not(.currentUser) {
|
|
cursor: pointer;
|
|
}
|
|
|
|
.atwho-view-ul .avatar-name-wrapper,
|
|
.atwho-view-ul .avatar-name-wrapper .avatar {
|
|
cursor: pointer;
|
|
}
|
|
|
|
#commentsTabView .comments li .message .atwho-inserted {
|
|
margin-left: 5px;
|
|
}
|
|
|
|
.atwho-view-ul * .avatar-name-wrapper {
|
|
white-space: nowrap;
|
|
}
|
|
|
|
#commentsTabView .comment .author,
|
|
#commentsTabView .comment .date {
|
|
opacity: .5;
|
|
}
|
|
#commentsTabView .comment .date {
|
|
margin-left: auto;
|
|
}
|
|
|
|
#commentsTabView .comments li .message {
|
|
padding-left: 40px;
|
|
display: inline-flex;
|
|
flex-wrap: wrap;
|
|
align-items: center;
|
|
}
|
|
|
|
#commentsTabView .comment .action {
|
|
opacity: 0;
|
|
padding: 5px;
|
|
}
|
|
|
|
#commentsTabView .comment:hover .action {
|
|
opacity: 0.3;
|
|
}
|
|
|
|
#commentsTabView .comment .action:hover {
|
|
opacity: 1;
|
|
}
|
|
|
|
#commentsTabView .comment .action.delete,
|
|
#commentsTabView .comment .deleteLoading {
|
|
position: absolute;
|
|
right: 0;
|
|
}
|
|
|
|
#commentsTabView .comment.disabled {
|
|
opacity: 0.3;
|
|
}
|
|
|
|
#commentsTabView .comment.disabled .action {
|
|
visibility: hidden;
|
|
}
|
|
|
|
#commentsTabView .message.error {
|
|
color: #e9322d;
|
|
border-color: #e9322d;
|
|
box-shadow: 0 0 6px #f8b9b7;
|
|
}
|
|
|
|
.app-files .action-comment {
|
|
padding: 16px 14px;
|
|
}
|