From 28d12a1e12808f37d764efb06365eca85311c501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= <me@m4sk.in>
Date: Fri, 8 Jun 2018 22:45:06 -0700
Subject: [PATCH 01/21] Nicer typography
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 resources/lang/en/profile.php               |  4 ++--
 resources/views/errors/403.blade.php        |  4 ++--
 resources/views/errors/404.blade.php        |  4 ++--
 resources/views/errors/503.blade.php        |  4 ++--
 resources/views/profile/followers.blade.php |  2 +-
 resources/views/profile/following.blade.php |  2 +-
 resources/views/report/form.blade.php       |  8 ++++----
 resources/views/site/fediverse.blade.php    |  8 ++++----
 resources/views/site/language.blade.php     |  2 +-
 resources/views/site/privacy.blade.php      | 10 +++++-----
 resources/views/status/template.blade.php   |  4 ++--
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/resources/lang/en/profile.php b/resources/lang/en/profile.php
index 50b6f2429..01c79be62 100644
--- a/resources/lang/en/profile.php
+++ b/resources/lang/en/profile.php
@@ -4,5 +4,5 @@ return [
   'emptyTimeline' => 'This user has no posts yet!',
   'emptyFollowers' => 'This user has no followers yet!',
   'emptyFollowing' => 'This user is not following anyone yet!',
-  'savedWarning'  => 'Only you can see what you\'ve saved',
-];
\ No newline at end of file
+  'savedWarning'  => 'Only you can see what you’ve saved',
+];
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index 8a7ecc329..26168b479 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -5,9 +5,9 @@
   <div class="error-page py-5 my-5">
     <div class="card mx-5">
       <div class="card-body p-5">
-        <h1 class="text-center">403 - Forbidden</h1>
+        <h1 class="text-center">403 – Forbidden</h1>
       </div>
     </div>
   </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 9ab90868f..ff1024304 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -5,9 +5,9 @@
   <div class="error-page py-5 my-5">
     <div class="card mx-5">
       <div class="card-body p-5">
-        <h1 class="text-center">404 - Page Not Found</h1>
+        <h1 class="text-center">404 – Page Not Found</h1>
       </div>
     </div>
   </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index e479008cf..ba0a94299 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -5,10 +5,10 @@
   <div class="error-page py-5 my-5">
     <div class="card mx-5">
       <div class="card-body p-5 text-center">
-        <h1>503 - Service Unavailable</h1>
+        <h1>503 – Service Unavailable</h1>
         <p class="lead mb-0">Our services are overloaded at the moment, please try again later.</p>
       </div>
     </div>
   </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php
index c8cea8e95..3c2447337 100644
--- a/resources/views/profile/followers.blade.php
+++ b/resources/views/profile/followers.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app',['title' => $user->username . "'s followers"])
+@extends('layouts.app',['title' => $user->username . "’s followers"])
 
 @section('content')
 
diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php
index bdaceca12..e9d95aa64 100644
--- a/resources/views/profile/following.blade.php
+++ b/resources/views/profile/following.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app',['title' => $user->username . "'s follows"])
+@extends('layouts.app',['title' => $user->username . "’s follows"])
 
 @section('content')
 
diff --git a/resources/views/report/form.blade.php b/resources/views/report/form.blade.php
index 1c755844e..ec7320aad 100644
--- a/resources/views/report/form.blade.php
+++ b/resources/views/report/form.blade.php
@@ -22,12 +22,12 @@
         <div class="row">
           <div class="col-12 col-md-8 offset-md-2 my-3">
             <p><a class="btn btn-light btn-block p-4 font-weight-bold" disabled>
-              I'm not interested in this content
+              I’m not interested in this content
             </a></p>
           </div>
           <div class="col-12 col-md-8 offset-md-2 my-3">
             <p><a class="btn btn-light btn-block p-4 font-weight-bold">
-              It's spam
+              It’s spam
             </a></p>
           </div>
           <div class="col-12 col-md-8 offset-md-2 my-3">
@@ -37,7 +37,7 @@
           </div>
           <div class="col-12 col-md-8 offset-md-2 my-3">
             <p><a class="btn btn-light btn-block p-4 font-weight-bold">
-              It's abusive or harmful
+              It’s abusive or harmful
             </a></p>
           </div>
           <div class="col-12 col-md-8 offset-md-2 my-3">
@@ -51,4 +51,4 @@
   </div>
 </div>
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/site/fediverse.blade.php b/resources/views/site/fediverse.blade.php
index 436f73332..715bd91b2 100644
--- a/resources/views/site/fediverse.blade.php
+++ b/resources/views/site/fediverse.blade.php
@@ -7,15 +7,15 @@
   </div>
   <hr>
   <section>
-    <p class="lead">Fediverse is a portmanteau of "federation" and "universe". It is a common, informal name for a somewhat broad federation of social network servers.</p>
+    <p class="lead">Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a somewhat broad federation of social network servers.</p>
     <p class="lead font-weight-bold text-muted mt-4">Supported Fediverse Projects</p>
     <ul class="lead pl-4">
-      <li>Mastodon - A federated twitter alternative.</li>
-      <li>Pleroma - A federated twitter alternative.</li>
+      <li>Mastodon – A federated twitter alternative.</li>
+      <li>Pleroma – A federated twitter alternative.</li>
     </ul>
   </section>
 @endsection
 
 @push('meta')
-<meta property="og:description" content="What's Fediverse">
+<meta property="og:description" content="What’s Fediverse">
 @endpush
diff --git a/resources/views/site/language.blade.php b/resources/views/site/language.blade.php
index f2c933638..93c4158b2 100644
--- a/resources/views/site/language.blade.php
+++ b/resources/views/site/language.blade.php
@@ -6,7 +6,7 @@
     <h3 class="font-weight-bold">Language</h3>
   </div>
   <hr>
-  <div class="alert alert-info font-weight-bold">We're still working on localization support!</div>
+  <div class="alert alert-info font-weight-bold">We’re still working on localization support!</div>
   <p class="lead">Current Locale: <span class="font-weight-bold">{{App::getLocale()}}</span></p>
   <p class="lead">Select from one of the supported languages:</p>
   <ul class="list-group">
diff --git a/resources/views/site/privacy.blade.php b/resources/views/site/privacy.blade.php
index 576f1af20..c263cd478 100644
--- a/resources/views/site/privacy.blade.php
+++ b/resources/views/site/privacy.blade.php
@@ -16,7 +16,7 @@
         Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
       </li>
       <li>
-        Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over PixelFed.
+        Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it’s important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over PixelFed.
       </li>
       <li>
         IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
@@ -27,7 +27,7 @@
     <p class="lead">Any of the information we collect from you may be used in the following ways:</p>
     <ul class="lead pl-4">
       <li>
-        To provide the core functionality of PixelFed. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
+        To provide the core functionality of PixelFed. You can only interact with other people’s content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
       </li>
       <li>
         To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
@@ -57,7 +57,7 @@
     <p class="lead">You may irreversibly delete your account at any time.</p>
 
     <h4 class="font-weight-bold">Do we use cookies?</h4>
-    <p class="lead">Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
+    <p class="lead">Yes. Cookies are small files that a site or its service provider transfers to your computer’s hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
     </p>
     <p class="lead">We use cookies to understand and save your preferences for future visits.</p>
 
@@ -66,8 +66,8 @@
     <p class="lead">Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
     <p class="lead">When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
 
-    <h4 class="font-weight-bold">Children's Online Privacy Protection Act Compliance</h4>
-    <p class="lead">Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.</p>
+    <h4 class="font-weight-bold">Children’s Online Privacy Protection Act Compliance</h4>
+    <p class="lead">Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (Children’s Online Privacy Protection Act) do not use this site.</p>
 
     <h4 class="font-weight-bold">Changes to our Privacy Policy</h4>
     <p class="lead">If we decide to change our privacy policy, we will post those changes on this page.</p>
diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php
index b91ac18bc..0430a402e 100644
--- a/resources/views/status/template.blade.php
+++ b/resources/views/status/template.blade.php
@@ -97,7 +97,7 @@
           <form class="comment-form" method="post" action="/i/comment" data-id="{{$item->id}}" data-truncate="true">
             @csrf
             <input type="hidden" name="item" value="{{$item->id}}">
-            <input class="form-control status-reply-input" name="comment" placeholder="Add a comment...">
+            <input class="form-control status-reply-input" name="comment" placeholder="Add a comment…">
           </form>
         </div>
