Skip to content

Commit 001d938

Browse files
author
Marius Husevåg
committed
Content layout
1 parent 1b5cb8d commit 001d938

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

Web-Obl-1/css/main.css

+27
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,33 @@ html, body {
3636
height: 100%;
3737
}
3838

39+
.contentHeader {
40+
display: flex;
41+
height: 50px;
42+
align-items: center;
43+
justify-content: center;
44+
font-size: 14px;
45+
}
46+
47+
.contentInfo {
48+
display: flex;
49+
flex-direction: row;
50+
}
51+
52+
.contentText {
53+
display: flex;
54+
max-width: 66%;
55+
padding-left: 2%;
56+
padding-right: 2%;
57+
}
58+
59+
.contentTable {
60+
display: flex;
61+
padding-left: 2%;
62+
max-width: 33%;
63+
padding-right: 2%;
64+
}
65+
3966
.footer {
4067
height: 150px;
4168
margin-top: -200px;

Web-Obl-1/html/index.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
<div class="fifthHeaderElement">Viet</div>
1616
</div>
1717
<div class="content">
18-
Content
18+
<div class="contentHeader"><h2>Velkommen</h2></div>
19+
<div class="contentInfo">
20+
<div class="contentText">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
21+
<div class="contentTable">Skulle vi ha en tabell her?</div>
22+
</div>
23+
1924
</div>
2025
<div class="footer">
2126
Footer

0 commit comments

Comments
 (0)