aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-07-09 13:51:20 -0700
committerMark Otto <[email protected]>2014-07-09 13:51:20 -0700
commit4d5243674a0a236af2ff218da1decaafbdeaa719 (patch)
tree8cc6bf8248cc1abea4793acf48def8433757ed77 /docs/_includes
parentf37dbe53a46b6deb8f37bfe1008f30b1275e49c6 (diff)
downloadbootstrap-4d5243674a0a236af2ff218da1decaafbdeaa719.tar.xz
bootstrap-4d5243674a0a236af2ff218da1decaafbdeaa719.zip
remove deprecated warnings from docs
Diffstat (limited to 'docs/_includes')
-rw-r--r--docs/_includes/components/dropdowns.html4
-rw-r--r--docs/_includes/components/navs.html19
-rw-r--r--docs/_includes/css/helpers.html1
-rw-r--r--docs/_includes/css/responsive-utilities.html2
-rw-r--r--docs/_includes/js/modal.html12
5 files changed, 19 insertions, 19 deletions
diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html
index 4462900ef..eabfd9ca7 100644
--- a/docs/_includes/components/dropdowns.html
+++ b/docs/_includes/components/dropdowns.html
@@ -40,10 +40,6 @@
<h4>May require additional positioning</h4>
<p>Dropdowns are automatically positioned via CSS within the normal flow of the document. This means dropdowns may be cropped by parents with certain <code>overflow</code> properties or appear out of bounds of the viewport. Address these issues on your own as they arise.</p>
</div>
- <div class="bs-callout bs-callout-warning">
- <h4>Deprecated <code>.pull-right</code> alignment</h4>
- <p>As of v3.1.0, we've deprecated <code>.pull-right</code> on dropdown menus. To right-align a menu, use <code>.dropdown-menu-right</code>. Right-aligned nav components in the navbar use a mixin version of this class to automatically align the menu. To override it, use <code>.dropdown-menu-left</code>.</p>
- </div>
{% highlight html %}
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dLabel">
...
diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html
index 5fc151b1e..9e7600ac4 100644
--- a/docs/_includes/components/navs.html
+++ b/docs/_includes/components/navs.html
@@ -3,6 +3,25 @@
<p class="lead">Navs available in Bootstrap have shared markup, starting with the base <code>.nav</code> class, as well as shared states. Swap modifier classes to switch between each style.</p>
+ <h2 id="nav-basic">Basic nav</h2>
+ <p>Uses no modifier classes. No supported active state by default, given highly customizable nature of nav styles.</p>
+ <div class="bs-example">
+ <ul class="nav" role="tablist">
+ <li>
+ <a href="#">Active</a>
+ </li>
+ <li>
+ <a href="#">Link</a>
+ </li>
+ <li>
+ <a href="#">Another link</a>
+ </li>
+ <li class="disabled">
+ <a href="#">Disabled</a>
+ </li>
+ </ul>
+ </div>
+
<h2 id="nav-tabs">Tabs</h2>
<p>Note the <code>.nav-tabs</code> class requires the <code>.nav</code> base class.</p>
<div class="bs-example">
diff --git a/docs/_includes/css/helpers.html b/docs/_includes/css/helpers.html
index fa7a99fc0..dc992ee23 100644
--- a/docs/_includes/css/helpers.html
+++ b/docs/_includes/css/helpers.html
@@ -132,7 +132,6 @@
<h3 id="helper-classes-show-hide">Showing and hiding content</h3>
<p>Force an element to be shown or hidden (<strong>including for screen readers</strong>) with the use of <code>.show</code> and <code>.hidden</code> classes. These classes use <code>!important</code> to avoid specificity conflicts, just like the <a href="#helper-classes-floats">quick floats</a>. They are only available for block level toggling. They can also be used as mixins.</p>
- <p><code>.hide</code> is available, but it does not always affect screen readers and is <strong>deprecated</strong> as of v3.0.1. Use <code>.hidden</code> or <code>.sr-only</code> instead.</p>
<p>Furthermore, <code>.invisible</code> can be used to toggle only the visibility of an element, meaning its <code>display</code> is not modified and the element can still affect the flow of the document.</p>
{% highlight html %}
<div class="show">...</div>
diff --git a/docs/_includes/css/responsive-utilities.html b/docs/_includes/css/responsive-utilities.html
index 666c0bce7..2e4c8b383 100644
--- a/docs/_includes/css/responsive-utilities.html
+++ b/docs/_includes/css/responsive-utilities.html
@@ -119,7 +119,6 @@
</table>
</div>
<p>So, for extra small (<code>xs</code>) screens for example, the available <code>.visible-*-*</code> classes are: <code>.visible-xs-block</code>, <code>.visible-xs-inline</code>, and <code>.visible-xs-inline-block</code>.</p>
- <p>The classes <code>.visible-xs</code>, <code>.visible-sm</code>, <code>.visible-md</code>, and <code>.visible-lg</code> also exist, but are <strong>deprecated as of v3.2.0</strong>. They are approximately equivalent to <code>.visible-*-block</code>, except with additional special cases for toggling <code>&lt;table&gt;</code>-related elements.</p>
<h2 id="responsive-utilities-print">Print classes</h2>
<p>Similar to the regular responsive classes, use these for toggling content for print.</p>
@@ -150,7 +149,6 @@
</tbody>
</table>
</div>
- <p>The class <code>.visible-print</code> also exists but is <strong>deprecated</strong> as of v3.2.0. It is approximately equivalent to <code>.visible-print-block</code>, except with additional special cases for <code>&lt;table&gt;</code>-related elements.</p>
<h2 id="responsive-utilities-tests">Test cases</h2>
diff --git a/docs/_includes/js/modal.html b/docs/_includes/js/modal.html
index 18bfad78a..a64b6b1b6 100644
--- a/docs/_includes/js/modal.html
+++ b/docs/_includes/js/modal.html
@@ -255,18 +255,6 @@
<td>true</td>
<td>Shows the modal when initialized.</td>
</tr>
- <tr>
- <td>remote</td>
- <td>path</td>
- <td>false</td>
- <td>
- <p><span class="text-danger">This option is deprecated since v3.2.1 and will be removed in v4.</span> We recommend instead using client-side templating or a data binding framework, or calling <a href="http://api.jquery.com/load/">jQuery.load</a> yourself.</p>
- <p>If a remote URL is provided, <strong>content will be loaded one time</strong> via jQuery's <code>load</code> method and injected into the <code>.modal-content</code> div. If you're using the data-api, you may alternatively use the <code>href</code> attribute to specify the remote source. An example of this is shown below:</p>
-{% highlight html %}
-<a data-toggle="modal" href="remote.html" data-target="#modal">Click me</a>
-{% endhighlight %}
- </td>
- </tr>
</tbody>
</table>
</div><!-- /.table-responsive -->