diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
| commit | c4867cfedb6235708967aa8518c59ffed2816f0b (patch) | |
| tree | c7be6d18ee7c7a61f319bccacc035b9952171db1 /docs/content | |
| parent | 425d156df27fa6c18e979aa000bfe5a346ee3450 (diff) | |
| parent | 1b194c06607f6cc3d087d25d6d49e1698771f3a1 (diff) | |
| download | bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.tar.xz bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
# Conflicts:
# js/src/dropdown.js
Diffstat (limited to 'docs/content')
| -rw-r--r-- | docs/content/tables.md | 60 | ||||
| -rw-r--r-- | docs/content/typography.md | 1 |
2 files changed, 2 insertions, 59 deletions
diff --git a/docs/content/tables.md b/docs/content/tables.md index da847611f..234c2ec88 100644 --- a/docs/content/tables.md +++ b/docs/content/tables.md @@ -765,65 +765,7 @@ Responsive tables make use of `overflow-y: hidden`, which clips off any content </div> {% highlight html %} -<table class="table table-responsive""> +<table class="table table-responsive"> ... </table> {% endhighlight %} - - -### Reflow -Turn traditional tables on their side by using `table-reflow`. When using reflow, the table header becomes the first column of the table, the first row within the table body becomes the second column, the second row becomes the third column, etc. - -{% callout warning %} -#### Content order and complex tables - -Beware that the `table-reflow` style changes the visual order of content. Make sure that you only apply this style to well-formed and simple data tables (and in particular, don't use this for layout tables) with appropriate `<th>` table header cells for each row and column. - -In addition, this class will not work correctly for tables with cells that span multiple rows or columns (using `rowspan` or `colspan` attributes). - -{% endcallout %} - -{% example html %} -<table class="table table-reflow"> - <thead> - <tr> - <th>#</th> - <th>Table heading</th> - <th>Table heading</th> - <th>Table heading</th> - <th>Table heading</th> - <th>Table heading</th> - <th>Table heading</th> - </tr> - </thead> - <tbody> - <tr> - <th scope="row">1</th> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - </tr> - <tr> - <th scope="row">2</th> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - </tr> - <tr> - <th scope="row">3</th> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - <td>Table cell</td> - </tr> - </tbody> -</table> -{% endexample %} diff --git a/docs/content/typography.md b/docs/content/typography.md index 073734768..674b19b2e 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -17,6 +17,7 @@ Bootstrap includes simple and easily customized typography for headings, body te Bootstrap sets basic global display, typography, and link styles. Specifically, we: - Use a [native font stack]({{ site.baseurl }}/content/reboot/#native-font-stack) that selects the best `font-family` for each OS and device. +- For a more inclusive and accessible type scale, we assume the browser default root `font-size` (typically 16px) so visitors can customize their browser defaults as needed. - Use the `$font-family-base`, `$font-size-base`, and `$line-height-base` attributes as our typographic base applied to the `<body>`. - Set the global link color via `$link-color` and apply link underlines only on `:hover`. - Use `$body-bg` to set a `background-color` on the `<body>` (`#fff` by default). |