From cf95fe20ba2b54eb433d513754741dc32e76a4cc Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 16 Oct 2013 15:36:14 -0700
Subject: upgrade to html5shiv v 3.7.0

---
 examples/non-responsive/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/non-responsive')

diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
index f09646243..cdb0db210 100644
--- a/examples/non-responsive/index.html
+++ b/examples/non-responsive/index.html
@@ -20,7 +20,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
   </head>
-- 
cgit v1.2.3


From c23d6a2766f550c63f7cf64f89296a2bcd52a324 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Thu, 17 Oct 2013 18:39:03 -0700
Subject: Warn about IE8 + Respond.js + file:// problem in examples; fix #11019

---
 examples/non-responsive/index.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'examples/non-responsive')

diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
index cdb0db210..52776e3fc 100644
--- a/examples/non-responsive/index.html
+++ b/examples/non-responsive/index.html
@@ -18,6 +18,9 @@
     <!-- Custom styles for this template -->
     <link href="non-responsive.css" rel="stylesheet">
 
+    <!-- Just for debugging purposes. Don't actually copy this line! -->
+    <!--[if lt IE 9]><script src="{{ page.base_url }}docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-- 
cgit v1.2.3


From ee9663728417dfbe9575d376c4fd2563a3787428 Mon Sep 17 00:00:00 2001
From: wangsai <wangsai7885@gmail.com>
Date: Wed, 30 Oct 2013 00:13:35 +0800
Subject: remove unused `{{ page.base_url }}` variables, and fix the urls

---
 examples/non-responsive/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/non-responsive')

diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
index 52776e3fc..517d874b1 100644
--- a/examples/non-responsive/index.html
+++ b/examples/non-responsive/index.html
@@ -19,7 +19,7 @@
     <link href="non-responsive.css" rel="stylesheet">
 
     <!-- Just for debugging purposes. Don't actually copy this line! -->
-    <!--[if lt IE 9]><script src="{{ page.base_url }}docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+    <!--[if lt IE 9]><script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-- 
cgit v1.2.3


From 0d4b9ef72e7e8e7210523aced9aced2d8cbad74a Mon Sep 17 00:00:00 2001
From: AJ Acevedo <aj@ajalabs.com>
Date: Thu, 31 Oct 2013 16:09:41 -0400
Subject: Added navigation role to example navbars

As per the docs:
http://getbootstrap.com/components/#navbar-default

  modified:   examples/carousel/index.html
  modified:   examples/jumbotron/index.html
  modified:   examples/navbar-fixed-top/index.html
  modified:   examples/navbar-static-top/index.html
  modified:   examples/navbar/index.html
  modified:   examples/non-responsive/index.html
  modified:   examples/starter-template/index.html
  modified:   examples/sticky-footer-navbar/index.html
  modified:   examples/theme/index.html
---
 examples/non-responsive/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/non-responsive')

diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
index 517d874b1..b51818c6d 100644
--- a/examples/non-responsive/index.html
+++ b/examples/non-responsive/index.html
@@ -31,7 +31,7 @@
   <body>
 
     <!-- Fixed navbar -->
-    <div class="navbar navbar-default navbar-fixed-top">
+    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-- 
cgit v1.2.3


From d2e710a2dfb1a6b4eaccedd975b96b24baa12390 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 5 Nov 2013 16:37:54 -0800
Subject: fix 1 remaining instance of #11349

---
 examples/non-responsive/index.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'examples/non-responsive')

diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
index b51818c6d..1c56b300f 100644
--- a/examples/non-responsive/index.html
+++ b/examples/non-responsive/index.html
@@ -35,6 +35,7 @@
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
-- 
cgit v1.2.3


From 33160d50437e1f26e1ddc7d126e528f41a8bc6a0 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 1 Dec 2013 18:06:57 -0800
Subject: Fixes #9927: Update non-responsive example to prevent
 .navbar-collapse border from increasing height and increase specificity of
 nav selectors to keep dropdowns looking the same

---
 examples/non-responsive/non-responsive.css | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'examples/non-responsive')

diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css
index 526b0b8be..9813bb9fe 100644
--- a/examples/non-responsive/non-responsive.css
+++ b/examples/non-responsive/non-responsive.css
@@ -8,6 +8,7 @@
 body {
   padding-top: 70px;
   padding-bottom: 30px;
+  min-width: 970px;
 }
 
 /* Finesse the page header spacing */
@@ -63,6 +64,9 @@ body {
 .navbar-toggle {
   display: none;
 }
+.navbar-collapse {
+  border-top: 0;
+}
 
 .navbar-brand {
   margin-left: -15px;
@@ -86,7 +90,7 @@ body {
 }
 
 /* Undo custom dropdowns */
-.navbar .open .dropdown-menu {
+.navbar .navbar-nav .open .dropdown-menu {
   position: absolute;
   float: left;
   background-color: #fff;
@@ -97,20 +101,20 @@ body {
   -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
           box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
 }
-.navbar .open .dropdown-menu > li > a {
+.navbar-default .navbar-nav .open .dropdown-menu > li > a {
   color: #333;
 }
-.navbar .open .dropdown-menu > li > a:hover,
-.navbar .open .dropdown-menu > li > a:focus,
-.navbar .open .dropdown-menu > .active > a,
-.navbar .open .dropdown-menu > .active > a:hover,
-.navbar .open .dropdown-menu > .active > a:focus {
+.navbar .navbar-nav .open .dropdown-menu > li > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > li > a:focus,
+.navbar .navbar-nav .open .dropdown-menu > .active > a,
+.navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
   color: #fff !important;
   background-color: #428bca !important;
 }
-.navbar .open .dropdown-menu > .disabled > a,
-.navbar .open .dropdown-menu > .disabled > a:hover,
-.navbar .open .dropdown-menu > .disabled > a:focus {
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a,
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a:focus {
   color: #999 !important;
   background-color: transparent !important;
 }
-- 
cgit v1.2.3