Compare commits

..

No commits in common. "8958e65ec205963787c46df1bd1eb01f45ba202e" and "b3b251bae289d474937865a7a7f6ebc5a37c4059" have entirely different histories.

6 changed files with 40 additions and 41 deletions

View file

@ -22,7 +22,7 @@ jobs:
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: 8.4 php-version: 8.3
coverage: xdebug coverage: xdebug
- name: Setup Node - name: Setup Node

View file

@ -350,8 +350,7 @@ class Plugin extends Model
'scaleLevel' => $device?->deviceModel?->scale_level, 'scaleLevel' => $device?->deviceModel?->scale_level,
'slot' => $renderedContent, 'slot' => $renderedContent,
])->render(); ])->render();
} } else {
return view('trmnl-layouts.mashup', [ return view('trmnl-layouts.mashup', [
'mashupLayout' => $this->getPreviewMashupLayoutForSize($size), 'mashupLayout' => $this->getPreviewMashupLayoutForSize($size),
'colorDepth' => $device?->deviceModel?->color_depth, 'colorDepth' => $device?->deviceModel?->color_depth,
@ -359,7 +358,7 @@ class Plugin extends Model
'scaleLevel' => $device?->deviceModel?->scale_level, 'scaleLevel' => $device?->deviceModel?->scale_level,
'slot' => $renderedContent, 'slot' => $renderedContent,
])->render(); ])->render();
}
} }
return $renderedContent; return $renderedContent;

View file

@ -70,11 +70,11 @@ new class extends Component {
<x-trmnl::screen> <x-trmnl::screen>
<x-trmnl::view> <x-trmnl::view>
<x-trmnl::layout> <x-trmnl::layout>
<x-trmnl::richtext gapSize="large" align="center"> <x-trmnl::markdown gapSize="large">
<x-trmnl::title>TRMNL BYOS Laravel</x-trmnl::title> <x-trmnl::title>TRMNL BYOS Laravel</x-trmnl::title>
<x-trmnl::content>“This screen was rendered by BYOS Laravel”</x-trmnl::content> <x-trmnl::content>“This screen was rendered by BYOS Laravel”</x-trmnl::content>
<x-trmnl::label variant="underline">Benjamin Nussbaum</x-trmnl::label> <x-trmnl::label variant="underline">Benjamin Nussbaum</x-trmnl::label>
</x-trmnl::richtext> </x-trmnl::markdown>
</x-trmnl::layout> </x-trmnl::layout>
<x-trmnl::title-bar/> <x-trmnl::title-bar/>
</x-trmnl::view> </x-trmnl::view>
@ -88,11 +88,11 @@ HTML;
<x-trmnl::screen> <x-trmnl::screen>
<x-trmnl::view> <x-trmnl::view>
<x-trmnl::layout> <x-trmnl::layout>
<x-trmnl::richtext gapSize="large" align="center"> <x-trmnl::markdown gapSize="large">
<x-trmnl::title>Motivational Quote</x-trmnl::title> <x-trmnl::title>Motivational Quote</x-trmnl::title>
<x-trmnl::content>“I love inside jokes. I hope to be a part of one someday.</x-trmnl::content> <x-trmnl::content>“I love inside jokes. I hope to be a part of one someday.</x-trmnl::content>
<x-trmnl::label variant="underline">Michael Scott</x-trmnl::label> <x-trmnl::label variant="underline">Michael Scott</x-trmnl::label>
</x-trmnl::richtext> </x-trmnl::markdown>
</x-trmnl::layout> </x-trmnl::layout>
<x-trmnl::title-bar/> <x-trmnl::title-bar/>
</x-trmnl::view> </x-trmnl::view>

View file

@ -1,10 +1,10 @@
<x-trmnl::view> <x-trmnl::view>
<x-trmnl::layout> <x-trmnl::layout>
<x-trmnl::richtext gapSize="large" align="center"> <x-trmnl::markdown gapSize="large">
<x-trmnl::title>Motivational Quote</x-trmnl::title> <x-trmnl::title>Motivational Quote</x-trmnl::title>
<x-trmnl::content>“I love inside jokes. I hope to be a part of one someday.</x-trmnl::content> <x-trmnl::content>“I love inside jokes. I hope to be a part of one someday.</x-trmnl::content>
<x-trmnl::label variant="underline">Michael Scott</x-trmnl::label> <x-trmnl::label variant="underline">Michael Scott</x-trmnl::label>
</x-trmnl::richtext> </x-trmnl::markdown>
</x-trmnl::layout> </x-trmnl::layout>
<x-trmnl::title-bar/> <x-trmnl::title-bar/>
</x-trmnl::view> </x-trmnl::view>