release v1.0.0 #14

Merged
thefeli73 merged 63 commits from develop into master 2019-11-12 18:53:53 +01:00
5 changed files with 7 additions and 2 deletions
Showing only changes of commit c96acc1f86 - Show all commits

View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Ekonomi</title> <title>Ekonomi</title>
<meta name="keywords" content="Ekonomi,EkonomiProgrammet,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="Ekonomi,Ekonomiprogrammet,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";
?> ?>
@ -14,6 +14,7 @@ include "include/html_head.php";
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 class="bannerTitle animate-bottom">Ekonomi</h1> <h1 class="bannerTitle animate-bottom">Ekonomi</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Ekonomiprogrammet</h5>
<!-- 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>

View File

@ -14,6 +14,7 @@ include "include/html_head.php";
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 class="bannerTitle animate-bottom">Estet</h1> <h1 class="bannerTitle animate-bottom">Estet</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Estetiska programmet</h5>
<!-- 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>

View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Natur</title> <title>Natur</title>
<meta name="keywords" content="natur,Naturvetenskapliga,programmet,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="natur,Naturvetenskaps­programmet,Naturvetenskapliga,programmet,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";
?> ?>
@ -14,6 +14,7 @@ include "include/html_head.php";
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 class="bannerTitle animate-bottom">Natur</h1> <h1 class="bannerTitle animate-bottom">Natur</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Naturvetenskaps­programmet</h5>
<!-- 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>

View File

@ -14,6 +14,7 @@ include "include/html_head.php";
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 class="bannerTitle animate-bottom">Samhäll</h1> <h1 class="bannerTitle animate-bottom">Samhäll</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Samhällsvetenskapsprogrammet</h5>
<!-- 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>

View File

@ -14,6 +14,7 @@ include "include/html_head.php";
<header class="parallaxHeader" id="pageContent"> <header class="parallaxHeader" id="pageContent">
<h1 class="bannerTitle animate-bottom">Teknik</h1> <h1 class="bannerTitle animate-bottom">Teknik</h1>
<h5 class="bannerTitle textCenter animate-bottom" style="background-color:unset;">Meritkalkylatorn för Teknikprogrammet</h5>
<!-- 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>