Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pages update #5

Merged
merged 4 commits into from
Jul 22, 2019
Merged

pages update #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
147f1c1
1
Jasmijn-Vervloed Jul 13, 2019
91a80ec
1
Jasmijn-Vervloed Jul 13, 2019
a7f453a
Merge remote-tracking branch 'origin/homepage' into homepage
HugoCoin Jul 22, 2019
e985c65
hierzo
HugoCoin Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/WebtechHerkansing.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

248 changes: 248 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions HTML/Pages/Homepage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php
$titel = "eendenvrienden.nl";
include '../Partials/head.php';
include '../Partials/header.php';
?>
<body>
<header>
<h1>Eenden en vrienden</h1>
</header>

15 changes: 15 additions & 0 deletions HTML/Pages/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php
include '../Partials/head.php';
include '../Partials/header.php';
?>

<?php
include '../Partials/navbar.php';

?>


<?php
include '../Partials/footer.php';
include '../Partials/pageEnd.php';
?>
2 changes: 1 addition & 1 deletion HTML/Partials/footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<link rel="stylesheet" href="../CSS/footer.css">
<link rel="stylesheet" href="../../CSS/footer.css">
<div class="footer standardStyle flex_box flex_justify-stretch">
<div class="flex_item addPadding">
Heb je klachten? stop ze in je gat u bitch.
Expand Down
2 changes: 1 addition & 1 deletion HTML/Partials/head.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<title>Eenden Vrienden</title>
<meta name="description" content="Eenden Vrienden">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="../CSS/base.css">
<link rel="stylesheet" href="../../CSS/base.css">
</head>
<body>
4 changes: 2 additions & 2 deletions HTML/Partials/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<link rel="stylesheet" href="../CSS/header.css">
<link rel="stylesheet" href="../CSS/flex.css">
<link rel="stylesheet" href="../../CSS/header.css">
<link rel="stylesheet" href="../../CSS/flex.css">

<div class="header standardStyle flex_box flex_justify-stretch">
<div class="flex_item logo header-item">
Expand Down
2 changes: 1 addition & 1 deletion HTML/Partials/navbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<link rel="stylesheet" href="../CSS/navbar.css">
<link rel="stylesheet" href="../../CSS/navbar.css">
<div class="navbar-style alternativeStyle flex_box flex_justify-center">

<a href="" class="flex_item addPadding navbar-item-style">
Expand Down
15 changes: 0 additions & 15 deletions HTML/index.php
View file
Open in desktop

This file was deleted.