From 9e28bb6c56cafd1bdb2f6010621ce24e75d5f859 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Sun, 3 Jun 2018 16:22:13 +0200
Subject: [PATCH 1/3] Don't use JS for navbar so much in mobile view

And fix #174
---
 resources/views/layouts/partial/nav.blade.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index 50b481cc0..1559daf40 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -1,15 +1,12 @@
-<nav class="navbar navbar-expand-md navbar-light navbar-laravel">
+<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') }}">
             <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>
         </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
-            <ul class="navbar-nav ml-auto">
+            <ul class="navbar-nav ml-auto d-none d-md-block">
               <form class="form-inline search-form">
                 <input class="form-control mr-sm-2 search-form-input" type="search" placeholder="Search" aria-label="Search">
               </form>
@@ -64,3 +61,8 @@
         </div>
     </div>
 </nav>
+<nav class="navbar-nav m-auto d-md-none d-flex">
+  <form class="form-inline search-form">
+   <input class="form-control mr-sm-2 search-form-input" type="search" placeholder="Search" aria-label="Search">
+  </form>
+</nav>

From fe2017fe7bdd3bad377de476eb60215f46bd91f4 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Sun, 3 Jun 2018 16:28:59 +0200
Subject: [PATCH 2/3] Make searchbar darker

---
 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 1559daf40..49ee3da13 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -61,8 +61,8 @@
         </div>
     </div>
 </nav>
-<nav class="navbar-nav m-auto d-md-none d-flex">
-  <form class="form-inline search-form">
+<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>

From aaf94d56ccf72c52d2ff21f777c5e23ab4125c52 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 3 Jun 2018 23:40:17 -0600
Subject: [PATCH 3/3] Fix comment timeline bug

---
 public/js/app.js                              | Bin 1106953 -> 1106936 bytes
 public/mix-manifest.json                      | Bin 184 -> 184 bytes
 resources/assets/js/components/commentform.js |   2 +-
 resources/assets/js/components/likebutton.js  |   4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/app.js b/public/js/app.js
index a7820a8a8c91a840606702bd7c8e98965de8ff91..e32bd8ddc659984d87cb81d0e6400b46089dd228 100644
GIT binary patch
delta 91
zcmeA?;r!#cbHf%!mY<A<?W{i;ftU%1nSq!Eh*^P{4T#x+m;;D8ftU-3xq+Amh<SmS
cZ#(Nx{;AIx4Y$v}FJRBen7sYX0|8lP0K0)Cvj6}9

delta 114
zcmexy+`03FbHf%!mY>t}zB6*P^ZaB4VkRJF24WT<W(8t4AZ7<*kUS?4a{)0o5c2>r
wFA(!>=lRLs_Y7>r_C@yvEEt7UG)giui#7F95=#;_lrmG4G`HV=ARx;O0M8yRuK)l5

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index c58ecdb81f8f82bfc42e8fe83215e03e22fd37d8..7b6dca63ce077e97e893a0ff4b18c02e52c38543 100644
GIT binary patch
delta 30
lcmdnNxPx(mvWRh_K}wowvUyr!YO+~MT8f#WN%BPVMgWz%3DE!m

delta 30
lcmdnNxPx(mvWQW#S+a$JWum!Znu&3;v2jX@Nzz2~MgWPm2@e1O

diff --git a/resources/assets/js/components/commentform.js b/resources/assets/js/components/commentform.js
index 159a91531..a0b56332c 100644
--- a/resources/assets/js/components/commentform.js
+++ b/resources/assets/js/components/commentform.js
@@ -24,7 +24,7 @@ $(document).ready(function() {
       if($('.status-container').length == 1) {
         var comments = el.parents().eq(3).find('.comments');
       } else {
-        var comments = el.parents().eq(2).find('.comments');
+        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>';
diff --git a/resources/assets/js/components/likebutton.js b/resources/assets/js/components/likebutton.js
index 4283fcf1d..1de310f7f 100644
--- a/resources/assets/js/components/likebutton.js
+++ b/resources/assets/js/components/likebutton.js
@@ -35,7 +35,7 @@ $(document).ready(function() {
     .then(function (res) {
       var likes = ls.get('likes');
       var action = false;
-      var counter = el.parents().eq(2).find('.like-count');
+      var counter = el.parents().eq(1).find('.like-count');
       var count = res.data.count;
       var heart = el.find('.status-heart');
 
@@ -54,7 +54,7 @@ $(document).ready(function() {
       }
 
       ls.set('likes', likes);
-      console.log(action + ' - ' + $(this).data('id') + ' like event');
+      console.log(action + ' - ' + id + ' like event');
     });
   });
 });
\ No newline at end of file