diff options
| author | Mark Otto <[email protected]> | 2014-04-08 20:51:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-04-08 20:51:56 -0700 |
| commit | 11a835f56662f8a93e2f8d27038c683d901a5a72 (patch) | |
| tree | e731f33d712272472b82c7c6b5de660735a78217 /docs/_includes/css | |
| parent | b57396944a39b21571848728b6ad479cd50537cd (diff) | |
| parent | 9863344e9a7ef47379c8308baa5647a07d332799 (diff) | |
| download | bootstrap-11a835f56662f8a93e2f8d27038c683d901a5a72.tar.xz bootstrap-11a835f56662f8a93e2f8d27038c683d901a5a72.zip | |
Merge branch 'master' into equal-height-experiment
Diffstat (limited to 'docs/_includes/css')
| -rw-r--r-- | docs/_includes/css/tables.html | 2 | ||||
| -rw-r--r-- | docs/_includes/css/type.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html index 99db2af72..affe17ffa 100644 --- a/docs/_includes/css/tables.html +++ b/docs/_includes/css/tables.html @@ -348,7 +348,7 @@ <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 up to small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.</p> + <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-example"> <div class="table-responsive"> <table class="table"> diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html index 2ea046519..da81d7414 100644 --- a/docs/_includes/css/type.html +++ b/docs/_includes/css/type.html @@ -146,10 +146,10 @@ You can use the mark tag to <mark>highlight</mark> text. <h3>Underlined text</h3> <p>To underline text use the <code><u></code> tag.</p> <div class="bs-example"> - <p><u>This line of text is will render as underlined</u></p> + <p><u>This line of text will render as underlined</u></p> </div> {% highlight html %} -<u>This line of text is will render as underlined</u> +<u>This line of text will render as underlined</u> {% endhighlight %} <p>Make use of HTML's default emphasis tags with lightweight styles.</p> |