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/11/05 04:51:10 UTC
[25/50] incubator-mynewt-site git commit: move banner above the navbar
move banner above the navbar
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/4d77c59c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/4d77c59c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/4d77c59c
Branch: refs/heads/develop
Commit: 4d77c59c82e7c14ac31e511559b974b313acf88c
Parents: e7e625f
Author: Gavin Jefferies <ga...@runtime.io>
Authored: Wed Oct 19 14:54:30 2016 -0700
Committer: Gavin Jefferies <ga...@runtime.io>
Committed: Wed Oct 19 14:54:30 2016 -0700
----------------------------------------------------------------------
custom-theme/about.html | 1 -
custom-theme/base.html | 2 ++
custom-theme/community.html | 20 +++++++++-----------
custom-theme/css/custom.css | 26 +++++++++++++++++---------
custom-theme/css/v2.css | 8 ++++++--
custom-theme/download.html | 2 --
custom-theme/events.html | 1 -
custom-theme/landing.html | 2 --
custom-theme/main-banner.html | 20 +++++++-------------
custom-theme/nav.html | 2 +-
custom-theme/pages/template.html | 2 --
custom-theme/quick-start.html | 4 ----
custom-theme/toc.html | 1 -
13 files changed, 42 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/about.html
----------------------------------------------------------------------
diff --git a/custom-theme/about.html b/custom-theme/about.html
index ce5894c..440fcf3 100644
--- a/custom-theme/about.html
+++ b/custom-theme/about.html
@@ -1,4 +1,3 @@
-{% include 'main-banner.html' %}
<div class="container small-no-padding">
<div class="row">
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/base.html
----------------------------------------------------------------------
diff --git a/custom-theme/base.html b/custom-theme/base.html
index 37a5bf2..01d56f0 100644
--- a/custom-theme/base.html
+++ b/custom-theme/base.html
@@ -49,6 +49,8 @@
<body class="home">
{% endif %}
+ {% include 'main-banner.html' %}
+
{% include "nav.html" %}
{% set full_width_page_titles = [None, 'Quick Start', 'About', 'Documentation', 'Download', 'Community', 'Events'] %}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/community.html
----------------------------------------------------------------------
diff --git a/custom-theme/community.html b/custom-theme/community.html
index ced2cfa..ac3e094 100644
--- a/custom-theme/community.html
+++ b/custom-theme/community.html
@@ -1,5 +1,3 @@
-{% include 'main-banner.html' %}
-
<div class="container small-no-padding">
<div class="row content">
@@ -13,14 +11,14 @@
<div class="col-md-4 mailing-list">
<div class="bg-purple mailing-list-title text-center">
Dev Mailing List
- </div>
+ </div>
<p><a class="bold-link" href="mailto:dev@mynewt.incubator.apache.org">dev@mynewt.incubator.apache.org</a></p>
<p>For both contributors and users. Ask questions. Share ideas. Discuss issues, roadmap, process. Help coordinate. Influence.</p>
<div class="mailing-list-title text-center">
<p><a href="mailto:dev-subscribe@mynewt.incubator.apache.org">Subscribe</a></p>
<p text-center><a href="mailto:dev-unsubscribe@mynewt.incubator.apache.org">Unsubscribe</a></p>
<p> <a href="http://mail-archives.apache.org/mod_mbox/incubator-mynewt-dev/">Mail archives</a> </p>
- </div>
+ </div>
</div>
<div class="col-md-4 mailing-list">
<div class="bg-purple mailing-list-title text-center">
@@ -56,7 +54,7 @@
<p>
If you are already settled in and wish to contribute code, read on ahead. This project strives to adhere to 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 on the apache git repository (and not the github mirror). </p>
<p>The diagram below explains the recommended process for submitting code to the core repository of Apache Mynewt. The "develop" branch on Mynewt's repository contains the most recent changes made by the community of developers. Contributions from you need to go into this branch. The essential steps are the following: </p>
- <ol>
+ <ol>
<li> Fork the Mynewt repository to create your very own repo on github. </li>
<li> Clone the Mynewt repository on your machine using the Newt tool. Set up the remotes correctly as shown in the diagram. This is key to making sure you correctly pull the latest code from Mynewt's "develop" and push to your working branch on github. </li>
<li> Make your code changes and commit them locally. </li>
@@ -64,21 +62,21 @@
<li> Push your commits to your working branch on github.
<li> Submit a pull request to the `develop` branch of the appropriate Apache Mynewt repository by clicking the green "New pull request" button on your github fork page. </li>
</ol>
-
+
<br>
-
+
<object data="/img/mynewt_dev_cycle.pdf" type="application/pdf" width=900 height=750>
<p><b>Example fallback content</b>: This browser does not support PDFs. Please download the PDF to view it: <a href="/img/mynewt_dev_cycle.pdf"> Download PDF </a>.</p>
</object>
<br>
-
- <p> Remember there are three repositories to work with in the Apache Mynewt project. All of them have a "develop" branch which contains the latest code. The code from "develop" is merged periodically into "master" on all these repositories and releases are then tagged off the "master" branch.
+
+ <p> Remember there are three repositories to work with in the Apache Mynewt project. All of them have a "develop" branch which contains the latest code. The code from "develop" is merged periodically into "master" on all these repositories and releases are then tagged off the "master" branch.
<ul>
<li><a href="https://github.com/apache/incubator-mynewt-core">Apache Mynewt core repo mirrored on github</a></li>
<li><a href="https://github.com/apache/incubator-mynewt-newt">Apache Mynewt newt tool repo mirrored on github</a></li>
<li><a href="https://github.com/apache/incubator-mynewt-site">Apache Mynewt documentation repo mirrored on github</a></li>
- </ul>
+ </ul>
<br>
<p> <mark>The bottomline is to work with the "develop" branch. </mark> It has the latest code and you want your changes tested, working, and merged with that codebase. 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> <mark>There is no need to open a new pull request if you have already submitted a pull request against the "develop" branch on the mirror but have modified your code futher </mark>(e.g. after some feedback from the community or another clever idea popping into your head). The old pull request will get updated with your changes.</p>
@@ -96,6 +94,6 @@
<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. </p>
<br>
-
+
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/css/custom.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/custom.css b/custom-theme/css/custom.css
index 63e04f9..dacc413 100644
--- a/custom-theme/css/custom.css
+++ b/custom-theme/css/custom.css
@@ -26,16 +26,8 @@
display: none;
}
-body {
- padding-top: 50px;
-}
-
@media (max-width: 768px) {
- body {
- padding-top: 100px;
- }
-
.navbar {
padding: 14px 40px;
}
@@ -122,6 +114,9 @@ body {
.navbar {
background-color: #42567E;
+ border-radius: 0px;
+ margin-bottom: 0px;
+ z-index: 2;
}
.navbar li.important a {
@@ -132,6 +127,20 @@ body {
background-color: #293D65;
}
+.affix {
+ top: 0;
+ left: 0;
+ right: 0;
+}
+
+div > .v2-main-banner {
+ margin-bottom: 52px;
+}
+
+.affix-top {
+ margin-top: -52px;
+}
+
.sidebar-top {
padding: 0px;
}
@@ -404,7 +413,6 @@ ul.wy-breadcrumbs {
}
@media print {
-
.wy-breadcrumbs li.wy-breadcrumbs-aside {
display: none
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/css/v2.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/v2.css b/custom-theme/css/v2.css
index a79ea41..3233a30 100644
--- a/custom-theme/css/v2.css
+++ b/custom-theme/css/v2.css
@@ -32,7 +32,7 @@
}
.v2-landing .highlights .highlight {
- margin-bottom: 15px;
+ margin-top: 15px;
overflow: auto;
}
@@ -74,10 +74,14 @@
@media (max-width: 992px) {
.v2-sidebar > div {
- padding-top: 15px;
+ margin-top: 15px;
}
}
+.v2-sidebar .top {
+ padding-top: 15px;
+}
+
.v2-sidebar .form-group {
margin-right: 15px;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/download.html
----------------------------------------------------------------------
diff --git a/custom-theme/download.html b/custom-theme/download.html
index 3773801..e6b91e2 100644
--- a/custom-theme/download.html
+++ b/custom-theme/download.html
@@ -1,5 +1,3 @@
-{% include 'main-banner.html' %}
-
<div class="container">
<div class="row">
<div class="col-md-12">
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/events.html
----------------------------------------------------------------------
diff --git a/custom-theme/events.html b/custom-theme/events.html
index e5ec226..bb5ea17 100644
--- a/custom-theme/events.html
+++ b/custom-theme/events.html
@@ -1,4 +1,3 @@
-{% include 'main-banner.html' %}
<div class="row">
<div class="column col-md-12">
<div class="container">
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/landing.html
----------------------------------------------------------------------
diff --git a/custom-theme/landing.html b/custom-theme/landing.html
index 6617596..2b7e69a 100644
--- a/custom-theme/landing.html
+++ b/custom-theme/landing.html
@@ -1,5 +1,3 @@
-{% include 'main-banner.html' %}
-
<div class="row v2-landing">
<div class="col-xs-12 highlights">
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/main-banner.html
----------------------------------------------------------------------
diff --git a/custom-theme/main-banner.html b/custom-theme/main-banner.html
index c1a6000..a9da6ba 100644
--- a/custom-theme/main-banner.html
+++ b/custom-theme/main-banner.html
@@ -1,14 +1,8 @@
-<div class="row v2-main-banner">
-
-<div class="col-xs-12 col-md-8 v2-vcenter">
- <img class="logo" src="/img/logo.svg">
- <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
-</div><!-- (need this comment because of the inline-blocks)
---><div class="col-xs-12 col-md-4 v2-vcenter">
- <!-- <div class="news bg-orange text-center">
- <h4>Mynewt 0.9.0 release is available now. </h4>
- <a href="/download/">Download!</a>
- </div> -->
-</div>
-
+<div class="container">
+ <div class="row v2-main-banner">
+ <div class="col-xs-12 v2-vcenter">
+ <img class="logo" src="/img/logo.svg">
+ <h4 class="tagline">An OS to build, deploy and securely manage billions of devices</h4>
+ </div>
+ </div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/nav.html
----------------------------------------------------------------------
diff --git a/custom-theme/nav.html b/custom-theme/nav.html
index 9961500..d53cadc 100644
--- a/custom-theme/nav.html
+++ b/custom-theme/nav.html
@@ -9,7 +9,7 @@
class="{% if (not page or not page.title in not_doc_page_titles) and (not meta or not meta.sub_page) %}active{% endif %}"
{% endmacro %}
-<nav id="navbar" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar navbar-inverse affix-top" data-spy="affix" data-offset-top="150" role="navigation">
<div class="container">
<!-- Collapsed navigation -->
<div class="navbar-header">
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/pages/template.html
----------------------------------------------------------------------
diff --git a/custom-theme/pages/template.html b/custom-theme/pages/template.html
index dddf974..30f4a1f 100644
--- a/custom-theme/pages/template.html
+++ b/custom-theme/pages/template.html
@@ -1,5 +1,3 @@
-{% include 'main-banner.html' %}
-
<div class="col-xs-12 v2-sub-page">
<h2>Something about MyNewt that will not fit on the landing page</h2>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/quick-start.html
----------------------------------------------------------------------
diff --git a/custom-theme/quick-start.html b/custom-theme/quick-start.html
index 66629c6..118a2f8 100644
--- a/custom-theme/quick-start.html
+++ b/custom-theme/quick-start.html
@@ -1,5 +1,3 @@
-{% include 'main-banner.html' %}
-
<div class="v2-quick-start">
<div class="small-no-padding">
@@ -11,5 +9,3 @@
</div>
</div>
</div>
-
-</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/4d77c59c/custom-theme/toc.html
----------------------------------------------------------------------
diff --git a/custom-theme/toc.html b/custom-theme/toc.html
index 8fa5fa4..29bb855 100644
--- a/custom-theme/toc.html
+++ b/custom-theme/toc.html
@@ -1,6 +1,5 @@
<div id="docSidebar" 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 role="search">
<form id="rtd-search-form" class="wy-form" action="{{ base_url }}/search.html" method="get">
<div class="form-group">