浏览代码

Merge pull request #294 from hellcp/patch-24

Adapt profile changes to discover
daniel 7 年之前
父节点
当前提交
c2f9c02f9b
共有 2 个文件被更改,包括 34 次插入10 次删除
  1. 19 7
      resources/views/discover/home.blade.php
  2. 15 3
      resources/views/discover/tags/show.blade.php

+ 19 - 7
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="card">
+      <div class="col-4 p-0 p-sm-2 p-md-3">
+        <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="text-muted">{{$profile->name}}</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 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">
-        <a class="card" href="{{$status->url()}}">
-          <img class="card-img-top" src="{{$status->thumb()}}" width="300px" height="300px">
+      <div class="col-4 p-0 p-sm-2 p-md-3">
+        <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">
+              <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

+ 15 - 3
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">
-      <a class="card" href="{{$status->url()}}">
-        <img class="card-img-top" src="{{$status->thumb()}}" width="300px" height="300px">
+    <div class="col-4 p-0 p-sm-2 p-md-3">
+      <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">
+            <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