Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.DS_Store
#	css/styles.css
This commit is contained in:
scotty
2016-02-10 08:47:25 -08:00
28 changed files with 188 additions and 1443 deletions
BIN
View File
Binary file not shown.
+6 -45
View File
@@ -1,45 +1,6 @@
<ul {% if subsection %}style="display: none; opacity: 0; margin-left: 15px;"{% endif %}>
{% for item in tree %}
{% if item.status %}
{% capture statusHTML %} <sup style="color: red">{{item.status}}</sup>{% endcapture %}
{% else %}
{% assign statusHTML = "" %}
{% endif %}
{% if item.section %}
{% capture sectionHTML %}<a class="tlw-control tlw-collapsed"></a>{% endcapture %}
{% else %}
{% assign sectionHTML = "" %}
{% endif %}
{% if item.path %}
{% if page.url | remove: ".html" | remove "index" == item.path %}
{% capture tocItemColor %}style="color:red;"{% endcapture %}
{% else %}
{% capture tocItemColor %}{% endcapture %}
{% endif %}
<li {{ tocItemColor }}>{{ sectionHTML }}<a href="{{ item.path }}" title="{{ item.title }}" data-title="{{ item.title }} - {{ item.path }}"><span>{{ item.title }} {{ statusHTML }}</span></a></li>
{% else %}
{% if item.include %}
{% assign tree = site.data[item.include].toc %}
{% assign subsection=false %}
{% include tree.html %}
{% else %}
<li>{{ sectionHTML }}<span class="tlw-title tlw-control-title" data-title="{{ item.title }}">{{ item.title }}{{ statusHTML }}</span></li>
{% endif %}
{% endif %}
{% if item.break %}
<hr>
{% endif %}
{% if item.section %}
{% assign tree = item.section %}
{% assign subsection=true %}
{% include tree.html %}
{% endif %}
{% endfor %}
</ul>
{% for item in tree %}{% if item.section %}
<div class="item" data-title="{{ item.title }}">
<div class="container">{% assign tree = item.section %}{% include tree.html %}
</div>
</div>{% else %}
<a class="item" data-title="{{ item.title }}" href="{{ item.path }}" ></a>{% endif %}{% endfor %}