Merge branch 'fix/css-margin-adjustments-for-attachments' into 'develop'

Adjust margins for attachments/previews

See merge request pleroma/pleroma-fe!501
このコミットが含まれているのは:
Shpuld Shpludson 2019-01-30 19:45:15 +00:00
コミット fbe7af3d56
2個のファイルの変更4行の追加1行の削除

ファイルの表示

@ -27,12 +27,15 @@
align-content: stretch; align-content: stretch;
flex-grow: 1; flex-grow: 1;
margin-top: 0.5em; margin-top: 0.5em;
margin-bottom: 0.25em;
.attachments, .attachment { .attachments, .attachment {
margin: 0 0.5em 0 0; margin: 0 0.5em 0 0;
flex-grow: 1; flex-grow: 1;
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
// to make failed images a bit more noticeable on chromium
min-width: 2em;
} }
.image-attachment { .image-attachment {

ファイルの表示

@ -26,7 +26,7 @@
// TODO: clean up the random margins in attachments, this makes preview line // TODO: clean up the random margins in attachments, this makes preview line
// up with attachments... // up with attachments...
margin-right: 0.7em; margin-right: 0.5em;
.card-image { .card-image {
flex-shrink: 0; flex-shrink: 0;