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 +14623 -27
8 changed files with 14623 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3fb093c836 - Show all commits

4
src/Kontakt.html
View File

@ -77,8 +77,8 @@ Information om själva sidan hittar du i "Om oss" rutan på startsidan.
</content> </content>
</div> </div>
</header> </header>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <script src="/js/jquery.js"></script>
<script defer src="/js/material.min.js"></script> <script defer src="/js/material.js"></script>
<script defer src="/js/smallScript.js"></script> <script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>

16
src/include/html_script_bottom_head.php
View File

@ -1,15 +1,13 @@
<?php <?php
echo " echo "
<script src='/js/jquery.js'></script>
<script src='/js/material.js'></script>
<script src='/js/materialize.js'></script>
<script defer src='/js/calcscript.js'></script>
<script defer src='/js/changeall.js'></script>
<script defer src='/js/sparabetyg.js'></script>
<script defer src='/js/smallScript.js'></script>
<script defer> <script defer>
";
readfile("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.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("js/calcscript.js");
readfile("js/changeall.js");
readfile("js/sparabetyg.js");
readfile("js/smallScript.js");
echo "
$(document).ready(function() { $(document).ready(function() {
laddaBetyg(); laddaBetyg();
$('select').material_select(); $('select').material_select();

4
src/index.html
View File

@ -138,8 +138,8 @@ När jag började informera mig om Universiteter, antagningspoäng och meritvär
</div> </div>
</header> </header>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <script src="/js/jquery.js"></script>
<script defer src="/js/material.min.js"></script> <script defer src="/js/material.js"></script>
<script defer src="/js/softscrollscript.js"></script> <script defer src="/js/softscrollscript.js"></script>
<script defer src="/js/smallScript.js"></script> <script defer src="/js/smallScript.js"></script>
</body> </body>

10598
src/js/jquery.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

3996
src/js/material.js Normal file
View File

File diff suppressed because it is too large Load Diff

10
src/js/material.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
src/js/materialize.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

12
src/sw.js
View File

@ -21,11 +21,15 @@ self.addEventListener('install', function(e) {
'/img/favicon/favicon-32x32.png', '/img/favicon/favicon-32x32.png',
'/img/favicon/favicon-16x16.png', '/img/favicon/favicon-16x16.png',
'/img/favicon/favicon.ico', '/img/favicon/favicon.ico',
'/js/softscrollscript.js', '/js/calcscript.js',
'/js/material.min.js', '/js/changeall.js',
'/js/smallScript.js', '/js/jquery.js',
'/js/material.js',
'/js/materialize.js',
'/js/modernizer-webp.js', '/js/modernizer-webp.js',
'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js', '/js/smallScript.js',
'/js/softscrollscript.js',
'/js/sparabetyg.js',
'https://fonts.googleapis.com/icon?family=Material+Icons', 'https://fonts.googleapis.com/icon?family=Material+Icons',
'https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2', 'https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2',
'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Regular.woff2', 'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Regular.woff2',