From 7d0f7e84412ab8018e6e9211f9e6a0f47d1100ce Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 29 Apr 2014 15:54:05 -0700
Subject: add button to toggle the optional theme when viewing the docs; fixes
 #9764

---
 docs/_includes/header.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index e12545ecc..87d20a132 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -15,6 +15,10 @@
 
 <!-- Bootstrap core CSS -->
 <link href="../dist/css/bootstrap.min.css" rel="stylesheet">
+{% if page.slug == "css" or page.slug == "components" or page.slug == "js" %}
+  <!-- Optional Bootstrap Theme -->
+  <link href="" data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet">
+{% endif %}
 
 <!-- Documentation extras -->
 <link href="../assets/css/docs.min.css" rel="stylesheet">
-- 
cgit v1.2.3


From bdd822a94cdf2d452e067569e76ca1537dc74d8d Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 29 Apr 2014 15:56:18 -0700
Subject: regenerate minified docs JS & CSS

---
 docs/_includes/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 87d20a132..c9e38e25c 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -17,7 +17,7 @@
 <link href="../dist/css/bootstrap.min.css" rel="stylesheet">
 {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %}
   <!-- Optional Bootstrap Theme -->
-  <link href="" data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet">
+  <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet">
 {% endif %}
 
 <!-- Documentation extras -->
-- 
cgit v1.2.3


From cae7dee2361c7023bd147570509a0c40ade3c4e9 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Thu, 22 May 2014 10:55:28 +0300
Subject: Revert 4f9270cc20c29cd3fbb0664379d620d14bb24a91.

The validator doesn't choke anymore on this and even though it's not spec compliant, it's needed for some IE versions. So until we move favicon.ico in root, this should do the job.
---
 docs/_includes/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 182664d5a..eaf8083dd 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -31,7 +31,7 @@
 
 <!-- Favicons -->
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
-<link rel="icon" href="../assets/ico/favicon.ico">
+<link rel="shortcut icon" href="../assets/ico/favicon.ico">
 
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-- 
cgit v1.2.3


From ef360b61b5eb79982e85d8c8380de69ef16395a6 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 22 May 2014 20:14:32 -0700
Subject: clarify and danger-ify affix docs usage requirements, per #10235

---
 docs/_includes/js/affix.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/affix.html b/docs/_includes/js/affix.html
index 5b6fec0bb..4ce51cb34 100644
--- a/docs/_includes/js/affix.html
+++ b/docs/_includes/js/affix.html
@@ -7,7 +7,7 @@
   <hr class="bs-docs-separator">
 
   <h2 id="affix-usage">Usage</h2>
-  <p>Use the affix plugin via data attributes or manually with your own JavaScript. <strong>In both situations, you must provide CSS for the positioning of your content.</strong></p>
+  <p>Use the affix plugin via data attributes or manually with your own JavaScript. <strong class="text-danger">In both situations, you must provide CSS for the positioning and width of your affixed content.</strong></p>
 
   <h3>Positioning via CSS</h3>
   <p>The affix plugin toggles between three classes, each representing a particular state: <code>.affix</code>, <code>.affix-top</code>, and <code>.affix-bottom</code>. You must provide the styles for these classes yourself (independent of this plugin) to handle the actual positions.</p>
-- 
cgit v1.2.3


From abbf6da6aaa37e337a527217982838bfff1d8027 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 22 May 2014 21:12:13 -0700
Subject: tighten up callouts and remove backgrounds

---
 docs/_includes/css/tables.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html
index affe17ffa..d9a1cd2cf 100644
--- a/docs/_includes/css/tables.html
+++ b/docs/_includes/css/tables.html
@@ -349,6 +349,20 @@
 
   <h2 id="tables-responsive">Responsive tables</h2>
   <p>Create responsive tables by wrapping any <code>.table</code> in <code>.table-responsive</code> to make them scroll horizontally on small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.</p>
+
+  <div class="bs-callout bs-callout-warning">
+    <h4>Firefox and fieldsets</h4>
+    <p>Firefox has some awkward fieldset styling involving <code>width</code> that interferes with the responsive table. This cannot be overriden without a Firefox-specific hack:</p>
+{% highlight css %}
+@-moz-document url-prefix() {
+  fieldset {
+    display: table-cell;
+  }
+}
+{% endhighlight %}
+    <p>For more information, read <a href="http://stackoverflow.com/questions/17408815/fieldset-resizes-wrong-appears-to-have-unremovable-min-width-min-content/17863685#17863685">this Stack Overflow answer</a>.</p>
+  </div>
+
   <div class="bs-example">
     <div class="table-responsive">
       <table class="table">
-- 
cgit v1.2.3


From 338cff13593a5e10abcab37da9f197fa4eafa3de Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 22 May 2014 21:39:47 -0700
Subject: clarify

---
 docs/_includes/css/tables.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html
index d9a1cd2cf..655545112 100644
--- a/docs/_includes/css/tables.html
+++ b/docs/_includes/css/tables.html
@@ -352,12 +352,10 @@
 
   <div class="bs-callout bs-callout-warning">
     <h4>Firefox and fieldsets</h4>
-    <p>Firefox has some awkward fieldset styling involving <code>width</code> that interferes with the responsive table. This cannot be overriden without a Firefox-specific hack:</p>
+    <p>Firefox has some awkward fieldset styling involving <code>width</code> that interferes with the responsive table. This cannot be overriden without a Firefox-specific hack that we <strong>don't</strong> provide in Bootstrap:</p>
 {% highlight css %}
 @-moz-document url-prefix() {
-  fieldset {
-    display: table-cell;
-  }
+  fieldset { display: table-cell; }
 }
 {% endhighlight %}
     <p>For more information, read <a href="http://stackoverflow.com/questions/17408815/fieldset-resizes-wrong-appears-to-have-unremovable-min-width-min-content/17863685#17863685">this Stack Overflow answer</a>.</p>
-- 
cgit v1.2.3