mirror of
https://github.com/wekan/wekan.git
synced 2026-02-09 09:44:22 +01:00
Resolve merge conflicts by accepting PR #6131 changes
Co-authored-by: xet7 <15545+xet7@users.noreply.github.com>
This commit is contained in:
parent
dc0b68ee80
commit
97dd5d2064
257 changed files with 9483 additions and 14103 deletions
|
|
@ -1,16 +1,22 @@
|
|||
.activity-title {
|
||||
margin: 0 0.7vw 1vh;
|
||||
display: flex;
|
||||
gap: 0.5lh;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.reactions-popup {
|
||||
display: flex;
|
||||
gap: 1ch;
|
||||
flex-wrap: wrap;
|
||||
margin: 0.5lh 0.5ch;
|
||||
max-width: 80vw;
|
||||
}
|
||||
.reactions-popup .add-comment-reaction {
|
||||
display: inline-block;
|
||||
cursor: pointer;
|
||||
border-radius: 0.7vw;
|
||||
font-size: clamp(18px, 4vw, 22px);
|
||||
text-align: center;
|
||||
line-height: 1.3;
|
||||
width: 5vw;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
.reactions-popup .add-comment-reaction:hover {
|
||||
background-color: #b0c4de;
|
||||
|
|
@ -18,20 +24,20 @@
|
|||
.activities {
|
||||
clear: both;
|
||||
}
|
||||
.activity {
|
||||
display: flex;
|
||||
}
|
||||
.activities .activity {
|
||||
margin: 0.1vh 0;
|
||||
padding: 0.8vh 0;
|
||||
display: flex;
|
||||
}
|
||||
.activities .activity .member {
|
||||
width: 4vw;
|
||||
height: 4vw;
|
||||
font-size: 0.8em;
|
||||
}
|
||||
.activities .activity .activity-member {
|
||||
font-weight: 700;
|
||||
}
|
||||
.activities .activity .activity-desc {
|
||||
word-wrap: break-word;
|
||||
overflow-wrap: break-word;
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
align-self: center;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue