RomanNum3ral
/
kcal
mirror of https://github.com/kcal-app/kcal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into demo

This commit is contained in:
Christopher C. Wells 2021-04-10 21:23:20 -07:00
parent 741de17e07 eea63227b9
commit 057d0b9625
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
resources/views/foods/show.blade.php
View File

@ -55,7 +55,7 @@
@endif
</section>
</div>
<aside class="flex flex-col space-y-4 mt-8 sm:mt-0">
<aside class="flex flex-col space-y-4 mt-8 sm:mt-0 sm:max-w-xs">
<section class="p-1 mb-2 border-2 border-black font-sans md:w-72">
<h1 class="text-3xl font-extrabold leading-none">Nutrition Facts</h1>
<section class="flex justify-between font-bold border-b-8 border-black">

4
resources/views/recipes/show.blade.php
View File

@ -94,8 +94,8 @@
@endif
</footer>
</div>
<aside class="flex flex-col space-y-4 mt-8 sm:mt-0">
<div class="p-1 border-2 border-black font-sans w-72">
<aside class="flex flex-col space-y-4 mt-8 md:mt-0 sm:max-w-xs">
<div class="p-1 border-2 border-black font-sans md:w-72">
<div class="text-3xl font-extrabold leading-none">Nutrition Facts</div>
<div class="leading-snug">{{ $recipe->servings }} {{ \Illuminate\Support\Str::plural('serving', $recipe->servings ) }}</div>
@if($recipe->serving_weight)