Merge branch 'master' into kushs-idea

This commit is contained in:
madmaurice 2016-10-25 18:22:08 +00:00
commit ee396bf328
2 changed files with 7 additions and 7 deletions

View file

View file

@ -13,7 +13,7 @@
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/foundation.css">
<link rel="stylesheet" href="css/index.css">
<script src="js/vendor/modernizr.js"></script>
<!-- <script src="js/vendor/modernizr.js"></script> -->
</head>
<body>
@ -37,13 +37,13 @@
<div class="columns small-12 title">New post style</div>
</div>
<div class="row info">
<div class="column medium-4 text-left">
<div class="column medium-4 medium-text-left">
24. Dezember 2016
</div>
<div class="column medium-4 text-center">
<div class="column medium-4 medium-text-center">
von <a href="#">Paul Wiehiessernoch</a>
</div>
<div class="column medium-4 text-right">
<div class="column medium-4 medium-text-right">
Tags: <a href="#">tag</a>, <a href="#">tag</a>, <a href="#">tag</a>, <a href="#">tag</a>
</div>
</div>
@ -121,16 +121,16 @@
<div class="whitebox footer">
<a href="#">Zom.bi</a>
/
Design by <a href="#">Ranomier</a> and <a href="#">madmaurice</a>
Design by <a href="#">bsod</a>, <a href="#">Ranomier</a> and <a href="#">madmaurice</a>
</div>
</div>
</div>
<!-- include before </body> tag -->
<script src="js/vendor/jquery.js"></script>
<!-- <script src="js/vendor/jquery.js"></script>
<script src="js/foundation.min.js"></script>
<script>
$(document).foundation();
</script>
</script> -->
</body>
</html>