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 +32 -32
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 19b65412be - Show all commits

6
gulpfile.js
View File

@ -6,11 +6,11 @@
var settings = { var settings = {
clean: true, clean: true,
scripts: true, scripts: true,
polyfills: false, polyfills: true,
styles: true, styles: true,
svgs: true, svgs: true,
copy: true, copy: true,
reload: false reload: true
}; };
@ -298,6 +298,6 @@ exports.default = series(
// gulp watch // gulp watch
exports.watch = series( exports.watch = series(
exports.default, exports.default,
startServer, //startServer,
watchSource watchSource
); );

26
src/copy/Kontakt.html
View File

@ -13,9 +13,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="css/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 disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'> <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"> <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>
@ -31,17 +31,17 @@
FAVICON FAVICON
XXXXXXX XXXXXXX
--> -->
<link rel="apple-touch-icon" sizes="180x180" href="assets/img/favicon/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="img/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" href="assets/img/favicon/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="img/favicon/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="assets/img/favicon/favicon-16x16.png" sizes="16x16"> <link rel="icon" type="image/png" href="img/favicon/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="assets/img/favicon/manifest.json"> <link rel="manifest" href="img/favicon/manifest.json">
<link rel="mask-icon" href="assets/img/favicon/safari-pinned-tab.svg" color="#2b5797"> <link rel="mask-icon" href="img/favicon/safari-pinned-tab.svg" color="#2b5797">
<link rel="shortcut icon" href="assets/img/favicon/favicon.ico"> <link rel="shortcut icon" href="img/favicon/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Meritv&auml;rde"> <meta name="apple-mobile-web-app-title" content="Meritv&auml;rde">
<meta name="application-name" content="Meritv&auml;rde"> <meta name="application-name" content="Meritv&auml;rde">
<meta name="msapplication-TileColor" content="#2b5797"> <meta name="msapplication-TileColor" content="#2b5797">
<meta name="msapplication-TileImage" content="assets/img/favicon/mstile-144x144.png"> <meta name="msapplication-TileImage" content="img/favicon/mstile-144x144.png">
<meta name="msapplication-config" content="assets/img/favicon/browserconfig.xml"> <meta name="msapplication-config" content="img/favicon/browserconfig.xml">
<meta name="theme-color" content="#27233a"> <meta name="theme-color" content="#27233a">
@ -78,7 +78,7 @@ Information om själva sidan hittar du i "Om oss" rutan på startsidan.
</div> </div>
</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/smallScript.js"></script> <script defer src="js/smallScript.js"></script>
</body> </body>
</html> </html>

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

@ -19,12 +19,12 @@ echo "
<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='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 disabled class='lateLoader' rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'> <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'> <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>
<link rel='stylesheet' async href='assets/css/main.min.css'> <link rel='stylesheet' async href='css/main.min.css'>
<!--[if lt IE 9]> <!--[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>
@ -36,17 +36,17 @@ echo "
FAVICON FAVICON
XXXXXXX XXXXXXX
--> -->
<link rel='apple-touch-icon' sizes='180x180' href='assets/img/favicon/apple-touch-icon.png'> <link rel='apple-touch-icon' sizes='180x180' href='img/favicon/apple-touch-icon.png'>
<link rel='icon' type='image/png' href='assets/img/favicon/favicon-32x32.png' sizes='32x32'> <link rel='icon' type='image/png' href='img/favicon/favicon-32x32.png' sizes='32x32'>
<link rel='icon' type='image/png' href='assets/img/favicon/favicon-16x16.png' sizes='16x16'> <link rel='icon' type='image/png' href='img/favicon/favicon-16x16.png' sizes='16x16'>
<link rel='manifest' href='assets/img/favicon/manifest.json'> <link rel='manifest' href='img/favicon/manifest.json'>
<link rel='mask-icon' href='assets/img/favicon/safari-pinned-tab.svg' color='#2b5797'> <link rel='mask-icon' href='img/favicon/safari-pinned-tab.svg' color='#2b5797'>
<link rel='shortcut icon' href='assets/img/favicon/favicon.ico'> <link rel='shortcut icon' href='img/favicon/favicon.ico'>
<meta name='apple-mobile-web-app-title' content='Meritv&auml;rde'> <meta name='apple-mobile-web-app-title' content='Meritv&auml;rde'>
<meta name='application-name' content='Meritv&auml;rde'> <meta name='application-name' content='Meritv&auml;rde'>
<meta name='msapplication-TileColor' content='#2b5797'> <meta name='msapplication-TileColor' content='#2b5797'>
<meta name='msapplication-TileImage' content='assets/img/favicon/mstile-144x144.png'> <meta name='msapplication-TileImage' content='img/favicon/mstile-144x144.png'>
<meta name='msapplication-config' content='assets/img/favicon/browserconfig.xml'> <meta name='msapplication-config' content='img/favicon/browserconfig.xml'>
<meta name='theme-color' content='#27233a'> <meta name='theme-color' content='#27233a'>

8
src/copy/include/html_script_bottom_head.php
View File

@ -5,10 +5,10 @@ echo "
readfile("https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"); readfile("https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js");
readfile("https://code.getmdl.io/1.3.0/material.min.js"); readfile("https://code.getmdl.io/1.3.0/material.min.js");
readfile("https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/js/materialize.min.js"); readfile("https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/js/materialize.min.js");
readfile("assets/js/calcscript.js"); readfile("js/calcscript.js");
readfile("assets/js/changeall.js"); readfile("js/changeall.js");
readfile("assets/js/sparabetyg.js"); readfile("js/sparabetyg.js");
readfile("assets/js/smallScript.js"); readfile("js/smallScript.js");
echo " echo "
$(document).ready(function() { $(document).ready(function() {
$('select').material_select(); $('select').material_select();

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

@ -5,7 +5,7 @@ echo "
<div style='margin:30px;'> <div style='margin:30px;'>
<h1>Tips</h1><br> <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> <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='assets/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>
</div> </div>
<!--popup--> <!--popup-->