Solved merge conflicts.
This commit is contained in:
commit
4999f47ea1
29
index.html
29
index.html
@ -1,27 +1,30 @@
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html lang="de">
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link rel="stylesheet" href="/index_styles.css">
|
||||
|
||||
<title>Quitt</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge">
|
||||
<link rel="stylesheet" href="style.css">
|
||||
<title>Document</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<nav>
|
||||
<ul id="menu">
|
||||
<li class="menu_element"><a href="/index.html">Home</a></li>
|
||||
<nav>
|
||||
<ul id="menu">
|
||||
<li class="menu_element"><a class="menu_element" href="/index.html">Home</a></li>
|
||||
<li class="menu_element"><a href="/index.html">Balance</a></li>
|
||||
|
||||
|
||||
</ul>
|
||||
|
||||
</nav>
|
||||
|
||||
<div class="balance-list">
|
||||
<h1>Umsätze</h1>
|
||||
<div class="grid-wrapper">
|
||||
<div class="box"></div>
|
||||
<div class="box"></div>
|
||||
<div class="box"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
@ -9,4 +9,17 @@
|
||||
#menu {
|
||||
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
|
||||
.grid-wrapper {
|
||||
display: grid;
|
||||
padding: 4rem 4rem 0 4rem;
|
||||
grid-template-columns: 1fr;
|
||||
grid-template-rows: 100px 100px 100px;
|
||||
grid-gap: 10px;
|
||||
}
|
||||
|
||||
.box {
|
||||
background-color: grey;
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user