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/19 17:05:02 UTC
[2/6] incubator-mynewt-site git commit: landing re-style & remove
most boostrap overrides
landing re-style & remove most boostrap overrides
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/25630ced
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/25630ced
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/25630ced
Branch: refs/heads/develop
Commit: 25630ced6eab20a113f2cf19e3c2f26343dc8e9d
Parents: 2989c8a
Author: Gavin Jefferies <ga...@runtime.io>
Authored: Wed May 18 18:46:05 2016 -0700
Committer: Gavin Jefferies <ga...@runtime.io>
Committed: Wed May 18 18:46:05 2016 -0700
----------------------------------------------------------------------
custom-theme/base.html | 2 +-
custom-theme/css/custom.css | 16 ++--
custom-theme/css/v2.css | 26 ++++++
custom-theme/landing.html | 158 +++++++++++++++++++++----------------
custom-theme/main-banner.html | 6 +-
docs/extra.css | 6 +-
6 files changed, 129 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/25630ced/custom-theme/base.html
----------------------------------------------------------------------
diff --git a/custom-theme/base.html b/custom-theme/base.html
index fead76a..a8b3b18 100644
--- a/custom-theme/base.html
+++ b/custom-theme/base.html
@@ -53,7 +53,7 @@
{% set full_width_page_titles = [None, 'About', 'Documentation', 'Download', 'Community', 'Events'] %}
- <div class="container-fluid">
+ <div class="container">
{% if page_title == None %}
{% include "landing.html" %}
{% elif page_title == 'About' %}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/25630ced/custom-theme/css/custom.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/custom.css b/custom-theme/css/custom.css
index 2d02fa0..bed1a90 100644
--- a/custom-theme/css/custom.css
+++ b/custom-theme/css/custom.css
@@ -1,8 +1,8 @@
-body * {
+/*body * {
font-size: 12pt;
font-weight: 300;
word-wrap: break-word;
-}
+}*/
.content {
margin-bottom: 15px;
@@ -24,7 +24,7 @@ body * {
font-size: 22px;
}
-h1 {
+/*h1 {
font-size: 28px;
font-weight: 500;
color: #42567E;
@@ -33,7 +33,7 @@ h1 {
h2, h3 {
color: #42567E;
font-weight: 300;
-}
+}*/
hsp{
color: #42567E;
@@ -204,10 +204,10 @@ hsp{
color: #333;
}
-.row {
+/*.row {
margin-left: 0px;
margin-right: 0px;
-}
+}*/
.navbar {
margin-bottom: 0px;
@@ -311,9 +311,9 @@ footer .footnote {
/* margin-bottom: 40px; */
}
-.home h2 {
+/*.home h2 {
font-size: 13pt;
-}
+}*/
.goal p {
max-width: 350px;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/25630ced/custom-theme/css/v2.css
----------------------------------------------------------------------
diff --git a/custom-theme/css/v2.css b/custom-theme/css/v2.css
index d914811..9ea21c7 100644
--- a/custom-theme/css/v2.css
+++ b/custom-theme/css/v2.css
@@ -23,3 +23,29 @@
vertical-align: middle;
float: none;
}
+
+.v2-landing .tagline {
+ margin-top: 10px;
+ margin-bottom: 40px;
+}
+
+.v2-landing .highlights {
+ padding-right: 100px;
+}
+
+.v2-landing .highlights .highlight {
+ margin-bottom: 40px;
+}
+
+.v2-landing .highlights img {
+ width: 100%;
+}
+
+.v2-landing .highlights .scroll-image {
+ overflow-y: scroll;
+ height: 200px;
+}
+
+.v2-landing .updates img {
+ width: 100%;
+}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/25630ced/custom-theme/landing.html
----------------------------------------------------------------------
diff --git a/custom-theme/landing.html b/custom-theme/landing.html
index d24acd0..46bff4b 100644
--- a/custom-theme/landing.html
+++ b/custom-theme/landing.html
@@ -1,89 +1,107 @@
{% include 'main-banner.html' %}
-<div class="container">
- <div class="row">
- <div class="col-md-12 text-center">
- {% block content %}
- {{ content }}
- {% endblock %}
+<div class="container v2-landing">
+
+ <div class="row tagline">
+ <div class="col-md-12 text-center">
+ <p>
+ {{ content }}
+ </p>
+ </div>
+ </div>
+
+ <div class="row">
+
+ <div class="col-md-8 highlights">
+
+ <div class="row highlight">
+ <div class="col-md-6">
+ <h3>Utility</h3>
+ <p>Utilities such as boot loaders, file systems, time-series data, JSON formatted log request/response, and more </p>
+ </div>
+ <div class="col-md-6">
+ <div class="scroll-image">
+ <img src="/img/json_logs.png">
+ </div>
</div>
</div>
-<div class="row">
- <div class="col-md-8">
- <h2 style="font-weight:600">Apache Mynewt OS highlights:</h2>
- <div class="row">
- <div class="column col-md-6 goal text-center">
- <div class="goal-image">
- <span class="helper"></span>
- <img src="/img/json_logs.png">
- </div>
- <p>Utilities such as boot loaders, file systems, time-series data, JSON formatted log request/response, and more </p>
- </div>
- <div class="column col-md-6 goal text-center">
- <div class=" text-left">
- <span class="helper"></span>
- <img src="/img/NimBLE_throughput.png">
- <img src="/img/NimBLE_conn.png">
- </div>
- <p>High-performance, highly-configurable networking stacks, starting with Bluetooth Low Energy 4.2</p>
- </div>
+ <div class="row highlight">
+ <div class="col-md-6">
+ <h3>Bluetooth Low Energy</h3>
+ <p>High-performance, highly-configurable networking stacks, starting with Bluetooth Low Energy 4.2</p>
+ </div>
+ <div class="col-md-6">
+ <img src="/img/NimBLE_throughput.png" style="width:66%">
</div>
+ </div>
- <div class="row">
- <div class="column col-md-6 goal text-center">
- <div class="goal-image">
- <span class="helper"></span>
- <img src="/img/secure_img.png">
- </div>
- <p>Secure yet simple image and configuration management</p>
- </div>
+ <div class="row highlight">
+ <div class="col-md-6">
+ <h3>Highly Configurable</h3>
+ </div>
+ <div class="col-md-6">
+ <img src="/img/NimBLE_conn.png" style="width:66%">
+ </div>
+ </div>
+
+ <div class="row highlight">
+ <div class="col-md-6">
+ <h3>Secure</h3>
+ <p>Secure yet simple image and configuration management</p>
+ </div>
+ <div class="col-md-6">
+ <img src="/img/secure_img.png">
+ </div>
+ </div>
+
+ <div class="row highlight">
+ <div class="col-md-6">
+ <h3>Modular</h3>
+ <p>Modularity and easy composability to optimally address application and hardware requirements</p>
+ </div>
+ <div class="col-md-6">
+ <img src="/img/newt.png">
+ </div>
+ </div>
- <div class="column col-md-6 goal text-center">
- <div class="goal-image">
- <span class="helper"></span>
- <img src="/img/newt.png">
- </div>
- <p>Modularity and easy composability to optimally address application and hardware requirements</p>
- </div>
- </div>
</div>
- <div class="col-md-4">
- <h2 style="font-weight:600">Supported Boards:</h2>
- <li>
+ <div class="col-md-4 updates">
+
+ <img src="/img/OS_arch.png">
+
+ <h3>Supported Boards</h3>
+
+ <ul>
+ <li>
<a href="https://www.nordicsemi.com/eng/Products/Bluetooth-Smart-Bluetooth-low-energy/nRF52832/"> nRF52 DK </a> from Nordic Semiconductor (Cortex-M4)
- </li>
- <li>
+ </li>
+ <li>
<a href="https://www.nordicsemi.com/eng/Products/Bluetooth-Smart-Bluetooth-low-energy/nRF51822"> nRF51 DK </a> from Nordic Semiconductor (Cortex-M0)
- </li>
- <li>
+ </li>
+ <li>
<a href="https://www.rigado.com/products/bmd-300-eval-kit/"> BMD-300-EVAL-ES </a> from Rigado (Cortex-M4)
- </li>
- <li>
- <a href="http://www.st.com/en/evaluation-tools/stm32f3discovery.html> STM32F3DISCOVERY </a> from ST Micro (Cortex-M4)
- </li>
- <li>
- <a href="https://www.olimex.com/Products/ARM/ST/STM32-E407/open-source-hardware> STM32-E407 </a> from Olimex (Cortex-M4)
- </li>
- <li>
+ </li>
+ <li>
+ <a href="http://www.st.com/en/evaluation-tools/stm32f3discovery.html"> STM32F3DISCOVERY </a> from ST Micro (Cortex-M4)
+ </li>
+ <li>
+ <a href=" https://www.olimex.com/Products/ARM/ST/STM32-E407/open-source-hardware"> STM32-E407 </a> from Olimex (Cortex-M4)
+ </li>
+ <li>
<a href="https://www.arduino.cc/en/Main/ArduinoBoardZero"> Arduino Zero </a> (Cortex-M0)
- </li>
- <li>
+ </li>
+ <li>
<a href="http://www.arduino.org/products/previous-version-boards/11-previous-version-boards/arduino-zero-pro"> Arduino Zero Pro </a> (Cortex-M0)
- </li>
- <li>
+ </li>
+ <li>
<a href="http://www.arduino.org/products/boards/4-arduino-boards/arduino-m0-pro"> Arduino M0 Pro </a> (Cortex-M0)
- </li>
- <h2 style="font-weight:600">Architecture:</h2>
- <div class="column goal text-center">
- <div class="goal-image">
- <span class="helper"></span>
- <img src="/img/OS_arch.png">
- </div>
- </div>
- </div>
+ </li>
+ </ul>
+
+ </div>
- </div>
+ </div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/25630ced/custom-theme/main-banner.html
----------------------------------------------------------------------
diff --git a/custom-theme/main-banner.html b/custom-theme/main-banner.html
index 4b6e4b1..ca48a88 100644
--- a/custom-theme/main-banner.html
+++ b/custom-theme/main-banner.html
@@ -3,11 +3,11 @@
<div class="col-md-8 v2-vcenter">
<img class="logo" src="/img/logo.svg">
- <h2 class="tagline">Modular OS to operate an IoT network</h2>
- </div><!--
+ <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 class="news bg-orange text-center">
- <h3>Pre-GA release version of Mynewt 0.8.0 with BLE 4.2 support is available now. </h3>
+ <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>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/25630ced/docs/extra.css
----------------------------------------------------------------------
diff --git a/docs/extra.css b/docs/extra.css
index 54322d5..0653396 100644
--- a/docs/extra.css
+++ b/docs/extra.css
@@ -1,8 +1,8 @@
/*
* Tweak the headers to better match RTD.
*/
-
-body {
+
+/*body {
font-size: 100%;
}
@@ -18,7 +18,7 @@ hr {
background-color:#42567E;
color: #42567E;
border: 0 none;
-}
+}*/
/*