Conflicts: layouts/_default/list.html

před 10 roky · 9bd0f367e2
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,15 +1,16 @@
 
				 {{ template "theme/partials/head.html" . }}
			
 
				 <body>
			
 
				 
			
 
				-{{ template "theme/partials/sidebar.html" . }}
			
 
				+  {{ template "theme/partials/sidebar.html" . }}
			
 
				 
			
 
				-    <div class="content container">
			
 
				-  <ul class="posts">
			
 
				-      {{ range .Data.Pages }}
			
 
				-      <li><span><a href="{{ .Permalink }}">{{ .Title }}</a><time class="pull-right post-list">{{ .Date.Format "Mon, Jan 2, 2006" }}</h4></time></span></span></li>
			
 
				-      {{ end }}
			
 
				-  </ul>
			
 
				-    </div>
			
 
				-
			
 
				-  </body>
			
 
				+  <div class="content container">
			
 
				+    <ul class="posts">
			
 
				+        {{ range .Data.Pages }}
			
 
				+        <li>
			
 
				+          <span><a href="{{ .Permalink }}">{{ .Title }}</a> <time class="pull-right post-list">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span>
			
 
				+        </li>
			
 
				+        {{ end }}
			
 
				+    </ul>
			
 
				+  </div>
			
 
				+</body>
			
 
				 </html>