aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-08-14 22:45:55 -0700
committerMark Otto <[email protected]>2015-08-14 22:45:55 -0700
commitc064eef67b168e2f6c61e575f0e99988eceac6f9 (patch)
treec8dccd538370f75f7c257f377196f4b375122237 /docs/_includes
parentb388778f1ff7b9d15305caa9a29805ae9a64c505 (diff)
downloadbootstrap-c064eef67b168e2f6c61e575f0e99988eceac6f9.tar.xz
bootstrap-c064eef67b168e2f6c61e575f0e99988eceac6f9.zip
Massive cleanup
- Simpler main nav on all pages - Back to purple masthead on homepage instead of dark graphite - Active link styles on the main nav - Cleaned up sidebar nav - New docs layout name - Homepage copy edits - Updated bright purple docs color
Diffstat (limited to 'docs/_includes')
-rw-r--r--docs/_includes/header.html3
-rw-r--r--docs/_includes/nav-home.html18
2 files changed, 12 insertions, 9 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index e6fe08310..7efc407a2 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -20,7 +20,8 @@
<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
<!-- Google Web fonts -->
-<link href="http://fonts.googleapis.com/css?family=Roboto:400,300,400italic,500,700" rel="stylesheet">
+<link href="http://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500" rel="stylesheet">
+<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,300,400italic,600' rel='stylesheet' type='text/css'>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script>
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index d69251020..b1ff4c523 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,9 +1,11 @@
-<header class="navbar navbar-sm navbar-inverse navbar-static-top bd-navbar" role="banner">
- <nav class="nav navbar-nav">
- <a class="nav-item nav-link" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a>
- <a class="nav-item nav-link" href="{{ site.baseurl }}/getting-started/overview/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>
- <a class="nav-item nav-link" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a>
- <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
- <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
- </nav>
+<header class="navbar navbar-sm navbar-defeault navbar-static-top bd-navbar" role="banner">
+ <div class="container-fluid">
+ <nav class="nav nav-inline">
+ <a class="nav-item nav-link {% if page.layout == "home" %}active{% endif %}" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a>
+ <a class="nav-item nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>
+ <a class="nav-item nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a>
+ <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
+ <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
+ </nav>
+ </div>
</header>