You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2016/05/20 07:31:02 UTC
[4/9] incubator-mynewt-site git commit: Merge branch
'tableOfContents' of https://github.com/gj262/incubator-mynewt-site into
develop
Merge branch 'tableOfContents' of https://github.com/gj262/incubator-mynewt-site into develop
This closes #84
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/6fbd0f97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/6fbd0f97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/6fbd0f97
Branch: refs/heads/develop
Commit: 6fbd0f97a4244e26740b46c21903ac2cb12c97f5
Parents: 72f7898 bacaed5
Author: aditihilbert <ad...@runtime.io>
Authored: Thu May 19 15:58:09 2016 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Thu May 19 15:58:09 2016 -0700
----------------------------------------------------------------------
custom-theme/base.html | 11 +--
custom-theme/breadcrumbs.html | 2 +-
custom-theme/css/base.css | 91 -------------------
custom-theme/css/custom.css | 182 ++-----------------------------------
custom-theme/css/v2.css | 30 ++++++
custom-theme/nav.html | 23 ++---
custom-theme/nested_toc.html | 20 ++--
custom-theme/toc.html | 13 ++-
docs/extra.css | 22 -----
9 files changed, 70 insertions(+), 324 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/6fbd0f97/custom-theme/nav.html
----------------------------------------------------------------------
diff --cc custom-theme/nav.html
index 1651409,0ea86bc..17df657
--- a/custom-theme/nav.html
+++ b/custom-theme/nav.html
@@@ -19,25 -20,34 +20,25 @@@
<div class="navbar-collapse collapse">
<!-- Main navigation -->
<ul class="nav navbar-nav navbar-right">
- <li>
+ <li {{ active_nav(current_page, 'Home') }}>
<a href="/">Home</a>
</li>
- <li>
+ <li {{ active_nav(current_page, 'Quick Start', "important") }}>
<a href="/quick-start/">Quick Start</a>
</li>
- <li>
+ <li {{ active_nav(current_page, 'About') }}>
<a href="/about/">About</a>
</li>
- <li class="dropdown">
- <a href="/documentation/" class="dropdown-toggle" data-toggle="dropdown">Docs <b class="caret"></b></a>
- <ul class="dropdown-menu">
- {% for nav_item in nav %} {% if nav_item.title in ['Documentation', 'Mynewt OS Manual', 'Newt Tool Manual', 'Newt Manager Manual', 'Appendix'] %}
- <li {% if nav_item.active %}class="active" {% endif %}>
- <a href="{% if nav_item.url %}{{ nav_item.url }}{% else %}{{ nav_item.children[0].url }}{% endif %}">
- {% if nav_item.title == 'Documentation' %}Overview{% else %}{{ nav_item.title }}{% endif %}
- </a>
- </li>
- {% endif %} {% endfor %}
- </ul>
+ <li>
+ <a href="/os/introduction/">Documentation</a>
</li>
- <li>
+ <li {{ active_nav(current_page, 'Download') }}>
<a href="/download/">Download</a>
</li>
- <li>
+ <li {{ active_nav(current_page, 'Community') }}>
<a href="/community/">Community</a>
</li>
- <li>
+ <li {{ active_nav(current_page, 'Events') }}>
<a href="/events/">Events</a>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/6fbd0f97/custom-theme/toc.html
----------------------------------------------------------------------
diff --cc custom-theme/toc.html
index 0df8dc1,c62fe57..3f2238c
--- a/custom-theme/toc.html
+++ b/custom-theme/toc.html
@@@ -10,9 -9,9 +9,9 @@@
</form>
</div>
</div>
- <ul class="nav bs-sidenav">
+ <ul class="toc-nav">
{% for nav_item in nav %}
- {% if 'Manual' in nav_item.title or 'Guide' in nav_item.title or 'Appendix' in nav_item.title %}
+ {% if 'Documentation' in nav_item.title or 'Appendix' in nav_item.title %}
{% include 'nested_toc.html' %}
{% endif %}
{% endfor %}