From f6b57e50c83beac949d5ec4b997f55a416ba0743 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Mon, 24 Oct 2016 23:42:51 +0100 Subject: [PATCH] Squashed commit of the following: commit 921d3789e8ef14c426d7629e4a5a8a788cdc4e44 Author: Jonny Barnes Date: Mon Oct 24 23:42:09 2016 +0100 remove indie-action markup for now commit 0df3d68eec48d119f1eeb701201accf53590d991 Author: Jonny Barnes Date: Mon Oct 24 23:31:18 2016 +0100 close data tags --- resources/views/templates/note.blade.php | 4 +- .../views/templates/social-links.blade.php | 38 ++++++++----------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php index f147ec65..60db7d8c 100644 --- a/resources/views/templates/note.blade.php +++ b/resources/views/templates/note.blade.php @@ -16,8 +16,8 @@
@if($note->client_name) via {{ $note->client_name }}@endif - @if($note->placeLink)in {{ $note->address }} - @elseif($note->address)in {!! $note->address !!}@endif + @if($note->placeLink)in {{ $note->address }} + @elseif($note->address)in {!! $note->address !!}@endif @if($note->replies > 0)Replies: {{ $note->replies }}@endif @if($note->tweet_id)@include('templates.social-links', ['tweet_id' => $note->tweet_id, 'nb60id' => $note->nb60id])@endif @if ($note->placeLink) diff --git a/resources/views/templates/social-links.blade.php b/resources/views/templates/social-links.blade.php index b7852ca1..afc87d4f 100644 --- a/resources/views/templates/social-links.blade.php +++ b/resources/views/templates/social-links.blade.php @@ -6,26 +6,20 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +