Solved merge conflicts.

This commit is contained in:
barthiv73098 2019-11-05 15:28:04 +01:00
commit 4999f47ea1
2 changed files with 29 additions and 13 deletions

View File

@ -1,27 +1,30 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en">
<html lang="de">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/index_styles.css"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="style.css">
<title>Quitt</title> <title>Document</title>
</head> </head>
<body> <body>
<nav> <nav>
<ul id="menu"> <ul id="menu">
<li class="menu_element"><a href="/index.html">Home</a></li> <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> <li class="menu_element"><a href="/index.html">Balance</a></li>
</ul> </ul>
</nav> </nav>
</body> <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> </html>

View File

@ -10,3 +10,16 @@
list-style-type: none; 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;
}