Merge pull request #1787 from pixelfed/staging

Staging

public/mix-manifest.json

@@ -18,10 +18,10 @@
     "/js/hashtag.js": "/js/hashtag.js?id=1e5990f89b6bfe7e037b",
     "/js/loops.js": "/js/loops.js?id=9c31302552d789d5f35b",
     "/js/mode-dot.js": "/js/mode-dot.js?id=993d7fee684361edddbc",
-    "/js/profile.js": "/js/profile.js?id=d9e0b271d41c601c16b1",
+    "/js/profile.js": "/js/profile.js?id=749e6e867d987d8d4522",
     "/js/quill.js": "/js/quill.js?id=37962cd45a252d2f13c9",
     "/js/search.js": "/js/search.js?id=f312959df65e86a307a3",
-    "/js/status.js": "/js/status.js?id=8cbed6e645e9fcc7e7c1",
+    "/js/status.js": "/js/status.js?id=90bc60c7fd41b67a38db",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=700e5dc735365e184e41",
-    "/js/timeline.js": "/js/timeline.js?id=699558408e8fd3559cd7"
+    "/js/timeline.js": "/js/timeline.js?id=8347abbb95fcae63ce63"
 }

resources/assets/js/components/presenter/MixedAlbumPresenter.vue

@@ -51,7 +51,7 @@
 			</b-carousel-slide>
 		</b-carousel> -->
 		<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb" class="p-0 m-0">
-			<slide v-for="(media, index) in status.media_attachments" :key="'px-carousel-'+media.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="background: #000; display: flex;align-items: center;min-height: 600px;">
+			<slide v-for="(media, index) in status.media_attachments" :key="'px-carousel-'+media.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="background: #000; display: flex;align-items: center;">
 
 				<video v-if="media.type == 'Video'" class="embed-responsive-item" preload="none" controls loop :title="media.description" width="100%" height="100%" :poster="media.preview_url">
 					<source :src="media.url" :type="media.mime">

resources/assets/js/components/presenter/PhotoAlbumPresenter.vue

@@ -22,8 +22,8 @@
 				</span>
 			</b-carousel> -->
 			<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb">
-				<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="min-height: 600px;" :title="img.description">
-					<img :class="img.filter_class + ' img-fluid'" style="min-height: 600px;" :src="img.url" :alt="img.description">
+				<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" :title="img.description">
+					<img :class="img.filter_class + ' img-fluid'" :src="img.url" :alt="img.description">
 				</slide>
 			</carousel>
 		</details>
@@ -46,8 +46,8 @@
 			</span>
 		</b-carousel> -->
 		<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb" class="p-0 m-0">
-			<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="" style="background: #000; display: flex;align-items: center;min-height: 600px;" :title="img.description">
-				<img :class="img.filter_class + ' img-fluid w-100 p-0'" style="min-height: 600px;" :src="img.url" :alt="img.description">
+			<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="" style="background: #000; display: flex;align-items: center;" :title="img.description">
+				<img :class="img.filter_class + ' img-fluid w-100 p-0'" style="" :src="img.url" :alt="img.description">
 			</slide>
 		</carousel>
 	</div>