aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-31 23:53:54 -0700
committerMark Otto <[email protected]>2012-03-31 23:53:54 -0700
commitd652af10971d79cde92336700e156c63ff2c0b24 (patch)
tree0882f3941cee3cf7ea19fa03c7b3ccc402de8ccb /docs
parent452ddc0f0dd5cfd3bb867e17d603c98d6db2ec19 (diff)
downloadbootstrap-d652af10971d79cde92336700e156c63ff2c0b24.tar.xz
bootstrap-d652af10971d79cde92336700e156c63ff2c0b24.zip
fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin56958 -> 57027 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css9
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--docs/base-css.html7
-rw-r--r--docs/templates/pages/base-css.mustache7
5 files changed, 26 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7f6f5dd76..674503a73 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index a8457dc45..106fed157 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -139,6 +139,15 @@
.container-fluid {
padding: 0;
}
+ .dl-horizontal dt {
+ float: none;
+ clear: none;
+ width: auto;
+ text-align: left;
+ }
+ .dl-horizontal dd {
+ margin-left: 0;
+ }
.container {
width: auto;
}
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 02949da9f..201d917a8 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -458,6 +458,9 @@ dd {
margin-left: 9px;
}
.dl-horizontal dt {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
float: left;
clear: left;
width: 120px;
diff --git a/docs/base-css.html b/docs/base-css.html
index 0a1ea0d9d..647b396c6 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -371,7 +371,14 @@
<dd>Donec id elit non mi porta gravida at eget metus.</dd>
<dt>Malesuada porta</dt>
<dd>Etiam porta sem malesuada magna mollis euismod.</dd>
+ <dt>Felis euismod semper eget lacinia</dt>
+ <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd>
</dl>
+ <hr>
+ <p>
+ <span class="label label-info">Heads up!</span>
+ Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.
+ </p>
</div>
</div><!-- /row -->
</section>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 0b6e17e69..66bf70474 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -294,7 +294,14 @@
<dd>Donec id elit non mi porta gravida at eget metus.</dd>
<dt>Malesuada porta</dt>
<dd>Etiam porta sem malesuada magna mollis euismod.</dd>
+ <dt>Felis euismod semper eget lacinia</dt>
+ <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd>
</dl>
+ <hr>
+ <p>
+ <span class="label label-info">{{_i}}Heads up!{{/i}}</span>
+ {{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.{{/i}}
+ </p>
</div>
</div><!-- /row -->
</section>