release v1.0.0 #14

Merged
thefeli73 merged 63 commits from develop into master 2019-11-12 18:53:53 +01:00
Showing only changes of commit 1b24c7c734 - Show all commits

View File

@ -21,9 +21,9 @@
<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin> <link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin> <link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
<script async src="assets/js/modernizer-webp.js"></script> <script async src="/js/modernizer-webp.js"></script>
<link rel="stylesheet" async href="assets/css/main.min.css"> <link rel="stylesheet" async href="/sass/main.min.css">
<link rel='preload' async href='assets/img/background85.webp' as='image' type='image/webp'> <link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css"> <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> <script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
@ -39,17 +39,17 @@
FAVICON FAVICON
XXXXXXX XXXXXXX
--> -->
<link href="assets/img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180"> <link href="img/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
<link href="assets/img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png"> <link href="img/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
<link href="assets/img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png"> <link href="img/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
<link href="assets/img/favicon/manifest.json" rel="manifest"> <link href="img/favicon/manifest.json" rel="manifest">
<link color="#2b5797" href="assets/img/favicon/safari-pinned-tab.svg" rel="mask-icon"> <link color="#2b5797" href="img/favicon/safari-pinned-tab.svg" rel="mask-icon">
<link href="assets/img/favicon/favicon.ico" rel="shortcut icon"> <link href="img/favicon/favicon.ico" rel="shortcut icon">
<meta content="Meritv&auml;rde" name="apple-mobile-web-app-title"> <meta content="Meritv&auml;rde" name="apple-mobile-web-app-title">
<meta content="Meritv&auml;rde" name="application-name"> <meta content="Meritv&auml;rde" name="application-name">
<meta content="#2b5797" name="msapplication-TileColor"> <meta content="#2b5797" name="msapplication-TileColor">
<meta content="assets/img/favicon/mstile-144x144.png" name="msapplication-TileImage"> <meta content="img/favicon/mstile-144x144.png" name="msapplication-TileImage">
<meta content="assets/img/favicon/browserconfig.xml" name="msapplication-config"> <meta content="img/favicon/browserconfig.xml" name="msapplication-config">
<meta name="theme-color" content="#27233a"> <meta name="theme-color" content="#27233a">
<meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" /> <meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" />
@ -139,8 +139,8 @@ När jag började informera mig om Universiteter, antagningspoäng och meritvär
</header> </header>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script defer src="assets/js/material.min.js"></script> <script defer src="/js/material.min.js"></script>
<script defer src="assets/js/softscrollscript.js"></script> <script defer src="/js/softscrollscript.js"></script>
<script defer src="assets/js/smallScript.js"></script> <script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>