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:30:59 UTC
[1/9] incubator-mynewt-site git commit: clean up table of contents
Repository: incubator-mynewt-site
Updated Branches:
refs/heads/develop b7c596d6e -> fea488dc5
clean up table of contents
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/a5571dc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/a5571dc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/a5571dc1
Branch: refs/heads/develop
Commit: a5571dc163f855c3ac1ba34e1063c12e9d5d3702
Parents: b7c596d
Author: Gavin Jefferies <ga...@runtime.io>
Authored: Thu May 19 15:20:18 2016 -0700
Committer: Gavin Jefferies <ga...@runtime.io>
Committed: Thu May 19 15:20:18 2016 -0700
----------------------------------------------------------------------
custom-theme/base.html | 11 +--
custom-theme/breadcrumbs.html | 2 +-
custom-theme/css/base.css | 91 --------------------
custom-theme/css/custom.css | 172 ++-----------------------------------
custom-theme/css/v2.css | 30 +++++++
custom-theme/nested_toc.html | 20 ++---
custom-theme/toc.html | 13 ++-
docs/extra.css | 22 -----
8 files changed, 55 insertions(+), 306 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/base.html
----------------------------------------------------------------------
diff --git a/custom-theme/base.html b/custom-theme/base.html
index 44dce79..905f4d2 100644
--- a/custom-theme/base.html
+++ b/custom-theme/base.html
@@ -69,19 +69,16 @@
{% elif page_title == 'Events' %}
{% include "events.html" %}
{% else %}
- <div class="row sm-extra-padding">
- <div id="docSidebar" class="col-md-3 bg-grey sidebar-container">{% include "toc.html" %}</div>
+ <div class="row">
+ <div class="col-md-3 v2-sidebar">{% include "toc.html" %}</div>
<div class="show-sidebar-container">
<button class="show-sidebar">Docs Menu</button>
</div>
- <div class="col-md-offset-3 col-md-9 documentation-viewer" role="main">
+ <div class="col-md-9" role="main">
<div class="row doc-header">
- <div class="col-sm-6">
- {% include 'manual_links.html' %}
- </div>
- <div class="col-sm-6">
+ <div class="col-sm-offset-6 col-sm-6">
{% include 'breadcrumbs.html' %}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/breadcrumbs.html
----------------------------------------------------------------------
diff --git a/custom-theme/breadcrumbs.html b/custom-theme/breadcrumbs.html
index 95df937..32c8476 100644
--- a/custom-theme/breadcrumbs.html
+++ b/custom-theme/breadcrumbs.html
@@ -1,5 +1,5 @@
<div role="navigation" aria-label="breadcrumbs navigation">
- <ul class="wy-breadcrumbs">
+ <ul class="wy-breadcrumbs pull-right">
<li><a href="/documentation/">Docs</a></li>
{% if current_page %}
{% for doc in current_page.ancestors %}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/css/base.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/base.css b/custom-theme/css/base.css
index 08eeb9a..f571a49 100644
--- a/custom-theme/css/base.css
+++ b/custom-theme/css/base.css
@@ -13,97 +13,6 @@ ul.nav li.main {
font-weight: bold;
}
-div.col-md-9 {
- padding-bottom: 100px;
-}
-
div.source-links {
float: right;
}
-
-/*
- * Side navigation
- *
- * Scrollspy and affixed enhanced navigation to highlight sections and secondary
- * sections of docs content.
- */
-
-/* By default it's not affixed in mobile views, so undo that */
-.bs-sidebar.affix {
- position: static;
-}
-
-.bs-sidebar.well {
- padding: 0;
-}
-
-/* First level of nav */
-.bs-sidenav {
- margin-top: 30px;
- margin-bottom: 30px;
- padding-top: 10px;
- padding-bottom: 10px;
- border-radius: 5px;
-}
-
-/* All levels of nav */
-.bs-sidebar .nav > li > a {
- display: block;
- padding: 5px 20px;
- z-index: 1;
-}
-.bs-sidebar .nav > li > a:hover,
-.bs-sidebar .nav > li > a:focus {
- text-decoration: none;
- border-right: 1px solid;
-}
-.bs-sidebar .nav > .active > a,
-.bs-sidebar .nav > .active:hover > a,
-.bs-sidebar .nav > .active:focus > a {
- font-weight: bold;
- background-color: transparent;
- border-right: 1px solid;
-}
-
-/* Nav: second level (shown on .active) */
-.bs-sidebar .nav .nav {
- display: none; /* Hide by default, but at >768px, show it */
- margin-bottom: 8px;
-}
-.bs-sidebar .nav .nav > li > a {
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 30px;
- font-size: 90%;
-}
-
-/* Show and affix the side nav when space allows it */
-@media (min-width: 992px) {
- .bs-sidebar .nav > .active > ul {
- display: block;
- }
- /* Widen the fixed sidebar */
- .bs-sidebar.affix,
- .bs-sidebar.affix-bottom {
- width: 213px;
- }
- .bs-sidebar.affix {
- position: fixed; /* Undo the static from mobile first approach */
- top: 80px;
- }
- .bs-sidebar.affix-bottom {
- position: absolute; /* Undo the static from mobile first approach */
- }
- .bs-sidebar.affix-bottom .bs-sidenav,
- .bs-sidebar.affix .bs-sidenav {
- margin-top: 0;
- margin-bottom: 0;
- }
-}
-@media (min-width: 1200px) {
- /* Widen the fixed sidebar again */
- .bs-sidebar.affix-bottom,
- .bs-sidebar.affix {
- width: 263px;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/css/custom.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/custom.css b/custom-theme/css/custom.css
index bed1a90..189d04f 100644
--- a/custom-theme/css/custom.css
+++ b/custom-theme/css/custom.css
@@ -1,9 +1,3 @@
-/*body * {
- font-size: 12pt;
- font-weight: 300;
- word-wrap: break-word;
-}*/
-
.content {
margin-bottom: 15px;
}
@@ -20,28 +14,6 @@
background-color: #959696;
}
-.main-banner h3 {
- font-size: 22px;
-}
-
-/*h1 {
- font-size: 28px;
- font-weight: 500;
- color: #42567E;
-}
-
-h2, h3 {
- color: #42567E;
- font-weight: 300;
-}*/
-
-hsp{
- color: #42567E;
- font-weight: 600;
- margin-top: 2px;
- margin-bottom: 2px;
-}
-
.navbar {
background-color: #42567E;
font-size: 12pt;
@@ -106,10 +78,6 @@ hsp{
@media (max-width: 992px) {
- .sm-extra-padding {
- padding: 20px;
- }
-
.sidebar-container {
display: none;
}
@@ -121,7 +89,6 @@ hsp{
.logo-container {
display: block;
- background-color: #F6F7F9;
position: absolute;
top: 0;
left: 20px;
@@ -138,10 +105,6 @@ hsp{
@media (min-width: 992px) {
- .main-banner img {
- width: 15%;
- }
-
.documentation-viewer {
padding: 1%;
}
@@ -160,32 +123,10 @@ hsp{
}
}
-.navbar-nav li {
- padding: 5px 10px;
-}
-
-.bs-sidebar a {
- color: #111 !important;
-}
-
-.navbar a {
- color: #fff !important;
-}
-
-.bs-sidebar a:hover,
-.navbar a:hover {
- text-decoration: underline !important;
-}
-
-.bs-sidebar {
- width: 100% !important;
- border-radius: 0;
- font-size: 14px;
-}
-
-.bs-sidebar li {
- background-color: #f6f7f9;
- margin-bottom: 0px;
+.sidebar-container {
+ padding-left: 0;
+ padding-right: 0;
+ background: #F6F7F9;
}
.documentation-viewer {
@@ -204,58 +145,19 @@ hsp{
color: #333;
}
-/*.row {
- margin-left: 0px;
- margin-right: 0px;
-}*/
-
.navbar {
margin-bottom: 0px;
}
-
.sidebar-top {
- background-color: #F6F7F9;
padding: 0px;
}
.logo-small {
display: block;
- margin: 10px auto 20px auto;
- max-width: 280px;
-}
-
-#search-input {
- background-color: #fff;
- box-shadow: none;
- border-radius: 0;
- -webkit-appearance: none;
-}
-
-#rtd-search-form input,
-#rtd-search-form button {
- border: 1px solid #BFBFBF;
-}
-
-#rtd-search-form input {
- border-right: 0;
- width: 80%;
- padding: 6px 10px;
- height: 44px;
- font-size: 16px;
-}
-
-#rtd-search-form button {
- background-color: #ffffff;
- border-left: 0;
- color: #42567E;
- font-size: 20px;
- width: 15%;
- height: 44px;
- margin-left: -10px;
- position: relative;
- top: 2px;
- padding: 6px 10px;
+ height: 150px;
+ margin-left: auto;
+ margin-right: auto;
}
.home .search-container {
@@ -304,17 +206,6 @@ footer .footnote {
margin: 0 auto;
}
-.main-banner {
- background: #F6F7F9;
- text-align: center;
- padding: 20px 20px 15px;
- /* margin-bottom: 40px; */
-}
-
-/*.home h2 {
- font-size: 13pt;
-}*/
-
.goal p {
max-width: 350px;
display: block;
@@ -415,18 +306,6 @@ footer .footnote {
text-decoration: none;
}
-.current-toc li {
- list-style-type: none;
- background: none;
- padding: 2px 0;
-}
-
-.sidebar-container {
- padding-left: 0;
- padding-right: 0;
- background: #F6F7F9;
-}
-
.navbar-default .navbar-toggle {
border: none;
}
@@ -622,43 +501,6 @@ code {
font-family: "Courier New";
}
-li.toctree-l3 {
- padding-left: 20px;
-}
-
-li.active {
- background-color: #F2853F !important;
-}
-
.doc-header .col-sm-6 {
padding-left: 0px;
}
-
-ul.nav-pills li.active a {
- background-color: #42567E;
-}
-
-.navbar ul.dropdown-menu {
- background-color: #42567E;
-}
-
-.navbar ul.dropdown-menu li.active {
- background-color: #F2853F;
-}
-
-.navbar ul.dropdown-menu li.active a {
- background-color: #F2853F;
- color: black !important;
-}
-
-.navbar ul.dropdown-menu li a:hover {
- background-color: #F2853F;
-}
-
-.navbar ul.dropdown-menu li:hover {
- background-color: #F2853F;
-}
-
-.navbar .nav .open>a, .navbar .nav .open>a:hover, .navbar .nav .open>a:focus {
- background-color: #42567E;
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/css/v2.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/v2.css b/custom-theme/css/v2.css
index 9ea21c7..928cffc 100644
--- a/custom-theme/css/v2.css
+++ b/custom-theme/css/v2.css
@@ -49,3 +49,33 @@
.v2-landing .updates img {
width: 100%;
}
+
+.v2-sidebar > div {
+ background-color: #F6F7F9;
+ padding-left: 15px;
+ padding-bottom: 15px;
+}
+
+.v2-sidebar .form-group {
+ margin-right: 15px;
+}
+
+.v2-sidebar ul.toc-nav {
+ list-style: none;
+ padding-left: 0;
+}
+
+.v2-sidebar .toc-nav ul {
+ list-style: none;
+ padding-left: 20px;
+}
+
+.v2-sidebar .toc-nav a {
+ display: block;
+ padding: 2px;
+}
+
+.v2-sidebar .toc-nav .active > a {
+ background-color: #eee;
+ border-right: 1px solid black;
+}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/nested_toc.html
----------------------------------------------------------------------
diff --git a/custom-theme/nested_toc.html b/custom-theme/nested_toc.html
index 037617e..9323766 100644
--- a/custom-theme/nested_toc.html
+++ b/custom-theme/nested_toc.html
@@ -1,28 +1,22 @@
{% if nav_item.children %}
{% set child=nav_item.children[0] %}
{% if child.title == "toc" %}
- <li {% if child.active %}class="active"{% endif %}><a href="{{ child.url }}">{{ nav_item.title }}</a></li>
+ <li {% if child.active %}class="active"{% endif %}><a href="{{ child.url }}">{{ nav_item.title }}</a>
{% else %}
<li><a href="{% include "child_url.html" %}">{{ nav_item.title }}</a>
{% endif %}
- {% if nav_item.active %}
- <ul class="current-toc">
+ {% if nav_item.active %}
+ <ul>
{% for nav_item in nav_item.children %}
{% if nav_item.title != "toc" %}
{% include "nested_toc.html" %}
{% endif %}
{% endfor %}
- </ul>
- {% endif %}
- </li>
-{% else %}
- {% if nav_item.active %}
- <li class="active">
- {{ nav_item.title }}
+ </ul>
+ {% endif %}
</li>
- {% else %}
- <li>
+{% else %}
+ <li {% if nav_item.active %}class="active"{% endif %}>
<a href="{{ nav_item.url }}">{{ nav_item.title }}</a>
</li>
- {% endif %}
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/toc.html
----------------------------------------------------------------------
diff --git a/custom-theme/toc.html b/custom-theme/toc.html
index f3b5c43..c62fe57 100644
--- a/custom-theme/toc.html
+++ b/custom-theme/toc.html
@@ -1,16 +1,15 @@
-<div class="bs-sidebar hidden-print" role="complementary">
- <div class="sidebar-top">
+<div class="hidden-print" role="complementary">
+ <div class="top">
<img class="hidden-xs hidden-sm logo-small" src="/img/logo.svg" alt="MyNewt" title="MyNewt">
- <div class="small" role="search">
- <form id ="rtd-search-form" class="wy-form" action="{{ base_url }}/search.html" method="get">
+ <div role="search">
+ <form id="rtd-search-form" class="wy-form" action="{{ base_url }}/search.html" method="get">
<div class="form-group">
- <input type="text" name="q" placeholder="Search documentation" />
- <button class="search-button" type="submit"><i class="fa fa-search"></i></button>
+ <input type="text" name="q" class="form-control" placeholder="Search documentation" />
</div>
</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 %}
{% include 'nested_toc.html' %}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/docs/extra.css
----------------------------------------------------------------------
diff --git a/docs/extra.css b/docs/extra.css
index 0653396..27164a3 100644
--- a/docs/extra.css
+++ b/docs/extra.css
@@ -1,25 +1,3 @@
-/*
- * Tweak the headers to better match RTD.
- */
-
-/*body {
- font-size: 100%;
-}
-
-
-h4, h5, h6 {
- color: black;
- font-weight: 300;
- text-decoration: underline;
-}
-
-hr {
- height: 4px;
- background-color:#42567E;
- color: #42567E;
- border: 0 none;
-}*/
-
/*
* Fix wrapping in the code highlighting
[2/9] incubator-mynewt-site git commit: clean up top nav
Posted by ad...@apache.org.
clean up top nav
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/bacaed54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/bacaed54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/bacaed54
Branch: refs/heads/develop
Commit: bacaed547bb8cbcf8ab05bf3ca270b9671c1d594
Parents: a5571dc
Author: Gavin Jefferies <ga...@runtime.io>
Authored: Thu May 19 15:49:58 2016 -0700
Committer: Gavin Jefferies <ga...@runtime.io>
Committed: Thu May 19 15:49:58 2016 -0700
----------------------------------------------------------------------
custom-theme/base.html | 2 +-
custom-theme/css/custom.css | 12 ++++--------
custom-theme/nav.html | 23 ++++++++++++-----------
3 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/bacaed54/custom-theme/base.html
----------------------------------------------------------------------
diff --git a/custom-theme/base.html b/custom-theme/base.html
index 905f4d2..04b6513 100644
--- a/custom-theme/base.html
+++ b/custom-theme/base.html
@@ -78,7 +78,7 @@
<div class="col-md-9" role="main">
<div class="row doc-header">
- <div class="col-sm-offset-6 col-sm-6">
+ <div class="col-sm-12">
{% include 'breadcrumbs.html' %}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/bacaed54/custom-theme/css/custom.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/custom.css b/custom-theme/css/custom.css
index 189d04f..b3a92d1 100644
--- a/custom-theme/css/custom.css
+++ b/custom-theme/css/custom.css
@@ -14,14 +14,6 @@
background-color: #959696;
}
-.navbar {
- background-color: #42567E;
- font-size: 12pt;
- font-weight: 300;
- border: 0;
- padding: none;
-}
-
.home .logo-container,
.Download .logo-container,
.Community .logo-container,
@@ -149,6 +141,10 @@
margin-bottom: 0px;
}
+.navbar li.important a {
+ color: #F2853F !important;
+}
+
.sidebar-top {
padding: 0px;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/bacaed54/custom-theme/nav.html
----------------------------------------------------------------------
diff --git a/custom-theme/nav.html b/custom-theme/nav.html
index dd590e6..0ea86bc 100644
--- a/custom-theme/nav.html
+++ b/custom-theme/nav.html
@@ -1,7 +1,8 @@
-<div id="navbar" class="navbar navbar-default navbar-fixed-top" role="navigation">
- <div class="logo-container">
- <img src="/img/logo.svg">
- </div>
+{% macro active_nav(page, title, classes) %}
+ class="{% if page and page.title == title %}active {% endif %}{{ classes }}"
+{% endmacro %}
+
+<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<!-- Collapsed navigation -->
<div class="navbar-header">
@@ -19,13 +20,13 @@
<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">
@@ -40,13 +41,13 @@
{% endif %} {% endfor %}
</ul>
</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>
@@ -68,4 +69,4 @@
</ul>
</div>
</div>
-</div>
+</nav>
[6/9] incubator-mynewt-site git commit: restore navbar color
Posted by ad...@apache.org.
restore navbar color
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/7108e2db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/7108e2db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/7108e2db
Branch: refs/heads/develop
Commit: 7108e2dbbe8ccc83975413fc7650cf31c9663bb8
Parents: 73c4e64
Author: Gavin Jefferies <ga...@runtime.io>
Authored: Thu May 19 16:21:40 2016 -0700
Committer: Gavin Jefferies <ga...@runtime.io>
Committed: Thu May 19 16:21:40 2016 -0700
----------------------------------------------------------------------
custom-theme/css/custom.css | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/7108e2db/custom-theme/css/custom.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/custom.css b/custom-theme/css/custom.css
index b3a92d1..c902ac4 100644
--- a/custom-theme/css/custom.css
+++ b/custom-theme/css/custom.css
@@ -138,13 +138,17 @@
}
.navbar {
- margin-bottom: 0px;
+ background-color: #42567E;
}
.navbar li.important a {
color: #F2853F !important;
}
+.navbar-inverse .navbar-nav>.active>a, .navbar-inverse .navbar-nav>.active>a:hover, .navbar-inverse .navbar-nav>.active>a:focus {
+ background-color: #293D65;
+}
+
.sidebar-top {
padding: 0px;
}
[4/9] incubator-mynewt-site git commit: Merge branch
'tableOfContents' of https://github.com/gj262/incubator-mynewt-site into
develop
Posted by ad...@apache.org.
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 %}
[5/9] incubator-mynewt-site git commit: fix download button click
Posted by ad...@apache.org.
fix download button click
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/73c4e648
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/73c4e648
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/73c4e648
Branch: refs/heads/develop
Commit: 73c4e64839cd638b9cbb6239b934d955dddbbb4a
Parents: bacaed5
Author: Gavin Jefferies <ga...@runtime.io>
Authored: Thu May 19 16:15:11 2016 -0700
Committer: Gavin Jefferies <ga...@runtime.io>
Committed: Thu May 19 16:15:11 2016 -0700
----------------------------------------------------------------------
custom-theme/css/base.css | 7 -------
custom-theme/main-banner.html | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/73c4e648/custom-theme/css/base.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/base.css b/custom-theme/css/base.css
index f571a49..7e4d912 100644
--- a/custom-theme/css/base.css
+++ b/custom-theme/css/base.css
@@ -2,13 +2,6 @@ body {
padding-top: 70px;
}
-h1[id]:before, h2[id]:before, h3[id]:before, h4[id]:before, h5[id]:before, h6[id]:before {
- content: "";
- display: block;
- margin-top: -75px;
- height: 75px;
-}
-
ul.nav li.main {
font-weight: bold;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/73c4e648/custom-theme/main-banner.html
----------------------------------------------------------------------
diff --git a/custom-theme/main-banner.html b/custom-theme/main-banner.html
index ca48a88..86428a4 100644
--- a/custom-theme/main-banner.html
+++ b/custom-theme/main-banner.html
@@ -8,7 +8,7 @@
--><div class="col-md-4 v2-vcenter">
<div class="news bg-orange text-center">
<h4>Pre-GA release version of Mynewt 0.8.0 with BLE 4.2 support is available now. </h4>
- <a class="btn btn-default" href="http://mynewt.apache.org/download"> Download! </a>
+ <a href="/download/">Download!</a>
</div>
</div>
[3/9] incubator-mynewt-site git commit: First cut at flattening the
docs hierarchy
Posted by ad...@apache.org.
First cut at flattening the docs hierarchy
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/72f78987
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/72f78987
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/72f78987
Branch: refs/heads/develop
Commit: 72f78987c2b3bd8934c4d8bea5f65256e8df48b6
Parents: b7c596d
Author: aditihilbert <ad...@runtime.io>
Authored: Thu May 19 15:57:46 2016 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Thu May 19 15:57:46 2016 -0700
----------------------------------------------------------------------
custom-theme/documentation.html | 16 +------
custom-theme/nav.html | 13 +-----
custom-theme/toc.html | 2 +-
docs/os/get_started/introduction.md | 62 ---------------------------
docs/os/introduction.md | 62 +++++++++++++++++++++++++++
mkdocs.yml | 72 +++++++++++++++-----------------
6 files changed, 100 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/72f78987/custom-theme/documentation.html
----------------------------------------------------------------------
diff --git a/custom-theme/documentation.html b/custom-theme/documentation.html
index 43ff6fc..1261141 100644
--- a/custom-theme/documentation.html
+++ b/custom-theme/documentation.html
@@ -9,25 +9,11 @@
</div>
</div>
-<div class="bg-orange padded event-callout">
- <div class="container">
- <div class="row">
- <div class="column col-sm-12 col-md-offset-3 col-md-6 search-container text-center">
- <form id ="rtd-search-form" class="wy-form" action="{{ base_url }}/search.html" method="get">
- <div class="form-group">
- <input id="search-input" type="text" name="q" placeholder="Search documentation" />
- <button class="search-button" type="submit"><i class="fa fa-search"></i></button>
- </div>
- </form>
- </div>
- </div>
- </div>
-</div>
<div class="container small-no-padding">
<div class="row">
{% 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 %}
<div class="col-md-3 doc-section">
<div class="outline-title">{{ nav_item.title }}</div>
<p>{{ config.extra.chapters[nav_item.title] }}</p>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/72f78987/custom-theme/nav.html
----------------------------------------------------------------------
diff --git a/custom-theme/nav.html b/custom-theme/nav.html
index dd590e6..1651409 100644
--- a/custom-theme/nav.html
+++ b/custom-theme/nav.html
@@ -28,17 +28,8 @@
<li>
<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>
<a href="/download/">Download</a>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/72f78987/custom-theme/toc.html
----------------------------------------------------------------------
diff --git a/custom-theme/toc.html b/custom-theme/toc.html
index f3b5c43..0df8dc1 100644
--- a/custom-theme/toc.html
+++ b/custom-theme/toc.html
@@ -12,7 +12,7 @@
</div>
<ul class="nav bs-sidenav">
{% 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 %}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/72f78987/docs/os/get_started/introduction.md
----------------------------------------------------------------------
diff --git a/docs/os/get_started/introduction.md b/docs/os/get_started/introduction.md
deleted file mode 100644
index 09240e5..0000000
--- a/docs/os/get_started/introduction.md
+++ /dev/null
@@ -1,62 +0,0 @@
-## Introduction
-
-### Welcome to Apache Mynewt
-
-Apache Mynewt is an operating system that makes it easy to develop
-applications for microcontroller environments where power and cost
-are driving factors. Examples of these devices are connected locks,
-lights, and wearables.
-
-Microcontroller environments have a number of characteristics that
-makes the operating system requirements for them unique:
-
-* Low memory footprint: memory on these systems range from
-8-16KB (on the low end) to 16MB (on the high end).
-
-* Reduced code size: code often runs out of flash, and total available code size ranges from 64-128KB to 16-32MB.
-
-* Low processing speed: processor speeds vary from 10-12MHz to 160-200MHz.
-
-* Low power operation: devices operate in mostly sleeping mode, in order to conserve
-battery power and maximize power usage.
-
-As more and more devices get connected, these interconnected devices perform complex tasks. To
-perform these tasks, you need low-level operational functionality built into the operating system.
-Typically, connected devices built with these microcontrollers perform a myriad of functions:
-
-* Networking Stacks: Bluetooth Low Energy and Thread
-
-* Peripherals: PWM to drive motors, ADCs to measure sensor data, and RTCs
-to keep time.
-
-* Scheduled Processing: actions must happen on a calendared or periodic basis.
-
-Apache Mynewt accomplishes all the above easily, by providing a complete
-operating system for constrained devices, including:
-
-* A fully open-source Bluetooth Low Energy stack with both Host and
-Controller implementations.
-
-* A pre-emptive, multi-tasking Real Time operating system kernel
-
-* A Hardware Abstraction Layer (HAL) that abstracts the MCU's
-peripheral functions, allowing developers to easily write cross-platform
-code.
-
-<br>
-
-### Newt ###
-In order to provide all this functionality, and operate in an
-extremely low resource environment, Mynewt provides a very fine-grained source
-package management and build system tool, called *newt*.
-
-You can install and build *newt* for [Linux](../../newt/install/newt_linux.md) or [Mac](../../newt/install/newt_mac.md).
-
-<br>
-
-### Build your first Mynewt App with Newt ###
-
-With the introductions out of the way, now is a good time to [get
-started](project_create/) with your first Mynewt application.
-
-Happy Hacking!
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/72f78987/docs/os/introduction.md
----------------------------------------------------------------------
diff --git a/docs/os/introduction.md b/docs/os/introduction.md
new file mode 100644
index 0000000..09240e5
--- /dev/null
+++ b/docs/os/introduction.md
@@ -0,0 +1,62 @@
+## Introduction
+
+### Welcome to Apache Mynewt
+
+Apache Mynewt is an operating system that makes it easy to develop
+applications for microcontroller environments where power and cost
+are driving factors. Examples of these devices are connected locks,
+lights, and wearables.
+
+Microcontroller environments have a number of characteristics that
+makes the operating system requirements for them unique:
+
+* Low memory footprint: memory on these systems range from
+8-16KB (on the low end) to 16MB (on the high end).
+
+* Reduced code size: code often runs out of flash, and total available code size ranges from 64-128KB to 16-32MB.
+
+* Low processing speed: processor speeds vary from 10-12MHz to 160-200MHz.
+
+* Low power operation: devices operate in mostly sleeping mode, in order to conserve
+battery power and maximize power usage.
+
+As more and more devices get connected, these interconnected devices perform complex tasks. To
+perform these tasks, you need low-level operational functionality built into the operating system.
+Typically, connected devices built with these microcontrollers perform a myriad of functions:
+
+* Networking Stacks: Bluetooth Low Energy and Thread
+
+* Peripherals: PWM to drive motors, ADCs to measure sensor data, and RTCs
+to keep time.
+
+* Scheduled Processing: actions must happen on a calendared or periodic basis.
+
+Apache Mynewt accomplishes all the above easily, by providing a complete
+operating system for constrained devices, including:
+
+* A fully open-source Bluetooth Low Energy stack with both Host and
+Controller implementations.
+
+* A pre-emptive, multi-tasking Real Time operating system kernel
+
+* A Hardware Abstraction Layer (HAL) that abstracts the MCU's
+peripheral functions, allowing developers to easily write cross-platform
+code.
+
+<br>
+
+### Newt ###
+In order to provide all this functionality, and operate in an
+extremely low resource environment, Mynewt provides a very fine-grained source
+package management and build system tool, called *newt*.
+
+You can install and build *newt* for [Linux](../../newt/install/newt_linux.md) or [Mac](../../newt/install/newt_mac.md).
+
+<br>
+
+### Build your first Mynewt App with Newt ###
+
+With the introductions out of the way, now is a good time to [get
+started](project_create/) with your first Mynewt application.
+
+Happy Hacking!
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/72f78987/mkdocs.yml
----------------------------------------------------------------------
diff --git a/mkdocs.yml b/mkdocs.yml
index a3c9b0a..2d8ff29 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -7,20 +7,21 @@ pages:
- Home: 'index.md'
- Quick Start: 'quick-start.md'
- About: 'about.md'
-- Documentation: 'documentation.md'
- Download: 'download.md'
- Community: 'community.md'
- Events: 'events.md'
-- Mynewt OS Manual:
- - Introduction: 'os/get_started/introduction.md'
- - Quick Start:
+- Mynewt Documentation:
+ - toc: 'os/introduction.md'
+ - Basic Setup:
- toc: 'os/get_started/get_started.md'
- - 'All-in-one Docker Container': 'os/get_started/docker.md'
- - 'Install Native Tools': 'os/get_started/native_tools.md'
+ - 'Option 1, Single Docker Container': 'os/get_started/docker.md'
+ - 'Option 2, Native installs':
+ - toc: 'os/get_started/native_tools.md'
+ - 'Install Newt on Mac': 'newt/install/newt_mac.md'
+ - 'Install Newt on Linux': 'newt/install/newt_linux.md'
+ - 'Install Cross Tools for ARM': 'os/get_started/cross_tools.md'
- 'Create Your First Project': 'os/get_started/project_create.md'
- - 'Install Cross Tools for ARM': 'os/get_started/cross_tools.md'
- - 'Concepts':
- - toc: 'os/get_started/vocabulary.md'
+ - Concepts: 'os/get_started/vocabulary.md'
- Tutorials:
- toc: 'os/tutorials/tutorials.md'
- 'Blinky on Arduino Zero': 'os/tutorials/arduino_zero.md'
@@ -58,7 +59,7 @@ pages:
- 'os_sched': 'os/core_os/context_switch/os_sched.md'
- 'os_arch_ctx_sw': 'os/core_os/context_switch/os_arch_ctx_sw.md'
- 'os_sched_ctx_sw_hook': 'os/core_os/context_switch/os_sched_ctx_sw_hook.md'
- - 'os_sched_get_current_task': 'os/core_os/context_switch/os_sched_get_current_task.md'
+ - 'os_/sched_get_current_task': 'os/core_os/context_switch/os_sched_get_current_task.md'
- 'os_sched_insert': 'os/core_os/context_switch/os_sched_insert.md'
- 'os_sched_next_task': 'os/core_os/context_switch/os_sched_next_task.md'
- 'os_sched_os_timer_exp': 'os/core_os/context_switch/os_sched_os_timer_exp.md'
@@ -332,34 +333,29 @@ pages:
- 'GAP in bletiny': 'network/ble/bletiny/bletiny_GAP.md'
- 'GATT in bletiny': 'network/ble/bletiny/bletiny_GATT.md'
- 'Advertisement Data Fields': 'network/ble/bletiny/bletiny_advdata.md'
-- Newt Tool Manual:
- - Introduction: 'newt/newt_intro.md'
- - Install:
- - 'Install Newt on Mac': 'newt/install/newt_mac.md'
- - 'Install Newt on Linux': 'newt/install/newt_linux.md'
- - Newt Theory of Ops: 'newt/newt_operation.md'
- - User Guide:
- - toc: 'newt/newt_ops.md'
- - 'newt build': 'newt/command_list/newt_build.md'
- - 'newt clean': 'newt/command_list/newt_clean.md'
- - 'newt create-image': 'newt/command_list/newt_create_image.md'
- - 'newt debug': 'newt/command_list/newt_debug.md'
- - 'newt help': 'newt/command_list/newt_help.md'
- - 'newt info': 'newt/command_list/newt_info.md'
- - 'newt install': 'newt/command_list/newt_install.md'
- - 'newt load': 'newt/command_list/newt_load.md'
- - 'newt new': 'newt/command_list/newt_new.md'
- - 'newt run': 'newt/command_list/newt_run.md'
- - 'newt size': 'newt/command_list/newt_size.md'
- - 'newt target': 'newt/command_list/newt_target.md'
- - 'newt test': 'newt/command_list/newt_test.md'
- - 'newt upgrade': 'newt/command_list/newt_upgrade.md'
- - 'newt version': 'newt/command_list/newt_version.md'
-- Newt Manager Manual:
- - 'Introduction': 'newtmgr/overview.md'
- - 'Install': 'newtmgr/installing.md'
- - Manual:
- - 'Protocol': 'newtmgr/protocol.md'
+ - Newt Tool Manual:
+ - toc: 'newt/newt_intro.md'
+ - Newt Theory of Ops: 'newt/newt_operation.md'
+ - Command Guide:
+ - toc: 'newt/newt_ops.md'
+ - 'newt build': 'newt/command_list/newt_build.md'
+ - 'newt clean': 'newt/command_list/newt_clean.md'
+ - 'newt create-image': 'newt/command_list/newt_create_image.md'
+ - 'newt debug': 'newt/command_list/newt_debug.md'
+ - 'newt help': 'newt/command_list/newt_help.md'
+ - 'newt info': 'newt/command_list/newt_info.md'
+ - 'newt install': 'newt/command_list/newt_install.md'
+ - 'newt load': 'newt/command_list/newt_load.md'
+ - 'newt new': 'newt/command_list/newt_new.md'
+ - 'newt run': 'newt/command_list/newt_run.md'
+ - 'newt size': 'newt/command_list/newt_size.md'
+ - 'newt target': 'newt/command_list/newt_target.md'
+ - 'newt test': 'newt/command_list/newt_test.md'
+ - 'newt upgrade': 'newt/command_list/newt_upgrade.md'
+ - 'newt version': 'newt/command_list/newt_version.md'
+ - Newt Manager User Guide:
+ - toc: 'newtmgr/overview.md'
+ - 'Install': 'newtmgr/installing.md'
- Appendix:
- 'Edit Docs': 'faq/how_to_edit_docs.md'
- 'FAQ': 'faq/answers.md'
[8/9] incubator-mynewt-site git commit: Added content in the Quick
Start page, fixed relative links, cleaned community page
Posted by ad...@apache.org.
Added content in the Quick Start page, fixed relative links, cleaned community page
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/cb552868
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/cb552868
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/cb552868
Branch: refs/heads/develop
Commit: cb55286867e05446d6d816f0de7b20c695b6b122
Parents: a62d00f
Author: aditihilbert <ad...@runtime.io>
Authored: Fri May 20 00:02:03 2016 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Fri May 20 00:02:03 2016 -0700
----------------------------------------------------------------------
custom-theme/about.html | 22 +---------
custom-theme/community.html | 58 ++++++-------------------
custom-theme/download.html | 2 +-
custom-theme/main-banner.html | 2 +-
custom-theme/quick-start.html | 12 ++---
custom-theme/secondary-banner.html | 12 +++++
docs/about.md | 6 +--
docs/community.md | 2 +-
docs/events.md | 2 +-
docs/os/introduction.md | 15 +++++--
docs/os/tutorials/project-slinky.md | 6 +--
docs/os/tutorials/project-target-slinky.md | 8 ++--
docs/quick-start.md | 30 +++++++++++++
mkdocs.yml | 22 +++++-----
14 files changed, 100 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/custom-theme/about.html
----------------------------------------------------------------------
diff --git a/custom-theme/about.html b/custom-theme/about.html
index e809196..471a5be 100644
--- a/custom-theme/about.html
+++ b/custom-theme/about.html
@@ -1,25 +1,9 @@
{% include 'main-banner.html' %}
-<div class="container">
- <div class="row">
- <div class="column col-md-12">
-
-<div class="bg-orange padded event-callout content">
- <div class="row">
- <div class="col-md-12 text-center">
- <h3>Pre-GA release version of Mynewt 0.8.0 with BLE 4.2 support is available now. </h3>
- <p> <a href="http://mynewt.apache.org/download/"> Download! </a> </p>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
-
<div class="container small-no-padding">
<div class="row">
<div class="col-md-8 content">
- <h1> Features </h1>
+ <h3> Features </h3>
<li>
Real-time operating system kernel (Mynewt OS)
</li>
@@ -46,7 +30,7 @@
</p>
</div>
<div class="col-md-4">
- <h1> Git Repos </h1>
+ <h3> Source Code on github.com </h3>
<li>
<a href="https://github.com/apache/incubator-mynewt-core"> Git repo for Mynewt OS </a>
</li>
@@ -56,8 +40,6 @@
<li>
<a href="https://github.com/apache/incubator-mynewt-site"> Git repo for Docs </a>
</li>
- <h1> Quick Start <h1>
- <a href="/os/get_started/get_started/"> Setup for Project Blinky! </a>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/custom-theme/community.html
----------------------------------------------------------------------
diff --git a/custom-theme/community.html b/custom-theme/community.html
index 50fbb63..06616c1 100644
--- a/custom-theme/community.html
+++ b/custom-theme/community.html
@@ -1,17 +1,4 @@
{% include 'main-banner.html' %}
- <div class="container">
- <div class="row">
- <div class="col-md-12 text-center">
-
-<div class="bg-orange padded event-callout content">
- <h3> Welcome to the community!</h3>
- <br>
- <p> Questions? Join the dev@ mailing list. </p>
- <p> Want Mynewt 0.8.0 with BLE 4.2 support? <a href="http://mynewt.apache.org/download"> Download! </a> </p>
- </div>
- </div>
- </div>
-</div>
<div class="container small-no-padding">
@@ -62,34 +49,24 @@
<p> <a href="http://mail-archives.apache.org/mod_mbox/incubator-mynewt-notifications/">Mail archives</a> </p>
</div>
</div>
- </div>
+ </div>
</div>
-
<div class="container">
<div class="row">
<div class="col-md-12">
- <h2>Bug Submission and Issue Tracking</h2>
+ <h3>Bug Submission and Issue Tracking</h3>
<p>Issues, features, improvements, and wish-lists are tracked using <a href="https://issues.apache.org/jira/browse/Mynewt/">ASF JIRA</a>, the Atlassian JIRA software on Apache Software Foundation </p>
<li>
Sign up for an account on JIRA and submit a request to the dev@ mailing list for your JIRA username to be added to the Apache Mynewt (MYNEWT) project. Editing a ticket requires an account.
</li>
<li> Log in and report a bug by choosing the "MYNEWT" project, clicking on the "Create" button, and creating a ticket with an appropriate Issue Type (e.g. Bug, Wish). </p>
- <p> If you are a contributor and wish to work on a change, open a JIRA ticket first. It's always a good idea to introduce the change in the dev@ mailing list and refer to that ticket. When you generate a pull request into the github mirror for your change, always reference the JIRA ticket number in the title. JIRA is set up to resolve the ticket when your code is merged into the ASF git repository and the pull request closed.
- </div>
- </div>
- </div>
-
+ <p> If you are a contributor and wish to work on a change, open a JIRA ticket first. It's always a good idea to introduce the change in the dev@ mailing list and refer to that ticket. When you generate a pull request into the github mirror for your change, always reference the JIRA ticket number in the title. JIRA is set up to resolve the ticket when your code is merged into the ASF git repository and the pull request closed. </p>
-<a name="Contributing Code"></a>
-
-<div class="container">
- <div class="row">
- <div class="col-md-12">
- <h2>Contributing Code</h2>
- <p>
+ <h3>Contributing Code</h3>
+ <p>
You can start contributing right away, even if you are not a committer on Apache Mynewt! One requirement is that you adhere to the Apache's proposed workflow as explained <a href="https://git-wip-us.apache.org/docs/workflow.html">here</a>. Basically, you submit your initial edits for your peers to review and merge. After a few successful patches under your belt, you will get access to commit code directly to the module you are working on in the repository. And over time, you will get full access to all the repositories, where you can commit code to any module. </p>
- <p>You may choose to submit patches in one of the two following ways: </p>
+ <p>You may choose to submit patches in one of the two following ways:
<br>
<ol>
<li>
@@ -105,26 +82,17 @@
</ul>
<p>In the comment for the pull request, include a description of the changes you have made and why. Github will automatically notify everyone on the commits@mynewt.incubator.apache.org mailing list about the newly opened pull requests. You can open a pull request even if you don't think the code is ready for merging but want some discussion on the matter. </p>
<p> Upon receiving notification, one or more committers will review your work, ask for edits or clarifications, and merge when your proposed changes are ready.</p>
- <br>
+ </li>
<li>
- Use the `git format-patch` command to produce a patch file. Submit the patch (your code changes along with a diff from the old code) via email to the @dev mailing list. Summarize the issue and your work in the email. Regular project members will review your suggested patch and add it to the repository, acknowledging your contribution by referencing your name in the commit message.
- </li>
- <br>
-
- </div>
- </div>
- </div>
-</div>
-
-<div class="container">
-<div class="row">
- <div class="col-md-12">
- <h2>Contributing to the web site</h2>
+ Use the `git format-patch` command to produce a patch file. Submit the patch (your code changes along with a diff from the old code) via email to the @dev mailing list. Summarize the issue and your work in the email. Regular project members will review your suggested patch and add it to the repository, acknowledging your contribution by referencing your name in the commit message. </li>
+ </ol>
+ </p>
+
+ <h3>Contributing to the web site</h3>
<p> Go to <a href="https://github.com/apache/incubator-mynewt-site">Apache Mynewt documentation repo mirrored on github</a> to clone the repository into a local branch on your machine. Make your changes. Then submit a pull request on the github mirror repository by clicking the green "New pull request" button on the page. </p>
<p> To know more check out the <a href="http://mynewt.apache.org/faq/how_to_edit_docs/"> Appendix </a>. </p>
<br>
- </div>
+
</div>
</div>
</div>
-
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/custom-theme/download.html
----------------------------------------------------------------------
diff --git a/custom-theme/download.html b/custom-theme/download.html
index 856160b..58caa97 100644
--- a/custom-theme/download.html
+++ b/custom-theme/download.html
@@ -1,4 +1,4 @@
-{% include 'main-banner.html' %}
+{% include 'secondary-banner.html' %}
<div class="container">
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/custom-theme/main-banner.html
----------------------------------------------------------------------
diff --git a/custom-theme/main-banner.html b/custom-theme/main-banner.html
index 86428a4..3dea9d3 100644
--- a/custom-theme/main-banner.html
+++ b/custom-theme/main-banner.html
@@ -7,7 +7,7 @@
</div><!-- (need this comment because of the inline-blocks)
--><div class="col-md-4 v2-vcenter">
<div class="news bg-orange text-center">
- <h4>Pre-GA release version of Mynewt 0.8.0 with BLE 4.2 support is available now. </h4>
+ <h4>Pre-GA Mynewt 0.8.0 release is available now. </h4>
<a href="/download/">Download!</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/custom-theme/quick-start.html
----------------------------------------------------------------------
diff --git a/custom-theme/quick-start.html b/custom-theme/quick-start.html
index 3211d56..aa9748b 100644
--- a/custom-theme/quick-start.html
+++ b/custom-theme/quick-start.html
@@ -1,13 +1,15 @@
-{% include 'main-banner.html' %}
+{% include 'secondary-banner.html' %}
<div class="container v2-quick-start">
+ <div class="container small-no-padding">
<div class="row">
- <div class="col-md-12">
- <p>
- Here goes some quick start content.
- </p>
+ <div class="col-md-12 content">
+ {% block content %}
+ {{ content }}
+ {% endblock %}
</div>
</div>
+</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/custom-theme/secondary-banner.html
----------------------------------------------------------------------
diff --git a/custom-theme/secondary-banner.html b/custom-theme/secondary-banner.html
new file mode 100644
index 0000000..6c36a9d
--- /dev/null
+++ b/custom-theme/secondary-banner.html
@@ -0,0 +1,12 @@
+<div class="container">
+ <div class="row v2-main-banner">
+ <div class="col-md-8 v2-vcenter">
+ <img class="logo" src="/img/logo.svg">
+ <h4 class="tagline">Modular OS to operate an IoT network</h4>
+ </div><!-- (need this comment because of the inline-blocks)
+ --><div class="col-md-4 v2-vcenter">
+ </div>
+
+
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/docs/about.md
----------------------------------------------------------------------
diff --git a/docs/about.md b/docs/about.md
index 926834e..327074d 100644
--- a/docs/about.md
+++ b/docs/about.md
@@ -1,4 +1,4 @@
-#Roadmap
+###Roadmap
Release Version | Descriptor | Date |Features
@@ -25,7 +25,7 @@ Release Version | Descriptor | Date |Features
<br>
-#Feature Request
+###Feature Request
The WISHLIST at the top of the roadmap on [JIRA for Mynewt](https://issues.apache.org/jira/browse/MYNEWT/?selectedTab=com.atlassian.jira.jira-projects-plugin:roadmap-panel) features all the new ideas awaiting discussion and review. Once the community decides to go ahead with a request, it is scheduled into a release. Generally, effort is made to schedule a requested feature into a particular version no later than 6 weeks prior to the planned release date.
@@ -33,7 +33,7 @@ If you have suggestions for a new feature, use case, or implementation improveme
<br>
-#FAQ
+###FAQ
<font color="#F2853F"> Questions? </font> Click [here](faq/answers.md)
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/docs/community.md
----------------------------------------------------------------------
diff --git a/docs/community.md b/docs/community.md
index 219341d..0b004a4 100644
--- a/docs/community.md
+++ b/docs/community.md
@@ -1,6 +1,6 @@
-##Mailing Lists
+###Mailing Lists
We welcome you to join our mailing lists and get in touch with us!
<font color="#F2853F"> *To complete your subscription you have to confirm it by replying to the response sent to you when you email your subscription request!* </font>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/docs/events.md
----------------------------------------------------------------------
diff --git a/docs/events.md b/docs/events.md
index 34e741a..7d2e2f9 100644
--- a/docs/events.md
+++ b/docs/events.md
@@ -1,3 +1,3 @@
-#Events
+###Events
Please take a look at our upcoming events! We hope to see you there.
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/docs/os/introduction.md
----------------------------------------------------------------------
diff --git a/docs/os/introduction.md b/docs/os/introduction.md
index 09240e5..22df5c9 100644
--- a/docs/os/introduction.md
+++ b/docs/os/introduction.md
@@ -50,13 +50,22 @@ In order to provide all this functionality, and operate in an
extremely low resource environment, Mynewt provides a very fine-grained source
package management and build system tool, called *newt*.
-You can install and build *newt* for [Linux](../../newt/install/newt_linux.md) or [Mac](../../newt/install/newt_mac.md).
+You can install and build *newt* for [Linux](..//newt/install/newt_linux/) or [Mac](../newt/install/newt_mac/).
+
+<br>
+
+### Newt Manager ###
+
+
+In order to enable a user to communicate with remote instances of Mynewt OS and query, configure, and operate them, Mynewt provides an application tool called Newt Manager or `newtmgr`.
+
+You can install and build *newtmgr* from source code on [Linux or Mac](../newtmgr/installing/).
<br>
### Build your first Mynewt App with Newt ###
-With the introductions out of the way, now is a good time to [get
-started](project_create/) with your first Mynewt application.
+With the introductions out of the way, now is a good time to [get set up and
+started](../get_started/get_started/) with your first Mynewt application.
Happy Hacking!
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/docs/os/tutorials/project-slinky.md
----------------------------------------------------------------------
diff --git a/docs/os/tutorials/project-slinky.md b/docs/os/tutorials/project-slinky.md
index f084939..2949437 100644
--- a/docs/os/tutorials/project-slinky.md
+++ b/docs/os/tutorials/project-slinky.md
@@ -25,16 +25,16 @@ The instructions assume the user is using a Bourne-compatible shell (e.g. bash o
### Installing newt
If you have not already installed `newt` see the
-[newt installation instructions](../../newt/install/newt_mac.md) and ensure newt is installed an in your path.
+[newt installation instructions](../get_started/get_started/) and ensure newt is installed an in your path.
### Installing newtmgr
If you have not already installed `newtmgr` see the
-[newtmgr installation instructions](../../newtmgr/installing.md) and ensure newtmgr is installed an in your path.
+[newtmgr installation instructions](../../newtmgr/installing/) and ensure newtmgr is installed an in your path.
### Creating a new project
-Instructions for creating a project are located in the [Getting Started](../get_started/project_create.md) section of the [Mynewt OS Manual](../get_started/introduction.md)
+Instructions for creating a project are located in the [Basic Setup](../get_started/project_create/) section of the [Mynewt Documentation](../introduction/)
We will list only the steps here for brevity. We will name the project
`slinky`.
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/docs/os/tutorials/project-target-slinky.md
----------------------------------------------------------------------
diff --git a/docs/os/tutorials/project-target-slinky.md b/docs/os/tutorials/project-target-slinky.md
index 927c4e0..e51b8d6 100644
--- a/docs/os/tutorials/project-target-slinky.md
+++ b/docs/os/tutorials/project-target-slinky.md
@@ -29,18 +29,18 @@ The instructions assume the user is using a Bourne-compatible shell (e.g. bash o
### Install newt
If you have not already installed `newt`, see the
-[newt installation instructions](../../newt/install/newt_mac.md) and ensure newt is installed an in your path.
+[newt installation instructions](../get_started/get_started/) and ensure newt is installed an in your path.
### Install newtmgr
If you have not already installed `newtmgr`, see the
-[newtmgr installation instructions](../../newtmgr/installing.md) and ensure newtmgr is installed an in your path.
+[newtmgr installation instructions](../../newtmgr/installing/) and ensure newtmgr is installed an in your path.
### Create a new project
-Instructions for creating a project are located in the [Getting Started](../get_started/project_create.md) section of the [Mynewt OS Manual](../get_started/introduction.md).
+Instructions for creating a project are located in the [Basic Setup](../get_started/project_create/) section of the [Mynewt Documentation](../introduction.md).
-If you already completed [sim slinky](project-slinky.md) you can skip this step.
+If you already completed [Sim Slinky](project-slinky.md) you can skip this step.
We will list only the steps here for brevity. We will name the project
`slinky`.
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/docs/quick-start.md
----------------------------------------------------------------------
diff --git a/docs/quick-start.md b/docs/quick-start.md
index e69de29..6b54cfb 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -0,0 +1,30 @@
+### Get set
+
+Apache Mynewt currently offers two ways to quickly get set up, each appealing to different personal preference and familiarity with embedded systems.
+
+<br>
+
+* **Option 1:** All-in-one docker container that bundles Newt tool, developer toolchains and libraries. For this option, go to [Docker instructions](../os/get_started/docker/)
+
+* **Option 2:** Step-by-step instructions to install the Newt tool, developer toolchains and libraries natively on your computer. For this option, go to [Native Setup](../os/get_started/native_tools/)
+
+<br>
+
+### Go!
+
+Start a new project as explained under [Create Your First Project](../os/get_started/project_create/). The core Mynewt OS is automatically downloaded as part of the project installation.
+
+<br>
+
+* When you [Create Your First Project](../os/get_started/project_create/) you define a simulated target and run Project Blinky, the Hello World equivalent in the embedded world.
+
+* If you have one of the supported [boards](../), you can make real LEDs blink in [Project Blinky](../os/tutorials/arduino_zero/). Simply choose the appropriate tutorial for the board and proceed.
+
+<br>
+
+### And More...
+
+Explore the [Tutorials](../os/tutorials/tutorials/) section for other interesting projects or simply to learn more about Mynewt's capabilities and get familiar with its use.
+
+<br>
+
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/cb552868/mkdocs.yml
----------------------------------------------------------------------
diff --git a/mkdocs.yml b/mkdocs.yml
index 2d8ff29..42d213c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -14,8 +14,8 @@ pages:
- toc: 'os/introduction.md'
- Basic Setup:
- toc: 'os/get_started/get_started.md'
- - 'Option 1, Single Docker Container': 'os/get_started/docker.md'
- - 'Option 2, Native installs':
+ - 'Docker Container Option': 'os/get_started/docker.md'
+ - 'Native install Option':
- toc: 'os/get_started/native_tools.md'
- 'Install Newt on Mac': 'newt/install/newt_mac.md'
- 'Install Newt on Linux': 'newt/install/newt_linux.md'
@@ -24,11 +24,12 @@ pages:
- Concepts: 'os/get_started/vocabulary.md'
- Tutorials:
- toc: 'os/tutorials/tutorials.md'
- - 'Blinky on Arduino Zero': 'os/tutorials/arduino_zero.md'
- - 'Blinky on Olimex': 'os/tutorials/olimex.md'
- - 'Blinky on STM32F303': 'os/tutorials/STM32F303.md'
- - 'Blinky on nRF52': 'os/tutorials/nRF52.md'
- - 'Run Blinky from SRAM, no bootloader': 'os/tutorials/blinky_sram_olimex.md'
+ - 'Project Blinky':
+ - 'Blinky on Arduino Zero': 'os/tutorials/arduino_zero.md'
+ - 'Blinky on Olimex': 'os/tutorials/olimex.md'
+ - 'Blinky on STM32F303': 'os/tutorials/STM32F303.md'
+ - 'Blinky on nRF52': 'os/tutorials/nRF52.md'
+ - 'Run Blinky from SRAM, no bootloader': 'os/tutorials/blinky_sram_olimex.md'
- 'Add repo to project': 'os/tutorials/add_repos.md'
- 'Create a repo': 'os/tutorials/create_repo.md'
- 'Upgrade a repo': 'os/tutorials/upgrade_repo.md'
@@ -306,10 +307,7 @@ pages:
- 'json_encode_object_finish': 'os/modules/json/json_encode_object_finish.md'
- 'json_encode_object_key': 'os/modules/json/json_encode_object_key.md'
- 'json_encode_object_start': 'os/modules/json/json_encode_object_start.md'
-# - 'json_encode_value': 'os/modules/json/json_encode_value.md'
-# - 'json_read_array': 'os/modules/json/json_read_array.md'
- 'json_read_object': 'os/modules/json/json_read_object.md'
-# - 'json_target_address': 'os/modules/json/json_target_address.md'
- Stats:
- toc: 'os/modules/stats/stats.md'
- Logs:
@@ -333,7 +331,7 @@ pages:
- 'GAP in bletiny': 'network/ble/bletiny/bletiny_GAP.md'
- 'GATT in bletiny': 'network/ble/bletiny/bletiny_GATT.md'
- 'Advertisement Data Fields': 'network/ble/bletiny/bletiny_advdata.md'
- - Newt Tool Manual:
+ - Newt Tool Guide:
- toc: 'newt/newt_intro.md'
- Newt Theory of Ops: 'newt/newt_operation.md'
- Command Guide:
@@ -353,7 +351,7 @@ pages:
- 'newt test': 'newt/command_list/newt_test.md'
- 'newt upgrade': 'newt/command_list/newt_upgrade.md'
- 'newt version': 'newt/command_list/newt_version.md'
- - Newt Manager User Guide:
+ - Newt Manager Guide:
- toc: 'newtmgr/overview.md'
- 'Install': 'newtmgr/installing.md'
- Appendix:
[7/9] incubator-mynewt-site git commit: Merge branch
'tableOfContents' of https://github.com/gj262/incubator-mynewt-site into
develop
Posted by ad...@apache.org.
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/a62d00f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/a62d00f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/a62d00f4
Branch: refs/heads/develop
Commit: a62d00f469367ac3066f7e9f3be45e80a89bd0b9
Parents: 6fbd0f9 7108e2d
Author: aditihilbert <ad...@runtime.io>
Authored: Thu May 19 16:24:32 2016 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Thu May 19 16:24:32 2016 -0700
----------------------------------------------------------------------
custom-theme/css/base.css | 7 -------
custom-theme/css/custom.css | 6 +++++-
custom-theme/main-banner.html | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[9/9] incubator-mynewt-site git commit: changed ease of use image
Posted by ad...@apache.org.
changed ease of use image
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/fea488dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/fea488dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/fea488dc
Branch: refs/heads/develop
Commit: fea488dc577feac5b42ad7156ddebbdb4c454a44
Parents: cb55286
Author: aditihilbert <ad...@runtime.io>
Authored: Fri May 20 00:26:27 2016 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Fri May 20 00:26:27 2016 -0700
----------------------------------------------------------------------
custom-theme/img/newt-img.png | Bin 0 -> 53081 bytes
custom-theme/landing.html | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/fea488dc/custom-theme/img/newt-img.png
----------------------------------------------------------------------
diff --git a/custom-theme/img/newt-img.png b/custom-theme/img/newt-img.png
new file mode 100644
index 0000000..4b8d6e1
Binary files /dev/null and b/custom-theme/img/newt-img.png differ
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/fea488dc/custom-theme/landing.html
----------------------------------------------------------------------
diff --git a/custom-theme/landing.html b/custom-theme/landing.html
index 140dff1..25b37ec 100644
--- a/custom-theme/landing.html
+++ b/custom-theme/landing.html
@@ -52,7 +52,7 @@
<p>Secure yet simple image and configuration management</p>
</div>
<div class="col-md-6">
- <img src="/img/secure_img.png">
+ <img src="/img/secure_img.png" style="width:110%">
</div>
</div>
@@ -62,7 +62,7 @@
<p>Easily composable modules and HAL (Hardware Abstraction Layer) for portability </p>
</div>
<div class="col-md-6">
- <img src="/img/newt.png">
+ <img src="/img/newt-img.png">
</div>
</div>