From f47ad79538458c4fe787335a5873c00073c5c2c9 Mon Sep 17 00:00:00 2001
From: Attila Dobi <dobiattila@gmail.com>
Date: Tue, 15 Apr 2014 10:46:58 +0300
Subject: add `target` option to Affix plugin

---
 docs/_includes/js/affix.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'docs/_includes/js/affix.html')

diff --git a/docs/_includes/js/affix.html b/docs/_includes/js/affix.html
index cfd32ec35..5b6fec0bb 100644
--- a/docs/_includes/js/affix.html
+++ b/docs/_includes/js/affix.html
@@ -62,6 +62,13 @@
          <td>10</td>
          <td>Pixels to offset from screen when calculating position of scroll. If a single number is provided, the offset will be applied in both top and bottom directions. To provide a unique, bottom and top offset just provide an object <code>offset: { top: 10 }</code> or <code>offset: { top: 10, bottom: 5 }</code>. Use a function when you need to dynamically calculate an offset.</td>
        </tr>
+       <tr>
+         <td>target</td>
+         <td>selector | node | jQuery element</td>
+         <td>the <code>window</code> object</td>
+         <td>Specifies the target element of the affix.</td>
+       </tr>
+
       </tbody>
     </table>
   </div><!-- /.table-responsive -->
-- 
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/js/affix.html')

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