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

4
html/Ekonomi.php
View File

@ -12,10 +12,8 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Ekonomi</h1> <h1 class="bannerTitle animate-bottom">Ekonomi</h1>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>

2
html/Estet.php
View File

@ -13,7 +13,7 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Estet</h1> <h1 class="bannerTitle animate-bottom">Estet</h1>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>

2
html/Kontakt.html
View File

@ -54,7 +54,7 @@ HEADER
XXXXXX XXXXXX
--> -->
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Kontakt</h1> <h1 class="bannerTitle animate-bottom">Kontakt</h1>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>

2
html/Natur.php
View File

@ -13,7 +13,7 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Natur</h1> <h1 class="bannerTitle animate-bottom">Natur</h1>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>

2
html/Samhäll.php
View File

@ -13,7 +13,7 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Samhäll</h1> <h1 class="bannerTitle animate-bottom">Samhäll</h1>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>

4
html/Teknik.php
View File

@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Teknik</title> <title>Teknik</title>
<meta name="keywords" content="teknik,teknikprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program"> <meta name="keywords" content="teknik,teknikprogrammet,meritkollen,meritkalkylator,merit kalkylator,merit poäng,meritpoäng,kalkylator,meritvärde,njudungsgymnasiet,högskola,universitet,gymnasiet,högskolförberedande,program">
<?php <?php
include "include/html_head.php"; include "include/html_head.php";
@ -11,9 +12,8 @@ include "include/html_head.php";
<body> <body>
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 id="bannerTitle" class="textCenter animate-bottom">Teknik</h1> <h1 class="bannerTitle animate-bottom">Teknik</h1>
<!-- tillbaka knapp --> <!-- tillbaka knapp -->
<a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/"> <a class="backKnapp mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" href="/">
<i class="material-icons">home</i> <i class="material-icons">home</i>