aboutsummaryrefslogtreecommitdiff
path: root/css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-11-06 14:04:54 -0800
committerMark Otto <[email protected]>2013-11-06 14:04:54 -0800
commit6df6723c156ab565c7b6341fc58582fceadd7649 (patch)
tree4cc372a56ece6b8250b1bcadf433f6e5ea1853ca /css.html
parentb593df183087d88940d7af3e59b401685ada3dfe (diff)
parent3887f540b978d593f433bfef15888bc2d103de72 (diff)
downloadbootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.tar.xz
bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.zip
Merge branch 'master' into docs_derp
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to 'css.html')
-rw-r--r--css.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/css.html b/css.html
index 3542f87c0..495092e12 100644
--- a/css.html
+++ b/css.html
@@ -320,7 +320,7 @@ base_url: "../"
{% endhighlight %}
<h3 id="grid-responsive-resets">Responsive column resets</h3>
- <p>With the four tiers of grids available you're bound to run into issues where, at certain breakpoints, your columns don't clear quite right as one is taller than the other. To fix that, use a combination of a <code>.clearfix</code> and our <a href="../css#responsive-utilities">responsive utility classes</a>.</p>
+ <p>With the four tiers of grids available you're bound to run into issues where, at certain breakpoints, your columns don't clear quite right as one is taller than the other. To fix that, use a combination of a <code>.clearfix</code> and our <a href="#responsive-utilities">responsive utility classes</a>.</p>
<div class="bs-docs-grid">
<div class="row show-grid">
<div class="col-xs-6 col-sm-3">
@@ -2272,7 +2272,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<div class="bs-callout bs-callout-warning">
<h4>Responsive images</h4>
- <p>Looking for how to make images more responsive? <a href="../css#overview-responsive-images">Check out the responsive images section</a> up top.</p>
+ <p>Looking for how to make images more responsive? <a href="#overview-responsive-images">Check out the responsive images section</a> up top.</p>
</div>
</div>
@@ -2384,7 +2384,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<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="../css/#helper-classes-floats">quick floats</a>. They are only available for block level toggling. They can also be used as mixins.</p>
+ <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 %}