浏览代码

Merge pull request #134 from hellcp/patch-2

Improve look of user profile
daniel 7 年之前
父节点
当前提交
582d521ee5

+ 50 - 0
resources/assets/sass/custom.scss

@@ -105,3 +105,53 @@ body, button, input, textarea {
 .notification-page .list-group-item:first-child {
   border-top: none;
 }
+
+.nav-topbar {
+  border-top: 1px solid $gray-300;
+}
+.nav-topbar .nav-item {
+  margin: -1px 1.5rem 0;
+}
+.nav-topbar .nav-link {
+  border: 1px solid transparent;
+  color: $gray-300;
+  padding: 0.75rem 0;
+}
+.nav-topbar .nav-link:focus, .nav-topbar .nav-link:hover {
+  border-top-color: $gray-300;
+}
+.nav-topbar .nav-link.disabled {
+  color: $gray-300;
+  background-color: transparent;
+  border-color: transparent;
+}
+.nav-topbar .nav-item.show .nav-link, .nav-topbar .nav-link.active {
+  color: $gray-600;
+  border-top-color: $gray-600;
+}
+.nav-topbar .dropdown-menu {
+  margin-top:-1px;
+}
+
+.info-overlay {
+    position: relative;
+}
+
+.info-overlay .info-overlay-text {
+    display: none;
+    position: absolute;
+}
+
+.info-overlay:hover .info-overlay-text {
+    display: flex;
+}
+
+.info-overlay-text {
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0,0,0,0.5);
+}
+
+.font-weight-ultralight {
+    font-weight: 200 !important;
+}

+ 6 - 6
resources/views/profile/followers.blade.php

@@ -4,16 +4,16 @@
 
 <div class="container following-page" style="min-height: 60vh;">
 
-  <div class="profile-header row my-5 offset-md-1">
-    <div class="col-12 col-md-3">
-      <div class="profile-avatar">
+  <div class="profile-header row my-5">
+    <div class="col-12 col-md-4 d-flex">
+      <div class="profile-avatar mx-auto">
         <img class="img-thumbnail" src="{{$profile->avatarUrl()}}" style="border-radius:100%;" width="172px">
       </div>
     </div>
-    <div class="col-12 col-md-9 d-flex align-items-center">
+    <div class="col-12 col-md-8 d-flex align-items-center">
       <div class="profile-details">
-        <div class="username-bar pb-2  d-flex align-items-center">
-          <span class="font-weight-light h1">{{$profile->username}}</span>
+        <div class="username-bar pb-2 d-flex align-items-center">
+          <span class="font-weight-ultralight h1">{{$profile->username}}</span>
         </div>
         <div class="profile-stats pb-3 d-inline-flex lead">
           <div class="font-weight-light pr-5">

+ 5 - 5
resources/views/profile/following.blade.php

@@ -4,16 +4,16 @@
 
 <div class="container following-page" style="min-height: 60vh;">
 
-  <div class="profile-header row my-5 offset-md-1">
-    <div class="col-12 col-md-3">
-      <div class="profile-avatar">
+  <div class="profile-header row my-5">
+    <div class="col-12 col-md-4 d-flex">
+      <div class="profile-avatar mx-auto">
         <img class="img-thumbnail" src="{{$profile->avatarUrl()}}" style="border-radius:100%;" width="172px">
       </div>
     </div>
-    <div class="col-12 col-md-9 d-flex align-items-center">
+    <div class="col-12 col-md-8 d-flex align-items-center">
       <div class="profile-details">
         <div class="username-bar pb-2  d-flex align-items-center">
-          <span class="font-weight-light h1">{{$profile->username}}</span>
+          <span class="font-weight-ultralight h1">{{$profile->username}}</span>
         </div>
         <div class="profile-stats pb-3 d-inline-flex lead">
           <div class="font-weight-light pr-5">

+ 17 - 11
resources/views/profile/show.blade.php

@@ -4,19 +4,19 @@
 
 <div class="container">
   
-  <div class="profile-header row my-5 offset-md-1">
-    <div class="col-12 col-md-3">
-      <div class="profile-avatar">
+  <div class="profile-header row my-5">
+    <div class="col-12 col-md-4 d-flex">
+      <div class="profile-avatar mx-auto">
         <img class="img-thumbnail" src="{{$user->avatarUrl()}}" style="border-radius:100%;" width="172px">
       </div>
     </div>
-    <div class="col-12 col-md-9 d-flex align-items-center">
+    <div class="col-12 col-md-8 d-flex align-items-center">
       <div class="profile-details">
         <div class="username-bar pb-2  d-flex align-items-center">
-          <span class="font-weight-light h1">{{$user->username}}</span>
+          <span class="font-weight-ultralight h1">{{$user->username}}</span>
           @if($owner == true)
-          <span class="pl-4">
-            <a class="btn btn-outline-secondary font-weight-bold px-4 py-0" href="{{route('settings')}}">Settings</a>
+          <span class="h5 pl-2 b-0">
+            <a class="icon-settings text-muted" href="{{route('settings')}}"></a>
           </span>
           @elseif ($following == true)
           <span class="pl-4">
@@ -80,8 +80,8 @@
   <div class="profile-timeline mt-5 row">
     @if($owner == true)
       <div class="col-12 mb-5">
-        <ul class="nav nav-tabs d-flex justify-content-center">
-          <li class="nav-item mr-3">
+        <ul class="nav nav-topbar d-flex justify-content-center">
+          <li class="nav-item">
             <a class="nav-link {{request()->is('*/saved') ? '':'active'}} font-weight-bold text-uppercase" href="{{$user->url()}}">Posts</a>
           </li>
           <li class="nav-item">
@@ -100,8 +100,14 @@
     @if($timeline->count() > 0)
       @foreach($timeline as $status)
       <div class="col-12 col-md-4 mb-4">
-        <a class="card" href="{{$status->url()}}">
+        <a class="card info-overlay" href="{{$status->url()}}">
           <img class="card-img-top" src="{{$status->thumb()}}" width="300px" height="300px">
+          <div class="info-overlay-text">
+            <h5 class="text-white m-auto">
+              <span class="icon-heart">{{$item->likes()->count()}}</span>
+              <span class="icon-speech">{{$item->comments()->count()}}</span>
+            </h5>
+          </div>
         </a>
       </div>
       @endforeach
@@ -120,4 +126,4 @@
 
 </div>
 
-@endsection
+@endsection