some merge corrections

ktali · Sep 30, 2018 · 0cc21d3 · 0cc21d3
1 parent 886fb2f
commit 0cc21d3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/main/resources/static/css/navbar.css b/src/main/resources/static/css/navbar.css
@@ -5,4 +5,9 @@
 nav {
     max-width: 1000px;
     margin: auto;
+}
+
+#maku {
+    display: none;
+    margin: auto;
 }
diff --git a/src/main/resources/static/img/maku.jpg b/src/main/resources/static/img/maku.jpg
diff --git a/src/main/resources/static/js/index.js b/src/main/resources/static/js/index.js
@@ -1,7 +1,7 @@
 $(document).ready(function () {
-
+    $('#maku').hide();
     $("#test").on('click', function() {
-        $('#rakendus').toggle();
+        $('#maku').toggle();
     });
 
 });
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
@@ -8,4 +8,7 @@
         <a role="button" class="btn btn-outline-secondary" href="/login">login</a>
     </div>
 </nav>
+<div class="container-fluid">
+<img th:src="@{/img/maku.jpg}" alt="magnar vares" id="maku">
+</div>
 </html>