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:00 UTC
[2/9] incubator-mynewt-site git commit: clean up top nav
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>