Fix merge conflict
This commit is contained in:
		
					parent
					
						
							
								d73651fc6e
							
						
					
				
			
			
				commit
				
					
						6f7327f459
					
				
			
		
					 1 changed files with 10 additions and 16 deletions
				
			
		
							
								
								
									
										26
									
								
								archive.html
									
										
									
									
									
								
							
							
						
						
									
										26
									
								
								archive.html
									
										
									
									
									
								
							|  | @ -1,30 +1,24 @@ | |||
| --- | ||||
| layout: default | ||||
| title: "Blog Archive" | ||||
| teaser: "Check out all blog posts in my blog archive. Click on a headline to read the teaser." | ||||
| teaser: "All posts, organized by year." | ||||
| breadcrumb: true | ||||
| image: | ||||
|    header: header_unsplash_8.jpg | ||||
| permalink: "archive/" | ||||
| --- | ||||
| 
 | ||||
| <div id="blog-index" class="row"> | ||||
| 	<div class="small-12 columns t30"> | ||||
| 		<h1>{{ page.title }}</h1> | ||||
| 		{% if page.teaser %}<p class="teaser">{{ page.teaser }}</p>{% endif %} | ||||
| 
 | ||||
| 		<dl class="accordion" data-accordion> | ||||
| 			{% assign counter = 1 %} | ||||
| 			{% for post in site.posts limit:1000 reversed %} | ||||
| 			<dd class="accordion-navigation"> | ||||
| 			<a href="#panel{{ counter }}"><span class="iconfont"></span> {% if post.subheadline %}{{ post.subheadline }} › {% endif %}<strong>{{ post.title }}</strong></a> | ||||
| 				<div id="panel{{ counter }}" class="content"> | ||||
| 				        {{ post.excerpt | remove: '<p>' | remove: '</p>' }} | ||||
| <!--					{% if post.meta_description %}{{ post.meta_description | strip_html | escape }}{% elsif post.teaser %}{{ post.teaser | strip_html | escape }}{% endif %}--> | ||||
| 					<a href="{{ site.url }}{{ post.url }}" title="Read {{ post.title escape_once }}"><strong>{{ site.data.language.read_more }}</strong></a><br><br> | ||||
| 				</div> | ||||
| 			</dd> | ||||
| 			{% assign counter=counter | plus:1 %} | ||||
| 			<ul> | ||||
| 			{% for post in site.posts %} | ||||
|                             {% capture currentyear %}{{post.date | date: "%Y"}}{% endcapture %} | ||||
|                             {% if currentyear != year %} | ||||
|                                 <li><h4 style="display: inline;"><a href="{{ site.url }}/{{ currentyear }}/">{{ currentyear }}</a></h4></li> | ||||
|                                 {% capture year %}{{currentyear}}{% endcapture %} | ||||
|                             {% endif %} | ||||
| 			{% endfor %} | ||||
| 		</dl> | ||||
| 			</ul> | ||||
| 	</div><!-- /.small-12.columns --> | ||||
| </div><!-- /.row --> | ||||
|  |  | |||
		Reference in a new issue