Merge pull request #362 from pixelfed/frontend-ui-refactor

Frontend ui refactor

config/pixelfed.php

@@ -23,7 +23,7 @@ return [
     | This value is the version of your PixelFed instance.
     |
     */
-    'version' => '0.1.4',
+    'version' => '0.1.5',
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2018_08_12_042648_update_status_table_change_caption_to_text.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateStatusTableChangeCaptionToText extends Migration
+{
+    public function __construct()
+    {
+        DB::getDoctrineSchemaManager()
+            ->getDatabasePlatform()
+            ->registerDoctrineTypeMapping('enum', 'string');
+    }
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('statuses', function ($table) {
+            $table->text('caption')->change();
+            $table->text('rendered')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

resources/assets/sass/custom.scss

@@ -189,6 +189,10 @@ body, button, input, textarea {
 }
 
 @media (max-width: map-get($grid-breakpoints, "sm")) {
+  .card-md-border-0 {
+    border-width: 0!important;
+    border-radius: 0!important;
+  }
   .card-md-rounded-0 {
     border-width: 1px 0;
     border-radius:0 !important;
@@ -289,4 +293,4 @@ details summary::-webkit-details-marker {
 
 .details-animated[open] > summary {
   display: none!important;
-}
+}

resources/views/discover/home.blade.php

@@ -6,16 +6,16 @@
     <p class="lead text-muted font-weight-bold">Discover People</p>
     <div class="row">
       @foreach($people as $profile)
-      <div class="col-md-4">
+      <div class="col-4 p-0 p-sm-2 p-md-3">
-        <div class="card">
+        <div class="card card-md-border-0">
           <div class="card-body p-4 text-center">
             <div class="avatar pb-3">
               <a href="{{$profile->url()}}">
                 <img src="{{$profile->avatarUrl()}}" class="img-thumbnail rounded-circle" width="64px">
               </a>
             </div>
-            <p class="lead font-weight-bold mb-0"><a href="{{$profile->url()}}" class="text-dark">{{$profile->username}}</a></p>
+            <p class="lead font-weight-bold mb-0 text-truncate"><a href="{{$profile->url()}}" class="text-dark">{{$profile->username}}</a></p>
-            <p class="text-muted">{{$profile->name}}</p>
+            <p class="text-muted text-truncate">{{$profile->name}}</p>
             <form class="follow-form" method="post" action="/i/follow" data-id="{{$profile->id}}" data-action="follow">
               @csrf
               <input type="hidden" name="item" value="{{$profile->id}}">
@@ -31,9 +31,21 @@
     <p class="lead text-muted font-weight-bold">Explore</p>
     <div class="profile-timeline row">
       @foreach($posts as $status)
-      <div class="col-12 col-md-4 mb-4">
+      <div class="col-4 p-0 p-sm-2 p-md-3">
-        <a class="card" href="{{$status->url()}}">
+        <a class="card info-overlay card-md-border-0" href="{{$status->url()}}">
-          <img class="card-img-top" src="{{$status->thumb()}}" width="300px" height="300px">
+          <div class="square {{$status->firstMedia()->filter_class}}">
+            <div class="square-content" style="background-image: url('{{$status->thumb()}}')"></div>
+            <div class="info-overlay-text">
+              <h5 class="text-white m-auto font-weight-bold">
+                <span class="pr-4">
+                <span class="far fa-heart fa-lg pr-1"></span> {{$status->likes_count}}
+                </span>
+                <span>
+                <span class="far fa-comment fa-lg pr-1"></span> {{$status->comments_count}}
+                </span>
+              </h5>
+            </div>
+          </div>
         </a>
       </div>
       @endforeach

resources/views/discover/tags/show.blade.php

@@ -24,9 +24,21 @@
 
   <div class="tag-timeline row">
     @foreach($posts as $status)
-    <div class="col-12 col-md-4 mb-4">
+    <div class="col-4 p-0 p-sm-2 p-md-3">
-      <a class="card" href="{{$status->url()}}">
+      <a class="card info-overlay card-md-border-0" href="{{$status->url()}}">
-        <img class="card-img-top" src="{{$status->thumb()}}" width="300px" height="300px">
+        <div class="square {{$status->firstMedia()->filter_class}}">
+          <div class="square-content" style="background-image: url('{{$status->thumb()}}')"></div>
+          <div class="info-overlay-text">
+            <h5 class="text-white m-auto font-weight-bold">
+              <span class="pr-4">
+              <span class="far fa-heart fa-lg pr-1"></span> {{$status->likes_count}}
+              </span>
+              <span>
+              <span class="far fa-comment fa-lg pr-1"></span> {{$status->comments_count}}
+              </span>
+            </h5>
+          </div>
+        </div>
       </a>
     </div>
     @endforeach

resources/views/profile/show.blade.php

@@ -16,18 +16,18 @@
   </ul>
 </div>
 @endif
-<div class="container mt-5">
+<div class="container">
     @if($owner && request()->is('*/saved'))
     <div class="col-12">
       <p class="text-muted font-weight-bold small">{{__('profile.savedWarning')}}</p>
     </div>
     @endif
-  <div class="profile-timeline">
+  <div class="profile-timeline mt-2 mt-md-4">
     <div class="row">
     @if($timeline->count() > 0)
     @foreach($timeline as $status)
-      <div class="col-12 col-md-4 mb-4">
+      <div class="col-4 p-0 p-sm-2 p-md-3">
-        <a class="card info-overlay" href="{{$status->url()}}">
+        <a class="card info-overlay card-md-border-0" href="{{$status->url()}}">
           <div class="square {{$status->firstMedia()->filter_class}}">
             <div class="square-content" style="background-image: url('{{$status->thumb()}}')"></div>
             <div class="info-overlay-text">