diff options
| author | Mark Otto <[email protected]> | 2016-05-11 16:28:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-05-11 16:28:28 -0700 |
| commit | d74a897f55ff01258b81e05c94a8126a819b8601 (patch) | |
| tree | da0d7dfee345fe04dcf4f02b0526e31e0b1e4bbe | |
| parent | 7fa88b3b8af37d05c312af02e0e3d3f47fb06b78 (diff) | |
| download | bootstrap-d74a897f55ff01258b81e05c94a8126a819b8601.tar.xz bootstrap-d74a897f55ff01258b81e05c94a8126a819b8601.zip | |
Overhaul tables docs and use rgba() colors for inverse tables
- Add inverse examples for all variants
- Use rgba() colors for hover and accent states for easy usage in inverse styles
| -rw-r--r-- | docs/content/tables.md | 135 | ||||
| -rw-r--r-- | scss/_tables.scss | 48 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 |
3 files changed, 164 insertions, 23 deletions
diff --git a/docs/content/tables.md b/docs/content/tables.md index fc6a6b19b..3b4d58b36 100644 --- a/docs/content/tables.md +++ b/docs/content/tables.md @@ -188,6 +188,39 @@ Use `.table-striped` to add zebra-striping to any table row within the `<tbody>` </table> {% endexample %} +{% example html %} +<table class="table table-striped table-inverse"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">1</th> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <th scope="row">2</th> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <th scope="row">3</th> + <td>Larry</td> + <td>the Bird</td> + <td>@twitter</td> + </tr> + </tbody> +</table> +{% endexample %} + ## Bordered table Add `.table-bordered` for borders on all sides of the table and cells. @@ -230,6 +263,44 @@ Add `.table-bordered` for borders on all sides of the table and cells. </table> {% endexample %} +{% example html %} +<table class="table table-bordered table-inverse"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">1</th> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <th scope="row">2</th> + <td>Mark</td> + <td>Otto</td> + <td>@TwBootstrap</td> + </tr> + <tr> + <th scope="row">3</th> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <th scope="row">4</th> + <td colspan="2">Larry the Bird</td> + <td>@twitter</td> + </tr> + </tbody> +</table> +{% endexample %} + ## Hoverable rows Add `.table-hover` to enable a hover state on table rows within a `<tbody>`. @@ -266,6 +337,38 @@ Add `.table-hover` to enable a hover state on table rows within a `<tbody>`. </table> {% endexample %} +{% example html %} +<table class="table table-hover table-inverse"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">1</th> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <th scope="row">2</th> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <th scope="row">3</th> + <td colspan="2">Larry the Bird</td> + <td>@twitter</td> + </tr> + </tbody> +</table> +{% endexample %} + ## Small table Add `.table-sm` to make tables more compact by cutting cell padding in half. @@ -302,6 +405,38 @@ Add `.table-sm` to make tables more compact by cutting cell padding in half. </table> {% endexample %} +{% example html %} +<table class="table table-sm table-inverse"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">1</th> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <th scope="row">2</th> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <th scope="row">3</th> + <td colspan="2">Larry the Bird</td> + <td>@twitter</td> + </tr> + </tbody> +</table> +{% endexample %} + ## Contextual classes Use contextual classes to color table rows or individual cells. diff --git a/scss/_tables.scss b/scss/_tables.scss index c04e7c9b8..d865884ec 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -99,24 +99,9 @@ @include table-row-variant(danger, $state-danger-bg); -// Responsive tables +// Inverse styles // -// Wrap your tables in `.table-responsive` and we'll make them mobile friendly -// by enabling horizontal scrolling. Only applies <768px. Everything above that -// will display normally. - -.table-responsive { - display: block; - width: 100%; - min-height: .01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837) - overflow-x: auto; - - // TODO: find out if we need this still. - // - // border: $table-border-width solid $table-border-color; - // -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057 -} - +// Same table markup, but inverted color scheme—dark background and light text. .thead-inverse { th { @@ -124,6 +109,7 @@ background-color: $gray-dark; } } + .thead-default { th { color: $gray; @@ -135,15 +121,35 @@ color: $gray-lighter; background-color: $gray-dark; - &.table-bordered { - border: 0; - } - th, td, thead th { border-color: $gray; } + + &.table-bordered { + border: 0; + } +} + + + +// Responsive tables +// +// Wrap your tables in `.table-responsive` and we'll make them mobile friendly +// by enabling horizontal scrolling. Only applies <768px. Everything above that +// will display normally. + +.table-responsive { + display: block; + width: 100%; + min-height: .01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837) + overflow-x: auto; + + // TODO: find out if we need this still. + // + // border: $table-border-width solid $table-border-color; + // -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057 } diff --git a/scss/_variables.scss b/scss/_variables.scss index 5be979545..a98f4edbe 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -244,8 +244,8 @@ $table-cell-padding: .75rem !default; $table-sm-cell-padding: .3rem !default; $table-bg: transparent !default; -$table-bg-accent: #f9f9f9 !default; -$table-bg-hover: #f5f5f5 !default; +$table-bg-accent: rgba(0,0,0,.05) !default; +$table-bg-hover: rgba(0,0,0,.075) !default; $table-bg-active: $table-bg-hover !default; $table-border-width: $border-width !default; |
