From 34ae2a96bed1364eb0f56e846b824eb33c977c4f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 5 Jun 2018 22:08:30 -0600 Subject: [PATCH 01/10] Fix icon size --- resources/views/status/show.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index eb6e646f..d9f87058 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -57,18 +57,18 @@
@csrf -
- + @if(Auth::check()) @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
@csrf -
@@ -78,7 +78,7 @@
@csrf -
From f9bc974e54673dee848e4deb8db8724ed50847b7 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 5 Jun 2018 22:17:14 -0600 Subject: [PATCH 02/10] Update activity blade template --- resources/views/account/activity.blade.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/views/account/activity.blade.php b/resources/views/account/activity.blade.php index 092063f9..1b46263a 100644 --- a/resources/views/account/activity.blade.php +++ b/resources/views/account/activity.blade.php @@ -5,6 +5,7 @@
    + @if($notifications->count() > 0) @foreach($notifications as $notification)
  • @switch($notification->action) @@ -61,6 +62,11 @@ @endswitch
  • @endforeach + @else +
    +
    No unread notifications found.
    +
    + @endif
From 99975da14042557a678e3bc0f7dd818c0a06128b Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Wed, 6 Jun 2018 06:58:39 +0200 Subject: [PATCH 03/10] Add classes for limiting height on breakpoints --- resources/assets/sass/custom.scss | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index 33a15a99..2e95bda7 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -203,3 +203,26 @@ body, button, input, textarea { height: .25rem; animation: loading-bar 3s linear infinite; } + +.max-hide-overflow { + max-height: 500px; + overflow-y: hidden; +} + +@media (min-width: map-get($grid-breakpoints, "xs")) { + .max-hide-overflow { + max-height: 600px!important; + } +} + +@media (min-width: map-get($grid-breakpoints, "md")) { + .max-hide-overflow { + max-height: 800px!important; + } +} + +@media (min-width: map-get($grid-breakpoints, "xl")) { + .max-hide-overflow { + max-height: 1000px!important; + } +} From 28535a641603e9568d1c15ea958535b0228ea83b Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Wed, 6 Jun 2018 07:02:28 +0200 Subject: [PATCH 04/10] Fix squashed avatars and long images in timelines --- resources/views/status/template.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php index b91ac18b..f162b1fe 100644 --- a/resources/views/status/template.blade.php +++ b/resources/views/status/template.blade.php @@ -1,6 +1,6 @@
- + {{$item->profile->username}} @@ -28,7 +28,7 @@
- +
@@ -100,4 +100,4 @@
- \ No newline at end of file + From c4b8f3dc790c245f8fba7e69331d17dd01f9fa57 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Wed, 6 Jun 2018 16:03:35 +0200 Subject: [PATCH 05/10] Add titles to icons --- resources/views/layouts/partial/nav.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index bcb4bfbd..d9015393 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -1,6 +1,6 @@