Solved merge conflicts.

List order horizontal.
2019-11-05 15:28:04 +01:00 · 2019-11-05 15:25:37 +01:00
2 changed files with 5 additions and 3 deletions
--- a/index.html
+++ b/index.html
@ -9,14 +9,14 @@
    <title>Document</title>
 </head>
 <body>
+
    <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">
@ -25,5 +25,6 @@
            <div class="box"></div>
        </div>
    </div>
+    
 </body>
 </html>
--- a/index_styles.css
+++ b/index_styles.css
@ -1,7 +1,8 @@
 .menu_element {
    background-color: orangered;
-    width: 50px;
    display: inline;
+    font-size: 400%;
+    margin: 0.8rem;
    
 }
Author	SHA1	Message	Date
barthiv73098	4999f47ea1	Solved merge conflicts.	2019-11-05 15:28:04 +01:00
barthiv73098	099f68305d	List order horizontal.	2019-11-05 15:25:37 +01:00