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

Test 3 #2

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Test 3 #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d0e3668
Testcommit
Sep 13, 2019
ccb6dc3
Test2
Sep 13, 2019
ad47f6c
Update style.css
linkanpro1 Sep 13, 2019
892313c
Test 4
Andreas-Hagstrom Sep 13, 2019
15ee52f
Merge branch 'master' of https://github.com/jenseneducation-linus-vik…
Andreas-Hagstrom Sep 13, 2019
c93d0dd
TEST5
linkanpro1 Sep 13, 2019
3f9e9aa
Merge branch 'master' of https://github.com/jenseneducation-linus-vik…
linkanpro1 Sep 13, 2019
614e410
Mappar
Andreas-Hagstrom Sep 13, 2019
f57b4d7
Mapp 2
Andreas-Hagstrom Sep 13, 2019
d951676
Färdig produkt
linkanpro1 Sep 18, 2019
a61dc31
Små ändringar
linkanpro1 Sep 18, 2019
a32e3bf
Sista smånändringar
linkanpro1 Sep 18, 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
Prev Previous commit
Next Next commit
Test2 
Test 2
  • Loading branch information
linuswik committed Sep 13, 2019
commit ccb6dc36a697b28455821751c4c02ce9ee51ec30
Binary file added Projektarbete/Images/Contact Page.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Projektarbete/Images/Main Page.pdf
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion index.html → Projektarbete/Kod/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
<link rel="stylesheet" href="/Projektarbete/Kod/style.css" />
<title>Contact</title>
</head>
<body>

Expand Down
36 changes: 36 additions & 0 deletions Projektarbete/Kod/mainpage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<link rel="stylesheet" href="/Projektarbete/Kod/style.css" />
<title>Main</title>
</head>
<body>
<div class="container">
<header>Header</header>
<nav>Nav</nav>
<div class="flex-container">
<section class="first">Section 1</section>
<section class="second">
<h2>Section 2</h2>
<p>
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Blanditiis
hic rerum sed dicta, mollitia aperiam nesciunt vel ducimus dolor
voluptatibus reiciendis odit quaerat facere nihil ipsa asperiores
alias deleniti fugiat. Lorem ipsum dolor sit amet consectetur
adipisicing elit. Illo minima voluptas distinctio inventore harum
corrupti est reiciendis doloribus ex expedita, magni omnis
similique! Qui quo et, excepturi itaque non. Lorem, ipsum dolor sit
amet consectetur adipisicing elit. Unde, id, iusto nemo magni
assumenda neque eaque ratione adipisci quia provident, architecto
ipsum fugiat omnis tempore. Hic beatae error nesciunt reprehenderit.
<nemo class="lorem"></nemo>
</p>
</section>
</div>
<footer>Footer</footer>
</div>
</body>
</html>
39 changes: 39 additions & 0 deletions Projektarbete/Kod/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
body {
font-family: "Gill Sans", "Gill Sans MT", Calibri, "Trebuchet MS", sans-serif;
}

.container {
width: 1000px;
margin: 0 auto;
}

header {
background: #cfc;
height: 50px;
}

nav {
background: rgb(247, 247, 231);
height: 100px;
}

.flex-container {
display: flex;
}

section.first {
background: #F33B1A;
width: 50%;
}

section.second {
background: #F16C1F;
width: 50%;
padding: 30px;
}

footer {
background: #ccf;
height: 100px;
}

Empty file removed style.css
View file
Open in desktop
Empty file.