Merge branch 'staging' into framework

2017-10-13 13:41:24 +03:00
parent a6b34491fc 7b6432f134
commit 15337603bb
12 changed files with 54 additions and 54 deletions
--- a/www/slide/app-slide.less
+++ b/www/slide/app-slide.less
@@ -277,10 +277,13 @@ div#cp-app-slide-modal #cp-app-slide-modal-content, #cp-app-slide-print {
        // fixes image overflowing
        media-tag {
            height: 100%;
+            flex-flow: row;
+            justify-content: center;

            & + * {
                margin-top: 1rem;
            }
+            img { flex: unset; }
        }

        img {