schulze/meritkollen
Archived
1
0
Fork 0
Code Issues 8 Pull Requests 6 Packages Projects Releases 1 Wiki Activity

gulp and optimising versioning

Browse Source
This commit is contained in:
Felix Schulze
2019-11-08 03:04:21 +01:00
parent 0ac1f250b8
commit a9f10ad11f
7 changed files with 235 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/copy/Kontakt.html
View File

@ -13,9 +13,9 @@
<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
<script async src="js/modernizer-webp.js"></script>
<link rel="stylesheet" async href="css/main.css">
<link rel='preload' async href='img/background85.webp' as='image' type='image/webp'>
<script async src="/js/modernizer-webp.js"></script>
<link rel="stylesheet" async href="/css/main.css">
<link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
<link disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
@ -31,12 +31,12 @@
FAVICON
XXXXXXX
-->
<link rel="apple-touch-icon" sizes="180x180" href="img/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" href="img/favicon/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="img/favicon/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="img/favicon/manifest.json">
<link rel="mask-icon" href="img/favicon/safari-pinned-tab.svg" color="#2b5797">
<link rel="shortcut icon" href="img/favicon/favicon.ico">
<link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" href="/img/favicon/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="/img/favicon/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="/img/favicon/manifest.json">
<link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#2b5797">
<link rel="shortcut icon" href="/img/favicon/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Meritv&auml;rde">
<meta name="application-name" content="Meritv&auml;rde">
<meta name="msapplication-TileColor" content="#2b5797">
@ -78,7 +78,7 @@ Information om själva sidan hittar du i "Om oss" rutan på startsidan.
</div>
</header>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script defer src="js/material.min.js"></script>
<script defer src="js/smallScript.js"></script>
<script defer src="/js/material.min.js"></script>
<script defer src="/js/smallScript.js"></script>
</body>
</html>

68
src/copy/include/html_head.php
View File

@ -1,33 +1,33 @@
<?php
echo "
echo '
<meta http-equiv='content-language' content='sv-SE'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, user-scalable=yes'>
<meta name='description' content='Beräkna ditt meritvärde inför univeritet eller högskola'>
<meta name='author' content='Felix Schulze'>
<meta HTTP-EQUIV='CACHE-CONTROL' CONTENT='public'>
<meta http-equiv="content-language" content="sv-SE">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
<meta name="description" content="Beräkna ditt meritvärde inför univeritet eller högskola">
<meta name="author" content="Felix Schulze">
<meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public">
<meta property='og:type' content='website'>
<meta property='og:site_name' content='Meritkollen'>
<meta property='og:title' content='Räkna ut meritvärde'>
<meta property='og:url' content='https://meritkollen.se'>
<meta property='og:description' content='Beräkna ditt gymnasie meritvärde inför univeritet eller högskola'>
<meta name='title' content='Räkna ut ditt meritvärde'>
<meta property="og:type" content="website">
<meta property="og:site_name" content="Meritkollen">
<meta property="og:title" content="Räkna ut meritvärde">
<meta property="og:url" content="https://meritkollen.se">
<meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola">
<meta name="title" content="Räkna ut ditt meritvärde">
<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
<script async src='js/modernizer-webp.js'></script>
<link rel='preload' async href='img/background85.webp' as='image' type='image/webp'>
<link disabled class='lateLoader' rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
<link rel='stylesheet' defer href='https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css'>
<script data-ad-client='ca-pub-5143923140938916' defer src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js'></script>
<link rel='stylesheet' async href='css/main.css'>
<link rel="preconnect" href="https://cdnjs.cloudflare.com" crossorigin>
<link rel="preconnect" href="https://pagead2.googlesyndication.com" crossorigin>
<script async src="/js/modernizer-webp.js"></script>
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
<link disabled class="lateLoader" rel="stylesheet" defer href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<link rel="stylesheet" async href="/css/main.css">
<!--[if lt IE 9]>
<script src='https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js'></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
<![endif]-->
@ -36,18 +36,18 @@ echo "
FAVICON
XXXXXXX
-->
<link rel='apple-touch-icon' sizes='180x180' href='img/favicon/apple-touch-icon.png'>
<link rel='icon' type='image/png' href='img/favicon/favicon-32x32.png' sizes='32x32'>
<link rel='icon' type='image/png' href='img/favicon/favicon-16x16.png' sizes='16x16'>
<link rel='manifest' href='img/favicon/manifest.json'>
<link rel='mask-icon' href='img/favicon/safari-pinned-tab.svg' color='#2b5797'>
<link rel='shortcut icon' href='img/favicon/favicon.ico'>
<meta name='apple-mobile-web-app-title' content='Meritv&auml;rde'>
<meta name='application-name' content='Meritv&auml;rde'>
<meta name='msapplication-TileColor' content='#2b5797'>
<meta name='msapplication-TileImage' content='img/favicon/mstile-144x144.png'>
<meta name='msapplication-config' content='img/favicon/browserconfig.xml'>
<meta name='theme-color' content='#27233a'>
<link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" href="/img/favicon/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="/img/favicon/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="/img/favicon/manifest.json">
<link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#2b5797">
<link rel="shortcut icon" href="/img/favicon/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Meritv&auml;rde">
<meta name="application-name" content="Meritv&auml;rde">
<meta name="msapplication-TileColor" content="#2b5797">
<meta name="msapplication-TileImage" content="img/favicon/mstile-144x144.png">
<meta name="msapplication-config" content="img/favicon/browserconfig.xml">
<meta name="theme-color" content="#27233a">
";
';

2
src/copy/include/info.php
View File

@ -5,7 +5,7 @@ echo "
<div style='margin:30px;'>
<h1>Tips</h1><br>
<h5>Glömt bort vilken kurs som innehåller vad? Håll muspekaren över en icke standard kurs för att se mer info.</h5><br><br>
<img src='img/tips.jpg' width='100%' height='auto' alt='Tips' style='max-width:450px; margin:auto; display:block;'/>
<img src='/img/tips.jpg' width='100%' height='auto' alt='Tips' style='max-width:450px; margin:auto; display:block;'/>
</div>
</div>
<!--popup-->

2
src/css/main.css
View File

File diff suppressed because one or more lines are too long