From 6b24297c5beca5adc118d0524c50700928687c1c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 18 Aug 2013 02:11:57 -0700
Subject: update urls

---
 javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index c9228c211..883bbb929 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1681,7 +1681,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
 {% endhighlight %}
 <div class="bs-callout bs-callout-info">
   <h4>Glyphicon Alternative</h4>
-  <p>With <a href="{{ site.glyphicons }}">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon .glyphicon-chevron-left</code> and <code>.glyphicon .glyphicon-chevron-right</code>.</p>
+  <p>With <a href="{{ page.base_url }}components/#glyphicons">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon .glyphicon-chevron-left</code> and <code>.glyphicon .glyphicon-chevron-right</code>.</p>
 </div>
 
     <h3>Optional captions</h3>
-- 
cgit v1.2.3


From abca00870f862d024a943b2c563bd42ff3f8418f Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Sun, 18 Aug 2013 23:05:56 +0200
Subject: Add a .navbar-default class for default colors

* Extract color styles from .navbar { } and put them into
.navbar-default { }
* Change variable names
* Change the docs accordingly (i.e., add the .navbar-default class to
all default navbars)
* Change customizer accordingly
---
 javascript.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index 883bbb929..9e85c7742 100644
--- a/javascript.html
+++ b/javascript.html
@@ -355,7 +355,7 @@ $('#myModal').on('hidden.bs.modal', function () {
 
     <h3>Within a navbar</h3>
     <div class="bs-example">
-      <nav id="navbar-example" class="navbar navbar-static" role="navigation">
+      <nav id="navbar-example" class="navbar navbar-default navbar-static" role="navigation">
         <div class="navbar-header">
           <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-js-navbar-collapse">
             <span class="sr-only">Toggle navigation</span>
@@ -526,7 +526,7 @@ $('#myDropdown').on('show.bs.dropdown', function () {
     <h2 id="scrollspy-examples">Example in navbar</h2>
     <p>The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.</p>
     <div class="bs-example">
-      <nav id="navbar-example2" class="navbar navbar-static" role="navigation">
+      <nav id="navbar-example2" class="navbar navbar-default navbar-static" role="navigation">
         <div class="navbar-header">
           <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-js-navbar-scrollspy">
             <span class="sr-only">Toggle navigation</span>
-- 
cgit v1.2.3