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

release v1.0.0 #14

Merged
thefeli73 merged 63 commits from develop into master 2019-11-12 18:53:53 +01:00
Conversation 0 Commits 63 Files Changed 84 +10 -44
2 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 72dec4dbb5 - Show all commits

27
src/404.html
View File

@ -14,11 +14,11 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<link rel="stylesheet" href="/css/main.css"> <link rel="stylesheet" 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>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
<script src="https://storage.googleapis.com/code.getmdl.io/1.0.1/material.min.js"></script> <script src="https://storage.googleapis.com/code.getmdl.io/1.0.1/material.min.js"></script>
<script src="/js/loader.min.js"></script>
<script src="/js/softscrollscript.js"></script>
@ -44,37 +44,20 @@
<meta name="theme-color" content="#27233a"> <meta name="theme-color" content="#27233a">
<meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" /> <meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" />
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-97913650-1', 'auto');
ga('send', 'pageview');
</script>
</head> </head>
<body id="bg"> <body id="bg">
<!--loader--> <!--loader-->
<!--
XXXXXX
HEADER
XXXXXX
-->
<header class="parallaxHeader textCenter" id="pageContent"> <header class="parallaxHeader textCenter" id="pageContent">
<h1 id="bannerTitle" class="animate-bottom">404<br>Har du kommit fel?</h1><!-- <h1 class="bannerTitle animate-bottom">Error 404</h1>
XXXX <h5 class="bannerTitle animate-bottom" style="background-color:unset;">Har du kommit fel?</h5>
BODY
XXXX
-->
<a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary mdl-button--raised animate-bottom" style="margin:200px auto 0;">Till Startsidan</a> <a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary mdl-button--raised animate-bottom" style="margin:200px auto 0;">Till Startsidan</a>
</header> </header>
<script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>

27
src/50x.html
View File

@ -14,12 +14,11 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
<link rel="stylesheet" href="/css/main.css"> <link rel="stylesheet" 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>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
<script src="https://storage.googleapis.com/code.getmdl.io/1.0.1/material.min.js"></script> <script src="https://storage.googleapis.com/code.getmdl.io/1.0.1/material.min.js"></script>
<script src="/js/loader.min.js"></script>
<script src="/js/softscrollscript.js"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -44,37 +43,21 @@
<meta name="theme-color" content="#27233a"> <meta name="theme-color" content="#27233a">
<meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" /> <meta name="msvalidate.01" content="A8E903A05A7CA699D918AE4DA58E910E" />
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-97913650-1', 'auto');
ga('send', 'pageview');
</script>
</head> </head>
<body id="bg"> <body id="bg">
<!--loader--> <!--loader-->
<!--
XXXXXX
HEADER
XXXXXX
--> -->
<header class="parallaxHeader textCenter" id="pageContent"> <header class="parallaxHeader textCenter" id="pageContent">
<h1 id="bannerTitle" class="animate-bottom">50X<br>Något gick fel.</h1><!-- <h1 class="bannerTitle animate-bottom">Error 50X</h1>
XXXX <h5 class="bannerTitle animate-bottom" style="background-color:unset;">Något gick fel.</h5>
BODY
XXXX
-->
<a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary mdl-button--raised animate-bottom" style="margin:200px auto 0;">Till Startsidan</a> <a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--primary mdl-button--raised animate-bottom" style="margin:200px auto 0;">Till Startsidan</a>
</header> </header>
<script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>