wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-15 12:55:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Kim Gardner
2018-03-13 19:29:14 -04:00
parent 940185d9b6 60c4f56132
commit 8dfa9de3f8
41 changed files with 805 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/themes/coral/layout/partial/sidebar.swig
Vendored
+16 -10
View File
@@ -7,16 +7,22 @@
</a>
<ul class="sidebar__list">
{% for item in config.sidebar.side %}
<li class="sidebar__section{% for item in item.children %}{% if is_current(item.url) %} active toggled{% endif %}{% endfor %}">
<a href="#" class="sidebar__header">{{ item.title }}</a>
<ul class="sidebar__links">
{% for item in item.children %}
<li class="{% if is_current(item.url) %}active{% endif %}">
<a href="{% if !is_current(item.url) %}{{ url_for(item.url) }}{% else %}#{% endif %}">{{ item.title }}</a>
</li>
{% endfor %}
</ul>
</li>
{% if item.url %}
<li class="sidebar__section{% if is_current(item.url) %} active toggled{% endif %}">
<a href="{{ url_for(item.url) }}" class="sidebar__header sidebar__header__link">{{ item.title }}</a>
</li>
{% else %}
<li class="sidebar__section{% for item in item.children %}{% if is_current(item.url) %} active toggled{% endif %}{% endfor %}">
<a href="#" class="sidebar__header">{{ item.title }}</a>
<ul class="sidebar__links">
{% for item in item.children %}
<li class="{% if is_current(item.url) %}active{% endif %}">
<a href="{% if !is_current(item.url) %}{{ url_for(item.url) }}{% else %}#{% endif %}">{{ item.title }}</a>
</li>
{% endfor %}
</ul>
</li>
{% endif %}
{% endfor %}
</ul>
docs/themes/coral/source/js/main.js
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ $(document).ready(function() {
});
// Setup the menu controls.
$('a.sidebar__header').on('click', function(e) {
$('a.sidebar__header:not(.sidebar__header__link)').on('click', function(e) {
e.preventDefault();
$('.sidebar__section.toggled').removeClass('toggled');
$(this)