diff options
| author | Gijs Boddeus <[email protected]> | 2017-08-25 23:29:40 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-25 23:29:40 +0200 |
| commit | 4356d08abb4d94785af15f3cc9be0e553f1c1c03 (patch) | |
| tree | ce649fd410b7e9a38758ef8318e1d9aba5eef3e8 /docs/4.0/content | |
| parent | a103958975787653b4ba84f80d1d1e8f7be302c3 (diff) | |
| parent | ba6a6f13691000ffaf22ef8e731513737659447f (diff) | |
| download | bootstrap-4356d08abb4d94785af15f3cc9be0e553f1c1c03.tar.xz bootstrap-4356d08abb4d94785af15f3cc9be0e553f1c1c03.zip | |
Merge pull request #3 from twbs/v4-dev
update from official repo
Diffstat (limited to 'docs/4.0/content')
| -rw-r--r-- | docs/4.0/content/reboot.md | 6 | ||||
| -rw-r--r-- | docs/4.0/content/tables.md | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/docs/4.0/content/reboot.md b/docs/4.0/content/reboot.md index f42332874..63a576c6f 100644 --- a/docs/4.0/content/reboot.md +++ b/docs/4.0/content/reboot.md @@ -35,8 +35,6 @@ The default web fonts (Helvetica Neue, Helvetica, and Arial) have been dropped i $font-family-sans-serif: // Safari for OS X and iOS (San Francisco) -apple-system, - // Chrome >= 56 for OS X (San Francisco), Windows, Linux and Android - system-ui, // Chrome < 56 for OS X (San Francisco) BlinkMacSystemFont, // Windows @@ -44,7 +42,9 @@ $font-family-sans-serif: // Android "Roboto", // Basic web fallback - "Helvetica Neue", Arial, sans-serif !default; + "Helvetica Neue", Arial, sans-serif, + // Emoji fonts + "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; {% endhighlight %} This `font-family` is applied to the `<body>` and automatically inherited globally throughout Bootstrap. To switch the global `font-family`, update `$font-family-base` and recompile Bootstrap. diff --git a/docs/4.0/content/tables.md b/docs/4.0/content/tables.md index db05e8378..9de7c5553 100644 --- a/docs/4.0/content/tables.md +++ b/docs/4.0/content/tables.md @@ -45,10 +45,10 @@ Using the most basic table markup, here's how `.table`-based tables look in Boot </table> {% endexample %} -You can also invert the colors—with light text on dark backgrounds—with `.table-inverse`. +You can also invert the colors—with light text on dark backgrounds—with `.table-dark`. {% example html %} -<table class="table table-inverse"> +<table class="table table-dark"> <thead> <tr> <th>#</th> @@ -82,11 +82,11 @@ You can also invert the colors—with light text on dark backgrounds—with `.ta ## Table head options -Similar to default and inverse tables, use one of two modifier classes to make `<thead>`s appear light or dark gray. +Similar to tables and dark tables, use the modifier classes `.thead-light` or `.thead-dark` to make `<thead>`s appear light or dark gray. {% example html %} <table class="table"> - <thead class="thead-inverse"> + <thead class="thead-dark"> <tr> <th>#</th> <th>First Name</th> @@ -117,7 +117,7 @@ Similar to default and inverse tables, use one of two modifier classes to make ` </table> <table class="table"> - <thead class="thead-default"> + <thead class="thead-light"> <tr> <th>#</th> <th>First Name</th> @@ -186,7 +186,7 @@ Use `.table-striped` to add zebra-striping to any table row within the `<tbody>` {% endexample %} {% example html %} -<table class="table table-striped table-inverse"> +<table class="table table-striped table-dark"> <thead> <tr> <th>#</th> @@ -261,7 +261,7 @@ Add `.table-bordered` for borders on all sides of the table and cells. {% endexample %} {% example html %} -<table class="table table-bordered table-inverse"> +<table class="table table-bordered table-dark"> <thead> <tr> <th>#</th> @@ -335,7 +335,7 @@ Add `.table-hover` to enable a hover state on table rows within a `<tbody>`. {% endexample %} {% example html %} -<table class="table table-hover table-inverse"> +<table class="table table-hover table-dark"> <thead> <tr> <th>#</th> @@ -403,7 +403,7 @@ Add `.table-sm` to make tables more compact by cutting cell padding in half. {% endexample %} {% example html %} -<table class="table table-sm table-inverse"> +<table class="table table-sm table-dark"> <thead> <tr> <th>#</th> @@ -487,10 +487,10 @@ Use contextual classes to color table rows or individual cells. </tr> {% endhighlight %} -Regular table background variants are not available with the inverse table, however, you may use [text or background utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/colors/) to achieve similar styles. +Regular table background variants are not available with the dark table, however, you may use [text or background utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/colors/) to achieve similar styles. <div class="bd-example"> - <table class="table table-inverse"> + <table class="table table-dark"> <thead> <tr> <th>#</th> |