_layouts/default.html in jekyll-theme-windows95-0.4.0 vs _layouts/default.html in jekyll-theme-windows95-0.4.2

- old
+ new

@@ -16,11 +16,11 @@ <link rel="icon" href="{{ "/assets/img/favicon.ico" | relative_url }}" type="image/x-icon"> <script src="{{ "/assets/js/highlight.pack.js" | relative_url }}"></script> <script>hljs.initHighlightingOnLoad();</script> </head> <body> - <div class="wrapper window"> + <div class="window" id="wrapper"> <div class="window_title"> <img src="{{ "/assets/img/mycomputer.png" | relative_url }}" /> {% if page.tag %} <h1>{{ site.title }} - {{ page.tag }}</h1> {% else %} @@ -40,41 +40,45 @@ </ul> <a href="{{ site.baseurl }}/all" ><img src="{{ "/assets/img/briefcase.png" | relative_url }}" />All</a> </li> </ul> </div> + {% if page.intro %} <!-- If at root, rendering index.md --> + <div class="intro"> + {{ content }} + </div> + {% else %} <div class="post_list"> {% unless page.date %} {% if page.title == '404...' %} <ul> {% for post in site.posts %} - <li><a href="{{ post.url }}" title="{{ post.title }}"><img src="{{ "/assets/img/file.ico" | relative_url }}" title="{{ post.title }}" />{{ post.title }}</a></li> + <li><a href="{{ post.url | relative_url }}#content" title="{{ post.title }}"><img src="{{ "/assets/img/file.ico" | relative_url }}" title="{{ post.title }}" />{{ post.title }}</a></li> {% endfor %} </ul> - {% else %} - <div class="intro"> - {{ content }} - </div> + {% else %} <!-- If page is showing a tag --> + {{ content }} {% endif %} - {% else %} + {% else %} <!-- If page is showing a post --> <ul> {% for post in site.posts %} - <li><a href="{{ post.url }}" title="{{ post.title }}"><img src="{{ "/assets/img/file.ico" | relative_url }}" title="{{ post.title }}" />{{ post.title }}</a></li> + <li><a href="{{ post.url | relative_url }}#content" title="{{ post.title }}"><img src="{{ "/assets/img/file.ico" | relative_url }}" title="{{ post.title }}" />{{ post.title }}</a></li> {% endfor %} </ul> {% endunless %} </div> + {% endif %} <div class="post_total"> {% if page.tag %} - <div class="left">{{ site.tags[page.tag] | size }} object(s)</div> + <div class="left">{{ site.tags[page.tag] | size }} post(s)</div> {% else %} - <div class="left">{{ site.posts | size }} object(s)</div> + <div class="left">{{ site.posts | size }} post(s)</div> {% endif %} <div class="right">&nbsp;</div> </div> </div> {% if page.title %} - <div class="content window"> + <div class="window" id="content"> <div class="window_title"> <img src="{{ "/assets/img/file.png" | relative_url }}" /> <h1>{{ page.title }}</h1> <a href="{{ site.baseurl }}/"><div class="btn"><span class="fa fa-times"></span></div></a> <div class="btn btn_max"><span class="fa fa-window-maximize"></span></div> \ No newline at end of file