Merge branch 'main' into #2-auth-via-google

# Conflicts:
#	app/Http/Middleware/HandleInertiaRequests.php
#	public/img/logo.png
#	resources/js/Pages/Dashboard.vue
#	resources/js/Shared/MainMenu.vue
#	resources/js/app.js
This commit is contained in:
Adrian Hopek 2022-01-13 09:26:16 +01:00
commit 7527ebbb43
2 changed files with 20 additions and 0 deletions

View File

@ -0,0 +1,19 @@
<template>
<div class="min-h-full">
<MainMenu />
<main class="-mt-24 pb-8">
<div class="max-w-3xl mx-auto px-4 sm:px-6 lg:max-w-7xl lg:px-8">
<slot />
</div>
</main>
</div>
</template>
<script>
import MainMenu from '@/Shared/MainMenu';
export default {
name: 'Layout',
components: {MainMenu},
};
</script>

View File

@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
<link rel="icon" href="/img/icon.png">
<link rel="stylesheet" href="https://rsms.me/inter/inter.css"> <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
<link href="{{ asset('/css/app.css') }}" rel="stylesheet"/> <link href="{{ asset('/css/app.css') }}" rel="stylesheet"/>
<script src="{{ asset('/js/app.js') }}" defer></script> <script src="{{ asset('/js/app.js') }}" defer></script>