Merge pull request #1785 from pixelfed/staging

Staging

CHANGELOG.md

@@ -31,6 +31,7 @@
 - Updated Timeline.vue component, remove tap for lightbox as it conflicts with new carousel ([96e25ad2](https://github.com/pixelfed/pixelfed/commit/96e25ad2))
 - Updated ComposeModal.vue, added album support, editing and UI tweaks ([3aaad81e](https://github.com/pixelfed/pixelfed/commit/3aaad81e))
 - Updated InternalApiController, increase license limit to 140 to match UI counter ([b3c18aec](https://github.com/pixelfed/pixelfed/commit/b3c18aec))
+- Updated album carousels, fix height bug ([8380822a](https://github.com/pixelfed/pixelfed/commit/8380822a))
 
 ## Deprecated
     

resources/assets/js/components/PostComponent.vue

@@ -50,7 +50,7 @@
           </div>
          </div>
           <div class="col-12 col-md-8 px-0 mx-0">
-              <div class="postPresenterContainer d-none d-flex justify-content-center align-items-center" v-on:dblclick="likeStatus">
+              <div class="postPresenterContainer d-none d-flex justify-content-center align-items-center" style="background: #000;">
                 <div v-if="status.pf_type === 'photo'" class="w-100">
                   <photo-presenter :status="status" v-on:lightbox="lightbox"></photo-presenter>
                 </div>

resources/assets/js/components/Timeline.vue

@@ -127,7 +127,7 @@
 							</div>
 						</div>
 
-						<div class="postPresenterContainer">
+						<div class="postPresenterContainer" style="background: #000;">
 							<div v-if="status.pf_type === 'photo'" class="w-100">
 								<photo-presenter :status="status" v-on:lightbox="lightbox"></photo-presenter>
 							</div>
@@ -216,7 +216,7 @@
 					</div>
 				</div>
 				<div v-if="!loading && feed.length">
-					<div class="card">
+					<div class="card shadow-none border">
 						<div class="card-body">
 							<infinite-loading @infinite="infiniteTimeline" :distance="800">
 							<div slot="no-more" class="font-weight-bold">No more posts to load</div>

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

@@ -50,8 +50,8 @@
 
 			</b-carousel-slide>
 		</b-carousel> -->
-		<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb">
-			<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="max-height: 600px;">
+		<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;">
 
 				<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="max-height: 600px;" :title="img.description">
-					<img :class="img.filter_class + ' img-fluid'" style="max-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" 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>
 			</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;max-height: 600px;" :title="img.description">
-				<img :class="img.filter_class + ' img-fluid w-100 p-0'" style="max-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;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>
 		</carousel>
 	</div>

resources/views/layouts/partial/footer.blade.php

@@ -1,16 +1,16 @@
   <footer>
     <div class="container py-5">
-        <p class="mb-0 text-uppercase font-weight-bold small text-justify">
-          <a href="{{route('site.about')}}" class="text-primary pr-3">{{__('site.about')}}</a>
+        <p class="d-flex flex-wrap justify-content-center mb-0 text-uppercase font-weight-bold small text-justify">
+          <a href="{{route('site.about')}}" class="text-primary p-2">{{__('site.about')}}</a>
           @if(config('instance.contact.enabled') || config('instance.email'))
-          <a href="{{route('site.contact')}}" class="text-primary pr-3">{{__('site.contact-us')}}</a>
+          <a href="{{route('site.contact')}}" class="text-primary p-2">{{__('site.contact-us')}}</a>
           @endif
-          <a href="{{route('site.help')}}" class="text-primary pr-3">{{__('site.help')}}</a>
-          <a href="{{route('site.terms')}}" class="text-primary pr-3">{{__('site.terms')}}</a>
-          <a href="{{route('site.privacy')}}" class="text-primary pr-3">{{__('site.privacy')}}</a>
-          <a href="{{route('discover.places')}}" class="text-primary pr-3">{{__('site.places')}}</a>
-          <a href="{{route('site.language')}}" class="text-primary pr-3">{{__('site.language')}}</a>
-          <a href="https://pixelfed.org" class="text-muted float-right" rel="noopener" title="version {{config('pixelfed.version')}}" data-toggle="tooltip">Powered by Pixelfed</a>
+          <a href="{{route('site.help')}}" class="text-primary p-2">{{__('site.help')}}</a>
+          <a href="{{route('site.terms')}}" class="text-primary p-2">{{__('site.terms')}}</a>
+          <a href="{{route('site.privacy')}}" class="text-primary p-2">{{__('site.privacy')}}</a>
+          <a href="{{route('discover.places')}}" class="text-primary p-2">{{__('site.places')}}</a>
+          <a href="{{route('site.language')}}" class="text-primary p-2">{{__('site.language')}}</a>
+          <a href="https://pixelfed.org" class="text-muted p-2 ml-md-auto" rel="noopener" title="version {{config('pixelfed.version')}}" data-toggle="tooltip">Powered by Pixelfed</a>
         </p>
     </div>
   </footer>