-      </div>
\ No newline at end of file
+      </div>

From b5e8b9c2035a3e993b5ad707c9121611dfdcd2a5 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Sat, 9 Jun 2018 21:46:29 +0200
Subject: [PATCH 02/21] Fix #244 and rounded corners in xs viewpoint

---
 resources/assets/sass/custom.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss
index 551d2571f..cfccee999 100644
--- a/resources/assets/sass/custom.scss
+++ b/resources/assets/sass/custom.scss
@@ -214,6 +214,10 @@ body, button, input, textarea {
   .max-hide-overflow {
     max-height: 600px!important;
   }
+  .card-md-rounded-0 {
+    border-width: 1px 0;
+    border-radius:0 !important;
+  }
 }
 
 @media (min-width: map-get($grid-breakpoints, "md")) {
@@ -234,3 +238,8 @@ body, button, input, textarea {
   height: 32px;
   background-position: 50%;
 }
+
+.status-photo img {
+    object-fit: contain;
+    max-height: calc(100vh - (6rem));
+}

From de0bb212a55ffe904c6d8377e9719911f71feb9b Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Sat, 9 Jun 2018 21:47:40 +0200
Subject: [PATCH 03/21] Make card so it wouldn't be rounded on mobile

---
 resources/views/status/show.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php
index 02448e34f..65de8f67a 100644
--- a/resources/views/status/show.blade.php
+++ b/resources/views/status/show.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 
 <div class="container px-0 mt-md-4">
-  <div class="card status-container orientation-{{$status->firstMedia()->orientation ?? 'unknown'}}">
+  <div class="card card-md-rounded-0 status-container orientation-{{$status->firstMedia()->orientation ?? 'unknown'}}">
     <div class="row mx-0">
     <div class="d-flex d-md-none align-items-center justify-content-between card-header w-100">
       <div class="d-flex align-items-center status-username">

From 92c4e24666fd9e51f5a4d74a54a996a3de332e77 Mon Sep 17 00:00:00 2001
From: Tim Speckhals <github@timmyrs.de>
Date: Mon, 11 Jun 2018 12:38:23 +0200
Subject: [PATCH 04/21] Update German Translation

---
 resources/lang/de/navmenu.php      | 13 +++++++++++++
 resources/lang/de/notification.php |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 resources/lang/de/navmenu.php

diff --git a/resources/lang/de/navmenu.php b/resources/lang/de/navmenu.php
new file mode 100644
index 000000000..bfaf81d23
--- /dev/null
+++ b/resources/lang/de/navmenu.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+
+    'viewMyProfile' => 'Mein Profil anschauen',
+    'myTimeline' => 'Meine Timeline',
+    'publicTimeline' => '&Ouml;ffentliche Timeline',
+    'remoteFollow' => 'Aus der Ferne folgen',
+    'settings' => 'Einstellungen',
+    'admin' => 'Administration',
+    'logout' => 'Abmelden',
+
+];
\ No newline at end of file
diff --git a/resources/lang/de/notification.php b/resources/lang/de/notification.php
index d393089f2..4f2040552 100644
--- a/resources/lang/de/notification.php
+++ b/resources/lang/de/notification.php
@@ -5,5 +5,6 @@ return [
   'likedPhoto' => 'gef&auml;llt dein Foto.',
   'startedFollowingYou' => 'folgt dir nun.',
   'commented' => 'hat deinen Post kommentiert.',
+  'mentionedYou' => 'hat dich erw&auml;hnt.'
 
 ];
\ No newline at end of file

From 668e0bd24b0e4e1746fbc5706569e82f60b165d3 Mon Sep 17 00:00:00 2001
From: j1t <j1t@users.noreply.github.com>
Date: Tue, 12 Jun 2018 08:56:43 +0000
Subject: [PATCH 05/21] Update notification.php

---
 resources/lang/he/notification.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/he/notification.php b/resources/lang/he/notification.php
index b529138df..40b51127d 100644
--- a/resources/lang/he/notification.php
+++ b/resources/lang/he/notification.php
@@ -5,5 +5,6 @@ return [
   'likedPhoto' => 'אהבו את התמונה שלך.',
   'startedFollowingYou' => 'התחיל לעקוב אחריך.',
   'commented' => 'הגיב על הפוסט שלך.',
+  'mentionedYou' => 'הזכיר אותך.'
         
 ];

From 0e25dd449aa75cf9927bac782157ba130c66c995 Mon Sep 17 00:00:00 2001
From: j1t <j1t@users.noreply.github.com>
Date: Tue, 12 Jun 2018 09:00:46 +0000
Subject: [PATCH 06/21] Create navmenu.php

---
 resources/lang/he/navmenu.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 resources/lang/he/navmenu.php

diff --git a/resources/lang/he/navmenu.php b/resources/lang/he/navmenu.php
new file mode 100644
index 000000000..32d78da75
--- /dev/null
+++ b/resources/lang/he/navmenu.php
@@ -0,0 +1,13 @@
+<?php
+       
+return [
+     
+    'viewMyProfile' => 'צפה בפרופיל שלי',
+    'myTimeline' => 'ציר הזמן שלי',
+    'publicTimeline' => 'ציר הזמן הציבורי',
+    'remoteFollow' => 'עקיבה מרחוק',
+    'settings' => 'הגדרות',
+    'admin' => 'מנהל',
+    'logout' => 'התנתק',
+        
+];

From 3adcedc1a6fe353b798d985dca1726fb0df2fc83 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Fri, 15 Jun 2018 08:05:37 +0200
Subject: [PATCH 07/21] Fix #269

---
 resources/views/status/show.blade.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php
index 8d2e27d67..a28930c03 100644
--- a/resources/views/status/show.blade.php
+++ b/resources/views/status/show.blade.php
@@ -87,23 +87,23 @@
             </div>
           </div>
           <div class="card-body flex-grow-0 py-1">
-            <div class="reactions h3 mb-0">
+            <div class="reactions my-1">
                <form class="d-inline-flex like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$status->id}}" data-action="like">
                 @csrf
                 <input type="hidden" name="item" value="{{$status->id}}">
-                <button class="btn btn-link text-dark btn-lg p-0" type="submit" title="Like!">
-                  <span class="far fa-heart fa-lg mb-0"></span>
+                <button class="btn btn-link text-dark p-0 border-0" type="submit" title="Like!">
+                  <h3 class="far fa-heart m-0"></h3>
                 </button>
               </form>
-              <span class="far fa-comment pt-1 pr-3" title="Comment"></span>
+              <h3 class="far fa-comment pr-3 m-0" title="Comment"></h3>
               @if(Auth::check())
               @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
               <form method="post" action="/i/delete" class="d-inline-flex">
                 @csrf
                 <input type="hidden" name="type" value="post">
                 <input type="hidden" name="item" value="{{$status->id}}">
-                <button type="submit" class="btn btn-link btn-lg text-dark p-0" title="Remove">
-                  <span class="far fa-trash-alt fa-lg mb-0"></span>
+                <button type="submit" class="btn btn-link text-dark p-0 border-0" title="Remove">
+                  <h3 class="far fa-trash-alt m-0"></h3>
                 </button>
               </form>
               @endif
@@ -112,8 +112,8 @@
                 <form class="d-inline-flex bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$status->id}}" data-action="bookmark">
                   @csrf
                   <input type="hidden" name="item" value="{{$status->id}}">
-                  <button class="btn btn-link text-dark p-0 btn-lg" type="submit" title="Save">
-                    <span class="far fa-bookmark fa-lg mb-0"></span>
+                  <button class="btn btn-link text-dark p-0 border-0" type="submit" title="Save">
+                    <h3 class="far fa-bookmark m-0"></h3>
                   </button>
                 </form>
               </span>

From 34e3839141a6095847782069aae1e61b5274b41d Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Fri, 15 Jun 2018 08:16:44 +0200
Subject: [PATCH 08/21] Fix #369 in status template

---
 resources/views/status/template.blade.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php
index baf37c296..8b8f03481 100644
--- a/resources/views/status/template.blade.php
+++ b/resources/views/status/template.blade.php
@@ -44,20 +44,22 @@
         </a>
         @endif
         <div class="card-body">
