Merge branch 'master' into staging

This commit is contained in:
yflory 2017-10-12 17:08:34 +02:00
commit 88d0a2b8a6

View File

@ -277,10 +277,13 @@ div#cp-app-slide-modal #cp-app-slide-modal-content, #cp-app-slide-print {
// fixes image overflowing // fixes image overflowing
media-tag { media-tag {
height: 100%; height: 100%;
flex-flow: row;
justify-content: center;
& + * { & + * {
margin-top: 1rem; margin-top: 1rem;
} }
img { flex: unset; }
} }
img { img {