vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anders
2020-11-27 11:30:10 +01:00
parent c3ca99c9e0 a082ac9cea
commit 489e0ca0e4
6 changed files with 174 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/app/layout/base.blade.php
+2 -2
View File
@@ -14,7 +14,7 @@
<meta name="msapplication-navbutton-color" content="00788a">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="msapplication-starturl" content="/login">
<link rel="apple-touch-icon" type="images/svg" sizes="150x150" href="appIcon.svg">
<link rel="apple-touch-icon" type="images/svg" sizes="150x150" href="/images/icons/appIcon.svg">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" type="images/svg" sizes="72x72" href="/images/icons/img72x72.svg">
<link rel="shortcut icon" type="images/svg" sizes="96x96" href="/images/icons/img96x96.svg">
@@ -121,7 +121,7 @@
</style>
@yield("content")
<script src="{{ mix("/js/app.js") }}"></script>
<script src="/js/serviceWorkerRegistration.js"></script>
<script src="/serviceWorkerRegistration.js"></script>
<!--We have a service worker on the login pages, dont know if he works on the rest of the website, it looks like he does :) -->
@if(request()->cookie("mode") == "dark")
<script type="text/javascript">
skolehjem/resources/views/user/layout/base.blade.php
+2 -1
View File
@@ -24,12 +24,13 @@
<link rel="shortcut icon" type="images/svg" sizes="192x192" href="/images/icons/img192x192.svg">
<link rel="shortcut icon" type="images/svg" sizes="383x383" href="/images/icons/img383x383.svg">
<link rel="shortcut icon" type="images/svg" sizes="512x512" href="/images/icons/img512X512.svg">
<link rel="apple-touch-icon" type="images/svg" sizes="150x150" href="appIcon.svg">
<link rel="apple-touch-icon" type="images/svg" sizes="150x150" href="/images/icons/appIcon.svg">
</head>
<body style="background-color: #00788a;">
@yield("content")
<script src="{{ mix("/js/app.js") }}"></script>
<!--<script src="/serviceWorkerRegistration.js"></script>-->
@yield("scripts")
</body>
</html>