-          <div class="reactions h3">
-            <form class="like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$item->id}}" data-action="like" data-count="{{$item->likes_count}}">
+          <div class="reactions my-1">
+            <form class="d-inline-flex like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$item->id}}" data-action="like" data-count="{{$item->likes_count}}">
               @csrf
               <input type="hidden" name="item" value="{{$item->id}}">
               <button class="btn btn-link text-dark p-0" type="submit" title=""Like!>
-                <span class="far fa-heart status-heart fa-2x"></span>
+                <h3 class="far fa-heart status-heart m-0"></h3>
               </button>
             </form>
-            <span class="far fa-comment status-comment-focus" title="Comment"></span>
+            <h3 class="far fa-comment status-comment-focus" title="Comment"></h3>
             <span class="float-right">
-              <form class="bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$item->id}}" data-action="bookmark">
+              <form class="d-inline-flex bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$item->id}}" data-action="bookmark">
                 @csrf
                 <input type="hidden" name="item" value="{{$item->id}}">
-                <button class="btn btn-link text-dark p-0" type="submit" title="Save"><span class="far fa-bookmark" style="font-size:25px;"></span></button>
+                <button class="btn btn-link text-dark p-0 border-0" type="submit" title="Save">
+                  <h3 class="far fa-bookmark m-0"></h3>
+                </button>
               </form>
             </span>
           </div>

From 58685f3b0e15db1087b4acb44db23e430d626a3a Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Fri, 15 Jun 2018 08:34:08 +0200
Subject: [PATCH 09/21] Make cards flush on mobile

---
 resources/views/timeline/personal.blade.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/views/timeline/personal.blade.php b/resources/views/timeline/personal.blade.php
index 48a061a96..4ba2e9ca4 100644
--- a/resources/views/timeline/personal.blade.php
+++ b/resources/views/timeline/personal.blade.php
@@ -6,8 +6,8 @@
 
 @section('content')
 
-<div class="container">
-  <div class="col-12 col-md-8 offset-md-2 pt-4">
+<div class="container p-0">
+  <div class="col-md-8 mx-auto pt-4 px-0">
     @if ($errors->any())
       <div class="alert alert-danger">
           <ul>
@@ -27,7 +27,7 @@
 
     @endforeach
     @if($timeline->count() == 0)
-    <div class="card">
+    <div class="card card-md-rounded-0">
       <div class="card-body py-5">
         <div class="d-flex justify-content-center align-items-center">
           <p class="lead font-weight-bold mb-0">{{ __('timeline.emptyPersonalTimeline') }}</p>
@@ -37,11 +37,11 @@
     @endif
     </div>
 
-    <div class="page-load-status">
-      <div class="infinite-scroll-request">
-        <div class="d-none fixed-top loading-page"></div>
+    <div class="page-load-status" style="display: none;">
+      <div class="infinite-scroll-request" style="display: none;">
+        <div class="fixed-top loading-page"></div>
       </div>
-      <div class="infinite-scroll-last">
+      <div class="infinite-scroll-last" style="display: none;">
         <h3>No more content</h3>
         <p class="text-muted">
           Maybe you could try 
@@ -49,7 +49,7 @@
           more people you can follow.
         </p>
       </div>
-      <div class="infinite-scroll-error">
+      <div class="infinite-scroll-error" style="display: none;">
         <h3>Whoops, an error</h3>
         <p class="text-muted">
           Try reloading the page

From 2c07d2fb70943bca8c614c2647237877e95af81b Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Fri, 15 Jun 2018 08:36:49 +0200
Subject: [PATCH 10/21] Don't show loading for non-js users

---
 resources/views/timeline/public.blade.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/timeline/public.blade.php b/resources/views/timeline/public.blade.php
index 78c731f17..30c5a4909 100644
--- a/resources/views/timeline/public.blade.php
+++ b/resources/views/timeline/public.blade.php
@@ -6,8 +6,8 @@
 
 @section('content')
 
-<div class="container">
-  <div class="col-12 col-md-8 offset-md-2 pt-4">
+<div class="container px-0">
+  <div class="col-md-8 mx-auto pt-4 px-0">
     @if ($errors->any())
       <div class="alert alert-danger">
           <ul>
@@ -28,11 +28,11 @@
     @endforeach
     </div>
 
-    <div class="page-load-status">
-      <div class="infinite-scroll-request">
-        <div class="d-none fixed-top loading-page"></div>
+    <div class="page-load-status" style="display: none;">
+      <div class="infinite-scroll-request" style="display: none;">
+        <div class="fixed-top loading-page"></div>
       </div>
-      <div class="infinite-scroll-last">
+      <div class="infinite-scroll-last" style="display: none;">
         <h3>No more content</h3>
         <p class="text-muted">
           Maybe you could try 
@@ -40,7 +40,7 @@
           more people you can follow.
         </p>
       </div>
-      <div class="infinite-scroll-error">
+      <div class="infinite-scroll-error" style="display: none;">
         <h3>Whoops, an error</h3>
         <p class="text-muted">
           Try reloading the page

From 88ba4ed318dfeb030882c2f94a715fbf6e938af1 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Fri, 15 Jun 2018 08:37:40 +0200
Subject: [PATCH 11/21] Make uploading card flush for mobile users

---
 resources/views/timeline/partial/new-form.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/timeline/partial/new-form.blade.php b/resources/views/timeline/partial/new-form.blade.php
index 77425e2d5..dc73c31bc 100644
--- a/resources/views/timeline/partial/new-form.blade.php
+++ b/resources/views/timeline/partial/new-form.blade.php
@@ -1,4 +1,4 @@
-    <div class="card">
+    <div class="card card-md-rounded-0">
       <div class="card-header font-weight-bold">New Post</div>
       <div class="card-body" id="statusForm">
         @if (session('error'))

From 66b81b932b4693f3c9036accc58432f40de9abcd Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Fri, 15 Jun 2018 08:38:17 +0200
Subject: [PATCH 12/21] Make template card flush for mobile users

---
 resources/views/status/template.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php
index baf37c296..26ee80053 100644
--- a/resources/views/status/template.blade.php
+++ b/resources/views/status/template.blade.php
@@ -1,4 +1,4 @@
-      <div class="card my-4 status-card">
+      <div class="card my-4 status-card card-md-rounded-0">
         <div class="card-header d-inline-flex align-items-center bg-white">
           <img src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" style="border-radius: 32px;">
           <a class="username font-weight-bold pl-2 text-dark" href="{{$item->profile->url()}}">

From e27918e4b2f567a81d5860589d4e5e6c49d52c37 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Fri, 15 Jun 2018 13:04:23 +0200
Subject: [PATCH 13/21] Fix to correct breakpoint

---
 resources/assets/sass/custom.scss | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss
index 8786584f9..f21bbbf77 100644
--- a/resources/assets/sass/custom.scss
+++ b/resources/assets/sass/custom.scss
@@ -193,6 +193,13 @@ body, button, input, textarea {
   }
 }
 
