diff options
| author | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
| commit | 06f1293acfc767d950adc329cf4abfc2b5c0b78d (patch) | |
| tree | 738abb0672d3e0a5839a8657c431a202aa190ef0 /docs/css.html | |
| parent | d91d9b0ade9165c20d781ced128a751d0ae1fbda (diff) | |
| parent | a2f08158d032c1025ca0c6bf411b8282b606fb7b (diff) | |
| download | bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.tar.xz bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.zip | |
Merge branch 'master' into panels_and_tables
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/css.html')
| -rw-r--r-- | docs/css.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/css.html b/docs/css.html index 1c2c85170..f5e6596f3 100644 --- a/docs/css.html +++ b/docs/css.html @@ -3240,7 +3240,7 @@ a { <p>Easily truncate text with an ellipsis with a single mixin. <strong>Requires element to be <code>block</code> or <code>inline-block</code> level.</strong></p> {% highlight scss %} // Mixin -.text-truncate() { +.text-overflow() { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -3250,7 +3250,7 @@ a { .branch-name { display: inline-block; max-width: 200px; - .text-truncate(); + .text-overflow(); } {% endhighlight %} |