resoved conflicts

This commit is contained in:
nooahe committed 2022-11-15 15:11:14 +01:00
commit 93bab0b3c5
3 files changed
+98 -44

No files matched your search

+23 -1
View File
@@ -48,6 +48,7 @@ h1 {
height: 60px;
}
<<<<<<< HEAD
p.commentText{
display: inline-block;
padding-right: 20px;
@@ -61,4 +62,25 @@ p.commentLikeNumber{
img.commentLike{
width: 15px;
display: inline-block;
}
}
=======
.image-preview ._list {
padding-top: 20px;
}
.image-preview ._item {
padding: 0 0 10px;
display: inline-block;
text-align: center;
vertical-align: top;
width: 100px;
word-break: break-word;
font-size: 12px;
line-height: normal;
}
.image-preview ._item img {
display: block;
width: 80px;
height: 80px;
padding: 0 10px 6px;
}
>>>>>>> 0e5f580c74883f876fdcee5c7870c58168ae8893