bug fix
authorduong tam kien <tk@deveha.com>
Wed, 19 Jul 2017 16:47:41 +0200
changeset 122 964633aa5d45
parent 121 21ac67ebf9e7
child 123 6542f93cdc0d
bug fix
design/_includes/notes.html
design/index.html
--- a/design/_includes/notes.html	Tue Jul 18 18:15:51 2017 +0200
+++ b/design/_includes/notes.html	Wed Jul 19 16:47:41 2017 +0200
@@ -26,7 +26,6 @@
 
 	<div class="col col-6 content">
 		{{ note | markdownify }}
-
 	</div>
 
 	{% if include.margins=="side" %}
@@ -34,7 +33,6 @@
 		{{ note | truncate: "100" | markdownify }}
 	</div>
 	{% endif %}
-</div>
 
 
 {% if include.margins=="bottom" %}
@@ -45,3 +43,8 @@
 {% endif %}
 </div>
 {% endfor %}
+
+
+</div>
+
+
--- a/design/index.html	Tue Jul 18 18:15:51 2017 +0200
+++ b/design/index.html	Wed Jul 19 16:47:41 2017 +0200
@@ -1,31 +1,17 @@
----
 ---
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
-
-		<script src="https://use.fontawesome.com/fb0eb75d4e.js"></script>
-
-
-	<link rel="stylesheet" href="/css/main.css" />
-
-  </head>
-  <body>
+layout: default
+---
    
    {% include nav.html %}
 
+	<!--
 	<div id="session">
 		{% include notes.list.html %}
 	</div>
-	
+	-->
+
 	<div id="notes" class="container">
-	   {% include notes.html %}	
+	   {% include notes.html margins="side" %}	
 	</div>
 
 	<div id="editor" class="fixed-bottom">
@@ -33,10 +19,3 @@
 			{% include zone.edit.html %}
 		</div>
 	</div>
-
-    <!-- jQuery first, then Tether, then Bootstrap JS. -->
-    <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
-  </body>
-</html>