+@media (max-width: map-get($grid-breakpoints, "sm")) {
+  .card-md-rounded-0 {
+    border-width: 1px 0;
+    border-radius:0 !important;
+  }
+}
+
 @keyframes loading-bar {
   from { background-position: 0 0; }
   to { background-position: 100vw 0; }
@@ -214,10 +221,6 @@ body, button, input, textarea {
   .max-hide-overflow {
     max-height: 600px!important;
   }
-  .card-md-rounded-0 {
-    border-width: 1px 0;
-    border-radius:0 !important;
-  }
 }
 
 @media (min-width: map-get($grid-breakpoints, "md")) {

From c222b747f262329c632741e1238c9adb220726c6 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Sat, 16 Jun 2018 10:10:12 +0200
Subject: [PATCH 14/21] Fix margin in mobile view

---
 resources/views/layouts/partial/nav.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index 29e3e63c6..6a46b576b 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -79,9 +79,9 @@
     </div>
 </nav>
 @auth
-<nav class="breadcrumb d-md-none d-flex">
+<nav class="breadcrumb d-md-none d-flex m-0">
   <form class="form-inline search-form mx-auto">
    <input class="form-control mr-sm-2 search-form-input" type="search" placeholder="Search" aria-label="Search">
   </form>
 </nav>
-@endauth
\ No newline at end of file
+@endauth

From 7df166fe58b85b57f17b9811d1ee8faada94573d Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Sat, 16 Jun 2018 10:11:22 +0200
Subject: [PATCH 15/21] Make column wider on sm breakpoint

---
 resources/views/timeline/personal.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/timeline/personal.blade.php b/resources/views/timeline/personal.blade.php
index 4ba2e9ca4..016727e58 100644
--- a/resources/views/timeline/personal.blade.php
+++ b/resources/views/timeline/personal.blade.php
@@ -7,7 +7,7 @@
 @section('content')
 
 <div class="container p-0">
-  <div class="col-md-8 mx-auto pt-4 px-0">
+  <div class="col-md-10 col-lg-8 mx-auto pt-4 px-0">
     @if ($errors->any())
       <div class="alert alert-danger">
           <ul>

From bbda58df6a7d8d16e7acc260f9c5d9831b4cd11a Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Sat, 16 Jun 2018 10:12:07 +0200
Subject: [PATCH 16/21] Make public timeline wider on sm breakpoint

---
 resources/views/timeline/public.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/timeline/public.blade.php b/resources/views/timeline/public.blade.php
index 30c5a4909..a84e54bd5 100644
--- a/resources/views/timeline/public.blade.php
+++ b/resources/views/timeline/public.blade.php
@@ -7,7 +7,7 @@
 @section('content')
 
 <div class="container px-0">
-  <div class="col-md-8 mx-auto pt-4 px-0">
+  <div class="col-md-10 col-lg-8 mx-auto pt-4 px-0">
     @if ($errors->any())
       <div class="alert alert-danger">
           <ul>

From a6ae3f2483aa69ee5b974f545497ba551cbb7ac5 Mon Sep 17 00:00:00 2001
From: Pierre Jaury <pierre@jaury.eu>
Date: Sat, 16 Jun 2018 23:00:35 +0200
Subject: [PATCH 17/21] Allow setting the locale from environment

---
 config/app.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/app.php b/config/app.php
index 99e219a52..a281d980b 100644
--- a/config/app.php
+++ b/config/app.php
@@ -65,7 +65,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     /*
     |--------------------------------------------------------------------------
@@ -78,7 +78,7 @@ return [
     |
     */
 
-    'locale' => 'en',
+    'locale' => env('APP_LOCALE', 'en'),
 
     /*
     |--------------------------------------------------------------------------
@@ -91,7 +91,7 @@ return [
     |
     */
 
-    'fallback_locale' => 'en',
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
 
     /*
     |--------------------------------------------------------------------------

From 4d686b80748730f71346bb029e44b7a132ba5ffd Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 17 Jun 2018 21:45:01 -0600
Subject: [PATCH 18/21] Update commentform

Closes #284
---
 public/css/app.css                            | Bin 214298 -> 214477 bytes
 public/js/app.js                              | Bin 309837 -> 309847 bytes
 public/mix-manifest.json                      | Bin 250 -> 250 bytes
 resources/assets/js/components/commentform.js |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/app.css b/public/css/app.css
index d3c5687bcf3ef461d54d06ad8a6c1303106209c3..bff19b1fabc7f5849da465d2c70377f45573b93c 100644
GIT binary patch
delta 175
zcmbQ$#e24!x1oixg=q`(3eM@mjEsW1rsie^6`Iw0$%#cNy16O3Mfs(9DXA&C2GvRV
zMJcI8y5*TEB^g$R1r-Vg*3*4snWU!iGK*~A#mVf>9HCcSl2}q&tXq(gUy`qonVVj%
zo3ERnl$DxXqMMdkVwIeqSCW{SXN^TDH?cxDBQ-NU1E?x7Ct1VLz@RKcL07@7C^c7e
J8!xkz1prT0I}ZQ=

delta 32
ocmX@x%{!}$x1oixg=q`(3eN3JT+ETo(;2y#g|{E)WoEMg0I~iFFaQ7m

diff --git a/public/js/app.js b/public/js/app.js
index f24ff355008c7cce42088ed18dcedae84c2847bb..e1e65874df5721d65ff134b41f43820f2f20b6f3 100644
GIT binary patch
delta 41
vcmX^6Md<n$p@uDt%0Kv3G&1$d5_2>(HT6nTD@ximelP+t({_y?%&La~Yy}Xt

delta 31
lcmccqMd<7op@uDt%0E~$^~w@++KqlN0x{EeqaVzwhXC#34iEqU

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index e132fcbe8fb7e7b22a5247e1663b9ca943f4cc2e..7d55e58645c95aa4d9a797673f9c9d75e613c617 100644
GIT binary patch
delta 54
zcmeyx_=|CZvPhzZk!h-tiGh)+p`~S-nT27pS@J}44Ut6iWHXZ#Lu1RNBm<MwG>cRt
JOM{8U?Eth0599y<

delta 54
zcmeyx_=|CZvWTHUl2MYOp+%};Vxozefw`HHQOZPf4UrTJV`EE01A`R9WOL)Rlq7RY
JQ}c<%?EtYi51Rl0

diff --git a/resources/assets/js/components/commentform.js b/resources/assets/js/components/commentform.js
index 6993240c7..e6c9cd391 100644
--- a/resources/assets/js/components/commentform.js
+++ b/resources/assets/js/components/commentform.js
@@ -11,7 +11,7 @@ $(document).ready(function() {
     let el = $(this);
     let id = el.data('id');
     let commentform = el.find('input[name="comment"]');
-    let commenttext = commentform.val();
+    let commenttext = $(commentform.val()).text();
     let item = {item: id, comment: commenttext};
 
     commentform.prop('disabled', true);

From aeb2a1679d254762ed007cc9d3c9faf8d7e57d5b Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 17 Jun 2018 22:53:55 -0600
Subject: [PATCH 19/21] Add new logo

---
 public/img/pixelfed-full-color.svg            | Bin 0 -> 15099 bytes
 resources/views/layouts/partial/nav.blade.php |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 public/img/pixelfed-full-color.svg

diff --git a/public/img/pixelfed-full-color.svg b/public/img/pixelfed-full-color.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1de25b659c9ed58331fc554b4d128778c5136580
GIT binary patch
literal 15099
zcmd6uUvJ&Wk;UKhDG23d7m(?0Hv10)dxFgMcwZDC!0x`}%^S<M5RYWop0Rg7{r*nz
zk}OKR3;1n~Aaixpx7l4?b?Q_#_2SRpfBo3~e*5{$-NXIMtJsID?)Ls44{z`8-@m;2
z&;NM+tX=*2r$4;-^85Sl+uhr*9~e`{Pv5V)54U&kKYV?8Rf>N4{qFYL&kx^UUWG1n
zjOa=M+@_6J9S^$y^787#*RP-c^!)j^Z{PZFsekzV{`n9>c+LaPL;m#r<K6u~j|RqR
znx5NluYUSN$G;bEZ{L0S>BV#V&y2k9?%uw<`rDiLx6gRym#?26{(1ZI>i*&WcKPYq
zvX86o-QCBJ%P;l$+2`LrGWz!S+xv&NZ_f|02hG#I`;9UGc=+_+&$9ca4fyot>xYgf
z|FzV<)-dKNU#HR!HRm*r-Ax($Jfv|-<0W_;`kLA>4vEq6`q7WW*bjNADHeXqBTCF^
zO4klPm5ImIsa22G(C3h+X%v`48_Sfs8vAj~c`DQOko$mL^N_n!9s1O=tSmUEIHp{?
zn)*;vP8F05rD>{D5t?HtDe|=1$1#_{*c0$H);i>TJ+waLIHcIRI`*-Yp-l05nEEiK
znx?^{DX{bu^Awq48=M9nJ*0|1F>%SY4WV8q9zF1ciHV24jA06`T&J-w49$rdqCQSj
z0nL3K#%V0E!xA`J9;W6`;P|-y-u=}b7#q|ap$z+TOg$!=iXE>z^$k9i)?@KDhNx99
zqdBO;N~Qr9!MH;#vCZqloQb1i-y^;f%fx0vKbE1j0vwsG4KZW>(3je<I$Ml=9BN4n
z_Nce$HW>4dv6U9Fs3wj&P90SZk$;AUp$=8P)tESp%-zYi@}vXOY2$fyOtsVQaEpjV
zor%169vjXL#?Te_!EakFnx#fQjE#MlKC|z{z8wt8afiZzgXUDQ7cR;v2mDT0tOEv@
zALTw_w;I_==^H*WH1?PKh?CcmHJ3hBV42gQxo>QhK(r~=!OT_&YU0mNJoZx>upO?r
zu7Nlsv<BP4x>%f=CncS;+ZgL{yVnzIUnWAqg1D=k0MEqJ6}{^O4gYUL(SEmQaTdgL
z(P_Fx5p6A|sPK0i*rD5Q9qdfwCU$0YYw$LA3wFojHnp9w-}#2hArv$d>^8^+TOA{e
z(cL)MbE8h9wKT@Oqf7^1n8d+6v|-<AD8%#bp^d}B*CU)k{NhYCLFNrhg(;5%Ug%ah
z!A4=kAs@{_bfpwx9z;hilvs1?ZWvtyoF4WIXYLqkDU9~pbPH*H8iyP!bFk`As<Og<
zFrl4uNV)Cdv1f6$g|u5pBSqASFovDoZjLR2sV3+v6Bqd32-{9gX{TU1{Ww(u6qCit
z9t~HKk-Dj{Df}4rW>ayjAqBW?BJ5(uVwfPZh(_3T6RRZC6_V2!luNUMZc2T_ZZPHq
zqo>T*_<rgMgp}}<)F4Dc0#5-AJc8K2P8A{zkZ0VXxt|*IH?7_cCYUNiNg<k;B#yQ0
z+(|Ye7+M=qh@oKUVa`}gL2AZXr^e#M#S;OSJN6b5{1jLPTnx*M0TljX?|?8doXwt~
zD$t2djhwmiW8gHPR}33R7C%}pC2!|eKw)A?s|0hh1wF+8$(J_FY`(xTL>M)Yf^@W`
zFjhHsG2p1!IKT?zgOut(I%WzI>ns(f9umUpe3iYCBrve%XJC$o@}%5ANwt~SD=;=E
z3`bV7zsyqz+h`BVw$XyqafWrwl}x3v+P+Y}l}D^fV0jp_As)#9gbH*73C3#TX@O-n
z9doFhQiZj1jJQwf@i=KCxkMSJ5hlkgIg8v9C@M)w8v~z!SrG9<7M;jtg(HyJOR6JD
zSN_Lwa^6hKaSdQN`39QRM~NK#dV^(kbW724v1B552U!i()!LM84LOqy2F_mage;kt
z#uizx2IF9OK4;H1kT9sHY-nmzlUovXp~fLkv(?Zi1R#&&OSwgY%Z`IM8gM`skMfjT
z3JnnIyt@=x!z2{nAIFF~WgpX7)i4G8f_Vb;LVQNNnfQ{QFcv>nFcWHpGqtsyoeC7c
zt%TjYJ$wb<*WiW&&Z`KRdu%wdIAcdBGsBGRAp~<UvivzrIGL8wOYDf{oMFxj#WE4C
zLMsNwSUPd^DS6UDb;`&a5e|W-1)y4S(G~)S54RM&bsz>zkL6JLy*U#5k{TP)Owa=A
zPsf6@qSzdYnKqOVf?}&Y9HL{pQfLDvB?BN7b=qh@gqzS*U>SJaoFI@lpj7tI;(!*D
zp#y{+iI?4e3E8K{!D=yLR5Uqa6A7?Z3l8Q4))IpxLmt6cGf^*<hl4Ln;$V9yE&|2M
zMf~h>h1t+ZgpsqbU&JU4N3?w&!9D|_N0+%T!-(p!;gu&p8t#Cd;Hyq3AyvpnD4@#G
za(bW{N-ji?6+i_>O^U?`JuALUZzWita*V+!oY00QyYdtHci^G=fp0*o9BS1!_#J06
z;5Am5LAypMLZJW%QRgDXO(HlUt$SQT`9T&<*o2fOlrK@n2*p#0MV1TN@`y$@wBaBr
zV@+VBU1{usv<pM#dY(CqWD%YR%<`lB(N@8XWD}yG5PRAhp;sWw860313tH`iWQv<h
zI%5yyhz*81sr3w14sXp+_OGDS*fVN|q1+O6I9R4+1`bC{gA^KdB~xr@!&%CNewMR%
zc-4V^*G{fDc<*uRBp2WdZtGyVIm=CmG8{&l2i}E9RGsL@$Wak^M5@KWS@Up4WH6+h
zG2g0r;sEhr7RjYm^9V%9k*mbNi{^m_U^%L>z3S0UsoL;auX==%p5Z~SdOYe>kB2wa
zV-vTmrAh6cRgYFNPN*SJr+RG3^b_!P47;cvq109sy<YXm6cl!`;ng_Y!soJEX?3r9
zWLnmMH%qdtLI(Q}Lz2NA$~h2>BoZWtgINq=h~VOJPW7N*5~5h@oZqjiht<=ifhPo?
zWe*#r$h7L($sSOWWX(oio9s~yuM}rFWtBa$AQCHaNKW=R)XN?RJJ}=qggWAA>R7C@
zM=(|LB>A<<9)XB*gqYVoGA2zJ>J4dtRrd(aji!*nXWbKtQ&wCCdQVQv$njOum>OTy
zkQttq&KMsJMyrtc=XqD*gI&>@oRt=_2_N7BE;pv;S%i-r0_tg}dpJ6h`5E1G4`v%s
zB#(s;Fl`I8#!mQfdT6pZOSM(_$fYUwB}BaN!71uAkY{(oM~+T-pf_QMRrqXv1-c0z
zHiEazCD^Ka@JBK(`gG<EPbz1YiG*6UN@5W>7#pD*Xw#YFEwB!e(v)Js>mH#r$Dm=0
z)<yWpJxDc)ij^HN!bd1AzOgVd!sRS{%)h89si?j5VVi+)RPnP4qEmF}CVkjC!LDO*
z$_J3_L&s3)rhKr7Iurwk<&+O7N@f!0Y)Vfg{M0<Mn@UlyK1SBk5NeOKje}9>XdkK$
z@(gf75KG%{@JTS8Y*kc7)TI&R9r8i^oHSTI5UCXmL=vEF1*)Znv>;3HJ&F!O%2p>u
ztVAqFqiof@m<K6`2sIS7K?BpH*jM!+g4N{JIvDkjZj>U?asr7dQLMoR1L9Xn1eta2
z$VR9G!6hxN<pc%<bcPzE6*WzVfV{ziNn>D$V3ZOMt<XQJmrZcmlvo*Bu!4#L4yh!R
z3Pxk)!%>x-2jOr8GcG$%a2_gEsv=cuRmw~%Oywig?Z_2dftG41rSXrMHGy?a=$9&|
z$Z$NEvFwY6m)IE3<UnQ=8$g(%en{SGH=6=~q9HI?Qkh@@W@8GBOKB#d<Wda=p>n6b
z^(cqQv7udHyxm}I+5&DZv`r)pDJASrdw}MoRzcelveqheSk#-%QVsoEYBt8MZpJ>4
z{iq+!u=*q@TulpJk_eb4q7nBoOhj+WpRjoRvzBny`U)H+5b_-IbvClKrm*-1tDl2G
ztBzMj97x#m1eO9B7)S^Vnt@z<p4$9YUW<n=&Xg%L`HV_J((F=<EK7Ni9;Fz$D}5w2
z_FO)aX|a-OKv!FX;`jKz&@IJaE*Xw9171^%Y>Vfs2;tZ%vbmWsi&O3)|K-wbIg>7R
zW=I!$GsLhwedGg{0Hleo);V5ClY-1U&#<6dpU-AkV1fo|L@UCk;N}3%HR`2pVi3i+
z1r?`c7e^{FbYwWUnq0IBU>O2~!F=XeX7*om!e&axn|2y_uC$0_Q<+5F21Dt6QqwD}
zFbREg*_Y>XsY4;57}VMG|5%6WpZ;v2A?E!=@}n^Y`*7Z~+2QY3^Ud7d_uG%}Zr?7K
zZ-2y#UXAgJTRdH%&G&k`QPaN{^R?Tj4-a1-zFc)*Kfk&E^6ugDuP?9c<Ht8&Z~rB7
z#P;u+2cJLw>pc7UI*-f0|GEAA@aV?Q&HrzoAAbAvEFBDZGHAFk$Of)=fGS+L6j1zA
zA7VrjpQ?Q8Nyw)Kb5S>u4LhOOm6qu>Wfy^lI>59$ln7OP%u}2PqqIdg@CnWUMUyR6
zuc@!r3Q~!(3WCHza50D8P~uj~R=TDhK8Y8QtJE59aJY6)30mK}5`LmL&gCWz(N1(n
zQHtogR?UvqLos&h?$Y^IrsHS`E;;V$5EY0jp#-*}VpKBdF={io!SlRNro~&wr%N!D
z8CWU@KvzmDBkMt_3?|Mf5Oi!fIg&svTW2qaQk|~WbuiItGMpZaLpe+;{eddsn#Mz|
zc!M(7p_iQF<n-|Cf8E{RzJ2!ZAKrZ8?s~qe{^QTD)9dz^<7kl&F8^MvzQ}3P5abl<
zwM;~4!!X?mm<9k`ju)(l*KykD6|M+|Yu%QPteT4iF*he)ky%`(?SFBS7tnHoJs$l=
zjzHU7T~PM~tRf1GyTt%D2`$vAB#2rXvsbf3q=QyY1CLuhe1d6}>vidfDHFjU?Q=sw
zk)g?*?OM7UYKDf07m_lQaNBxKcZ?<l-32VKq)Zv1^FZ;@d9yaewntDJjih@*j=CBF
zru?KMh3I+Y)OnO6ho6ZBZzc|!!jv?kb^+2?O&HV;=AzBYH3Aw8^+6|qTMwZ$3MoWb
zn+QYAB2YO9DmJJ&FTy}%QG19QXu7KDrHyb?(g=K^WGA%EZWSA<Rd8=W3FODJ58c27
zq_WM6G2t1|k-C}^N9ei;Isu`K6rKhv*VCEqK)D&k@`gsjhBJ{X4fKyG{cU#$1U8E`
z2`simyHzkvQC-Y-s1&V%?4bZj+;q@Q>ExpWb)i;4$xCaJn#^36foMlN5cDF%HE1vj
zfT|o*P=+C7Cj7#q>O;bNTru4^Sm90g-P*7Y78f9t5dAg>vOvv3@di>E<tFqXuFlcB
z587W|ajSG8#VrA=|GJ=+I;L7fuPWUl-ib+;EoY@p(R&*>D>0*+XL%@WPKGdPieTav
zSWZA1pzlcdDR*N=HTpLnS4TyUAlb+@^bP?LFZL$@aZ2;96_s)!bX32%DX71>I8?h^
zQ$TDq2Wjn*OGqXB!oq~Uq_twGNoaAYpXuC7&Qo}gM6R*9qEPB04r|_rc`YC}h!jgZ
z4|k~6u!MtyUFg`n4d-HWTbv0!uK`qER;ZRhbrB%>qZpuepm8mfyE!ToP=c0xnJ8D}
z>}-PAz!10&E@ie<sg2qjrT6H74WJwyijo{phzq66hTC|YoSjaKWqC&E1sA>h0F7`n
zsIf37r_Ze>?EqS{<Wni?737i~ZEAht6;vmL;sKGzx;%<!)9J+ufQb@Fbr=stPw=LX
zp+?eFX@RuG$@Be<&k?;yk3ipDMp)=ydJ@W@`QUxTp(mGK9ITz6Q<0k(bcrv&3SeB0
z9to13tijrOq=J!LBXR^pRAHPXQaK2s!w4OIY30?cA4#jWCf-uWmgwOt6D%iNlUkYv
z<G;{G>}*lc2A4^)Vk7&*LZBpAJP0aOQbTL&-7kx5sFiXTZ=@dNbr?kl34rDYC4*p|
zM^0kn3T=)GMlk0mU2yqjp-oLjYfaI*h)1kM>q#l+npmTEVX6l+k#}ez;A{@1MnVnZ
z-uo#O+9RbOizBHaFS&RW*Hc83dRQAt4auqNeG4n{6r^IoMoX7?J_+Xff)1Quf{LK#
zuoT>S_YA`+iU+$e+N0Y>c7u7b2USPL*(NqB;pGahLxd85S_LStRk0;ybwxMg8418g
zoSCE4SVS}pMTnHI5rK5|eJ1m9&S&}}Bsc{$9Tr~PB3Iy(v~kosQ%++S6Bh(>&vPQP
zkLNJwGh&NwxoK`PzDm1J(G8iP*ZBRS<vG#9MU67ALvL^)M$Q*j+hBQNqLL*i_|c%e
z3m|=GDB(*dqH~VS%qoT({fCnxkxmR1iU#Ade64jBwMxEh8mUOHmjv!n?{03eSc1l>
zUTAX@D;DS`@jt%`QPMe_4r6ut<(HO!ELOKbbCU5yEllGdy+cn_FYZjrp^6>KYFwNq
z6!D4vL>^wq_EOR0*aK;>NRdY};w(^{=D5)mi*DHzip{*hJ2`VKeHQn^q?=AU7FBZA
zrvmJPT2mA}m3GH6@PcOK0);mQAUsJ)I;V6L&}C{mCbh+dVsO2esrXy;jZq(0>1W13
zN)|j?j6pKQ1{?|2LIfHe^1jeS*!f^*WFb-TQWwGgh@WT;llwrAxa<+}L7uu@e$0}D
z9kQIm+cD}Hm9ld5yG-$jt4+6y!FRmQ1yh5GB=1}jm@T1r_bG!Sh?flrRwX@`Ux;h8
zFDMDf<s#%qejI7%qFn7@W`G@45n*lKVIV3Y1S&_m<kxBlinMuI(k;S;(_yT>4yPP{
zs9e27N5|ZCiRTVT@#dI9Psen7%*+>P{Fw6()58{Kc;6}+FXWvIDe6Kxn}dPCLdq)j
zD;SorQMlnMu)B{jP`sC%i#l`xsqb;6z<dhRC3r2|$dfehL6_<fbdk=WdIjN;)F&b6
zb$GO|FAJ0=&g}#;rmrE63yu}t6({Qy`%1=M;j>2nQuVO3rv(yAU&zK4Q#Z$|(fTD$
zVd{Mis{!|7R6F&#Vy9ePVo}`iN)ctNPeMc+ohTH84>60jx&Ax3c(m`)21o6=*tO(^
zx}e*597u;zI!-^g{Q5`KuRA|$m9Pw6ZnFA|&IUr<`YM$FdVLQj-t}N8P*qdGhFilX
z(^o+M>4xK|y<^44K`)5NJLnrpKs;$NDHzlj+NE`|8u$6+4le<8Iye!HE5~mqX#}pD
z5IshQ$Ryq%?L^4DgNT+@)KF=0(et<!$xAMC<MaP*(^0Kyy-LYd(5%&wqIykAD8h}K
z8IFsZOJdeQU20l=vgTM|NQbZ43`;@=rADR(+NExH_WH<WoaK2w>#rX4)~&vG76qW(
zeaOMQfB-#glO6Ze)PJK{rAE@O|F$rQZ`O&&mVV#X+4Jbu1w4*}!yx<RRsMObKNMtJ
zgz)s0shvrI7g~4b2VGJCD00Hi3Un=g)VbhQ&Zas?tj%2*FYuaaXnXP!s92i}zza8>
znTBqvn&PgOBu?og)0Q$=@1wz8Y8-H-#2u-XqbsUzD#hE3u2mcnLxa)Yr(tIOO$N-s
zOOLdpAy>U^2W{*1TR4>`)7j&e(9p#eH(R6{ZPT37YvJ&yUfw~tSnWcikjq@6k`5y;
zm0Ga{Fb$+Kcf){|+p3=>sy(4@@$blYTY)EP&np|No3c7{kiIu(0IPRIS3X%>?#s+A
zARgvhI4ihxdu}wrjGFGT#*k|P?OR9(&87>DspBpdn>pxsU1*OT_tK90Zd;H$q2UO@
zi4sR1po@S3U9t?`wD`?ofVNk8`b+!21N6o7_xl^lrG2}#ZnX~mRTO<_e3Di;SIy)#
z)<n4J6$B5Ptf2kI&6$UFWV|L%e@1->-mT;o99^-YG67<ozl%G06c?wpL}$@D4(EC4
zh7;aoCWPCz2#4Mf_>yf3IR~qe$*U*Sw-Eg{2acsU<sD9St*F`vBn$i%<!?Rcd(d7Y
zn{R{BSh@_--*(*`+vt2Mf8!eXS$THSpIHv;#n)^5clmUloXiebf3OcP^w*|8{V#0x
B^t}K8

literal 0
HcmV?d00001

diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index 6a46b576b..f880e337c 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -1,8 +1,7 @@
 <nav class="navbar navbar-expand navbar-light navbar-laravel sticky-top">
     <div class="container">
         <a class="navbar-brand d-flex align-items-center" href="{{ url('/timeline') }}" title="Logo">
-            <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="mr-2"><path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"></path><circle cx="12" cy="13" r="4"></circle></svg>
-            <strong class="font-weight-bold">{{ config('app.name', 'Laravel') }}</strong>
+            <img src="/img/pixelfed-full-color.svg" height="60px">
         </a>
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">

From f7cd91110d6a2b5d67e1d965471258ea414a106c Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 17 Jun 2018 23:28:34 -0600
Subject: [PATCH 20/21] Update compiled assets

---
 app/Http/Controllers/CommentController.php    |   4 ++--
 public/js/app.js                              | Bin 309847 -> 309850 bytes
 public/mix-manifest.json                      | Bin 250 -> 250 bytes
 resources/assets/js/components/commentform.js |   5 +++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
index 8b8eded8e..70a7825bd 100644
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@@ -34,7 +34,7 @@ class CommentController extends Controller
 
       $reply = new Status();
       $reply->profile_id = $profile->id;
-      $reply->caption = e(strip_tags($comment));
+      $reply->caption = e($comment);
       $reply->rendered = $comment;
       $reply->in_reply_to_id = $status->id;
       $reply->in_reply_to_profile_id = $status->profile_id;
@@ -44,7 +44,7 @@ class CommentController extends Controller
       CommentPipeline::dispatch($status, $reply);
 
       if($request->ajax()) {
-        $response = ['code' => 200, 'msg' => 'Comment saved', 'username' => $profile->username, 'url' => $reply->url(), 'profile' => $profile->url()];
+        $response = ['code' => 200, 'msg' => 'Comment saved', 'username' => $profile->username, 'url' => $reply->url(), 'profile' => $profile->url(), 'comment' => $reply->caption];
       } else {
         $response = redirect($status->url());
       }
diff --git a/public/js/app.js b/public/js/app.js
index e1e65874df5721d65ff134b41f43820f2f20b6f3..1d03a72880c2f01d8d066d932358cf196c661000 100644
GIT binary patch
delta 121
zcmccqMd;QSp@uDt%0I-bGfPr)t%`J#^K)}k^Gd8T^~w@+G&HAs{9rWT$k)^>$w<x9
zm@df8EIfVk4@McqeA^Pel*E!my@I0rw9K4Tonn{()P(8#e=uHW%%48}C!;xIar^n7
Oj6lq^{rpenjspNg0x@X-

delta 118
zcmcchMd<n$p@uDt%0JXqG&1$d5_2>(HT6nTD@rspb&74PGfPr)t%`J#^K)}k^GdAp
zYptgz{$doK?*D^Pnz4BL-mNU+)0=)U$_o_RmguD<mL%#G6y>L7=A=$P^n>v_P{pjD
WjOL8_?U#Ns0x{F}OFx-A4gdhe7BLb4

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 7d55e58645c95aa4d9a797673f9c9d75e613c617..6eb24f25704eadd5b24d5ab4e93d0fecb8c63e0b 100644
GIT binary patch
delta 30
lcmeyx_=|CZvWQ8tk%@_cxq(5lnTdIlrJ-q(QR+nV!vK(T2|oY;

delta 30
lcmeyx_=|CZvPhzZk!h-tiGh)+p`~S-nT27pS@J~l!vK<62~Pk3

diff --git a/resources/assets/js/components/commentform.js b/resources/assets/js/components/commentform.js
index e6c9cd391..a2aa50394 100644
--- a/resources/assets/js/components/commentform.js
+++ b/resources/assets/js/components/commentform.js
@@ -11,7 +11,7 @@ $(document).ready(function() {
     let el = $(this);
     let id = el.data('id');
     let commentform = el.find('input[name="comment"]');
-    let commenttext = $(commentform.val()).text();
+    let commenttext = commentform.val();
     let item = {item: id, comment: commenttext};
 
     commentform.prop('disabled', true);
@@ -21,6 +21,7 @@ $(document).ready(function() {
       var username = res.data.username;
       var permalink = res.data.url;
       var profile = res.data.profile;
+      var reply = res.data.comment;
 
       if($('.status-container').length == 1) {
         var comments = el.parents().eq(3).find('.comments');
@@ -28,7 +29,7 @@ $(document).ready(function() {
         var comments = el.parents().eq(1).find('.comments');
       }
 
-      var comment = '<p class="mb-0"><span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="' + profile + '">' + username + '</a></bdi></span><span class="comment-text">'+ commenttext + '</span><span class="float-right"><a href="' + permalink + '" class="text-dark small font-weight-bold">1s</a></span></p>';
+      var comment = '<p class="mb-0"><span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="' + profile + '">' + username + '</a></bdi></span><span class="comment-text">'+ reply + '</span><span class="float-right"><a href="' + permalink + '" class="text-dark small font-weight-bold">1s</a></span></p>';
 
       comments.prepend(comment);
       

From 3c63e203439c9681a2e7a91c886bc4d067c97c3c Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 18 Jun 2018 00:37:06 -0600
Subject: [PATCH 21/21] Update logo

---
 public/img/pixelfed-full-color.svg            | Bin 15099 -> 0 bytes
 public/img/pixelfed-icon-color.svg            | Bin 0 -> 8092 bytes
 resources/views/layouts/partial/nav.blade.php |   7 ++++---
 3 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 public/img/pixelfed-full-color.svg
 create mode 100644 public/img/pixelfed-icon-color.svg

diff --git a/public/img/pixelfed-full-color.svg b/public/img/pixelfed-full-color.svg
deleted file mode 100644
index 1de25b659c9ed58331fc554b4d128778c5136580..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15099
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
B^t}K8

diff --git a/public/img/pixelfed-icon-color.svg b/public/img/pixelfed-icon-color.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c3a8625bdc310c5d264153455176365201daa4a3
GIT binary patch
literal 8092
zcmd6sTW=i45ryCVD+ZgF1XvFHelbWH)=JFF1~8E1C2xwjA_>!6f}}+yzusT<&ZU+d
z1>jo*1Kut6)^u0bId!V$?5A(P-F9Dh505wdyYrRp&8pkoecoT*++Cfo{`rrKld}5h
z-4ADvU$467o6D!`^HntW-&WoA?&j+HY5ex}X7~Jl|LuHbI@3k@Z>62uRmWrQ9?w_T
zPfzzho}NBGKljhR-#=WPI%CW!?uR8me!IQ7`*mrdt+k%Ezpmc>(DCo=a`)x&-PvjT
z-@$U#-CUlpe))8@JK>p+PY?TFcjv3S{oQW-b~2oTKYzKoy&eB3pHCiszh(9A>+WuU
zc{x0!J?P-}=JWpU<n#XiKg6W{c=!SC|GRtGs~@Nz-CysY_K&OX>EYAe<Cp!zZ|AG_
z@%Gcx?$4%=oZgsqH-7rd3opvkUmy0r-=Fw}1+Nyl?<{Hy?>{|VcSPxL&i2LUY^q&5
z-}_=y2&LPIxfE}l7jyQZMqfLu)%k35TD#Dj>O!vWg*C+Lay_`17MDJG?`#R3EgZL`
zoa)-U-h|>}?QH11580QXjN9DDQfjU?DeK1f!A28Ia>{DfZhiz`LO*STZ>CSx=Injv
z`dp%o(Z{vLeYDBB(52qj#6M@(HuW`!5^L=?%Vx3WXln3>#W5T2nv2)g=0ckfo?kgO
zHs#m5XjWY0lAPye+ViYU62{zHA{R2TVatU*7?ZJ15mVN!3a>J6xC$F=$*G-W^uZl_
zQ;juPYo9IYV1wN8LYn+*)u6W7|Mu^jyWQo<->*O21F{3A{`CIBUzDF$fK#&V09Q%A
zm;cVDWc1`0DP?0>ON?wXsc;dPeM*F!9Gxz(<HnsUA-l3Ry)n_m>TM0|mD^9j^ZOTn
z*pLa?7-wR9@fS&k<YEa<KS7eAn9LuJw!>m?KtaryljBKIaya)1lgSoqA=`|NNvzex
zoI_r7Whwhqo$a>H^(n`aYF=B;>@yp7pw9QvlHCR~C&fpNR?cG$Fv(?Y!6IoYKGZ3>
z-(r0#+2bPi#!9xcIQ78=@Jik*E4N-GP{%H~YS{+X4W6A1Y>99~Nj5u|O2^(x1fjXE
zNd{+fal#0~8K#h`Vl9EK#lu0ekGT>IF<0-C&9Y?<R3bqZBB{xlqfIEQY@&Eq957dA
z&cPE(v4h{>OkfkS2MQ!|KHda5<SjWOR?>v5PMyoW$)Sd36jn<X2br+Sg#}q^33W0O
z%i23|Zp4Fuc6_ve%o7vN9EB|^cgkV_LXMJ*_#p0Nf&?nG%*|l5xGJ|HR!ew<_##^?
zK#Z+(pRlMl3LQdxId@xSCP!;9_<&rG%n$+uk(vuj{$x)I<`M{sXTOV}8lZcO*pDAd
zvi6OLHO^Jz(>f63XrOUNey5&1ATgls1|q&mT128q`JjGahFZvFl9Q`;i6n|^&;7<2
z!IaK#F8~O}RY^_{pehhyvFk(Sd6=~ojQhajj);J(wB&2XDyfyNuilYbr4NQ8R7p-C
z0`q%A4v-F}mg-0sm0FTH<g`5;WXeO#>^E{NI%nn7WL!Er2w@qmvWpQ6vz2p9xDmf(
zoMjUVWO@^hgvf!I%Z_aUPw)^43{IhrW(^J>0T-loij+9e%jq~qOhl6ePCobyArcD8
zD%_Z*MtiW*um>*?VJc-KxWL*(<VkiaKkR}F9vxGyV22CA3<g}+>I~pod-h%<ai{bP
zFE(4~p~On*>9&)R^zqK8Omb@*RU3^^<j1g@fG)V+0v<|wGY$leHM(R8Y1`7s=7BWx
zj<b>@Gx>*tGnZmMq90}5sN$l`st_s13SfE{m?;ii3eX@h5F@b@G{Q*`qZ6x<*uacf
z7htrAQTMT=4<FuwQQ4Fyk4hsU#7k2wo3^PEz?CqTtA+dsooq^ogGwkoW=#svP{Vda
zbRjpSqEY2yfSe?A#W(3A70ncI3ONb3Ybu7KKt;m^+}R1XlZnWPgLq5{_U#(Bt0_o7
z5HYE?hV52w)&fj)iY-y7Hxsd9aWPvPwxJ-gDi;mgF$OZ8f(8^(osH?)TeMgyXrbg%
z4n+a7LP9hVOoYG<L?IBQP>SvlU>fKYlym6nEBtUchXDyVKC({dI5rmt^`%yCCdWjD
zO`wfiX&QGSwBtCZ&=mlyA+@qeMI*_n^s+d(Ok5kFO@dbr)~S#wm^W-gXB>}`2C>0c
z9Unm>p#`{7(i~N&=sHGHPAC^>Q{E6{0)7sGB;`I3<K%)|DGLTM&y7Y39s*>xZ5z4~
zD3qqzx{<W<g_CM6PX=0FMB25b2H{sEEyo<@`IXqj1kxJ{QACh7W@<V0hs6SKsk`Kq
zh(s@?`^c)&L@$;`AzG?ZryP^;5$5DF^e%*t1|%)Qw0`_p;@e;<_49x+B^5WmQYS>`
z#5I96+<qok2r^}mVg(;kYCTE{P1r)Spr5&$1zmu3P$5!1W(hGFC%LheI~x_tEKalv
zQ9_1uENGr(eYB{hBuQWEE~#5fB26mdD?zs?{ZuX2S~ZHMMgpMnNIjmMXz1V<@IYkY
zFm#4AA5a2t9(9cn9%U~fcQ%+KH7U_nV&+<qACwkE7|PeuK0qI+N^pJza!MnLLt0Ha
zo2I2);b7@-0=>!$1`{Qt*iKNH;M^C~=pEn|MHqykg<XX(2dn5Q#kr%47X&Rzy?e>!
zv^s@EJ0|`i4ubMAg+UD`EA$SaRJdWTDd3r}0w#*iTz@h>48WU#-XJ#g;vq<RK|CU_
z5l$A_hcLn#ES(`Tv!Wq|s>SiV3k9S_lwO!kv~Oxr)&7o%Xpywo$ZL8No%50jw@akC
zS*F)zCZ6HNwkFzM=J@4upx~uT$M@>Ya!o?TAIhjMU<wCdEmAM2<r*_!tz;Y`mKDJG
zi1t9@gAav9ux3Q2H;himm4=6j$N{-iH>lO}vc7M<fRS3RS^?5(7$6Y9xo=RdhiWpE
zRW&5Di>7eK?xnRlG8Q{(b(Y(rITQ_Ui~s=Bmg`-Rifu-sbY%c5bjB<`(x8lyOtX$-
z7D?w(HtU)K+)`jt1_7x0BXC3baU%+2?c<^E+bBTF?@G0FVgl0<yzLqE4N|3Nq$?yX
z!Zg(PC0@Km^NJ80uCPr<0!jzHfY}<_h=7ijQ3_oWEGZ)OXzWrU%uWbi&uGXw<k+_9
z-&YeIX@i!>KTD$`Vb6uRk`S8=VQ3BJnhvq~AdP(1^&eu(kU2-ubEORm!8*iXc8w4V
z&4uH#@K%vVEN<ipi*hS6VbfDj^fM~y|9alo#?rx>Lgy~UvvO<HSt;faztl;w5<ro{
zVntX>SyzQtc$%Wlgc0jllfkV;Udm8NmGAlfk7~WFU|PpS5A!4pa7I5VGYqVgh~U8x
z;=**S)#MkWG_Hx^2g9<Xv71U{J)@IqK8*R)Ku=lK@K3prN#Owti$MGMA-)g!O+Zso
z(uA!-s@PpcUsVEiQ@U(W$E?pzR6OS*sij><Fgj_V2@=#zZ0R&Q8B`<10_~{)e|!TW
z1MY%M7PGK4Nx~ceSs`;eI=CaNM26N<tlEXJ1e^(BV3szGX0~g?S(buHwuUmKJN2DR
zav28GDy*f94YiBc7!y>5y8$0l6u}wqSCI9#buKiKmO-S<2$}kzgv82d5~1hy%LT=h
zfPI3srq!7O6a}kIXuj6u!l?&xZzM4g(Od{bjx7yaFfR>e4x=7<*gV0RY{R5yp8jxv
zaU?X4fAs8#11wCLAl;>r)bjjlan|*n!I-ee!W4~?wJ>p0DA$5RQG!w@iawN*Swzty
zM9YU*e=h$UqGzX9%dcDJS1m$xOqj`6>HcLr&pevJEt8-`9xy#r=B6$T^YM6OZkI;q
zDKmPx9|*KE;gYKytb{-$0A)p4K`RiJQKRS+UR*W5q?Z9lFt+qa<0h1K%bkGtAgEJj
zd5y(fkQY`=tY#m41gf59MJ870Z8u<lw8A7z%6VxZHGN);)ROl=yt>&ghiJHzUwEZ;
gl1?`ACfH4{ye`_m?_bWVi#ak(U)qN=c_IGp4}8LbJOBUy

literal 0
HcmV?d00001

diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index f880e337c..10e2bf068 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -1,7 +1,8 @@
 <nav class="navbar navbar-expand navbar-light navbar-laravel sticky-top">
     <div class="container">
         <a class="navbar-brand d-flex align-items-center" href="{{ url('/timeline') }}" title="Logo">
-            <img src="/img/pixelfed-full-color.svg" height="60px">
+            <img src="/img/pixelfed-icon-color.svg" height="60px" class="p-2">
+            <span class="h4 font-weight-bold mb-0">{{ config('app.name', 'Laravel') }}</span>
         </a>
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
@@ -78,9 +79,9 @@
     </div>
 </nav>
 @auth
-<nav class="breadcrumb d-md-none d-flex m-0">
+<nav class="breadcrumb d-md-none d-flex">
   <form class="form-inline search-form mx-auto">
    <input class="form-control mr-sm-2 search-form-input" type="search" placeholder="Search" aria-label="Search">
   </form>
 </nav>
-@endauth
+@endauth
\ No newline at end of file