diff options
| author | Mark Otto <[email protected]> | 2015-12-07 09:25:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-12-07 09:25:28 -0800 |
| commit | ef5b6a224eb5d2f093f9a613cad26a68487d46d7 (patch) | |
| tree | d4b3a30abe26d89f7ef4ce7d00a5c35133f48a46 | |
| parent | a78b835143eb0b5c302a9ff4eccc99b302bbb598 (diff) | |
| parent | 2f176821c3c5439f83a5df4a176534d724e716b9 (diff) | |
| download | bootstrap-ef5b6a224eb5d2f093f9a613cad26a68487d46d7.tar.xz bootstrap-ef5b6a224eb5d2f093f9a613cad26a68487d46d7.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
| -rw-r--r-- | docs/_data/browser-bugs.yml | 10 | ||||
| -rw-r--r-- | docs/components/utilities.md | 8 | ||||
| -rw-r--r-- | docs/examples/dashboard/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/navbar/index.html | 2 | ||||
| -rw-r--r-- | docs/migration.md | 4 | ||||
| -rw-r--r-- | scss/_utilities.scss | 8 |
6 files changed, 24 insertions, 10 deletions
diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml index 074d9fd31..d8bd36696 100644 --- a/docs/_data/browser-bugs.yml +++ b/docs/_data/browser-bugs.yml @@ -292,6 +292,16 @@ - browser: > + Safari (iOS) + summary: > + Tapping on `<body>` doesn't fire `click` events + upstream_bug: > + WebKit#151933 + origin: > + Bootstrap#16028 + +- + browser: > Safari (iOS 9+) summary: > Sometimes excessive automatic zoom is applied after opening a modal, and the user isn't allowed to zoom out diff --git a/docs/components/utilities.md b/docs/components/utilities.md index c73db767f..940219263 100644 --- a/docs/components/utilities.md +++ b/docs/components/utilities.md @@ -121,13 +121,13 @@ Transform text in components with text capitalization classes. <p class="text-capitalize">CapiTaliZed text.</p> {% endexample %} -## Font weight and style +## Font weight and italics -Quickly change the weight and style of text. +Quickly change the weight (boldness) of text or italicize text. {% example html %} -<p class="font-normal">Normal text.</p> -<p class="font-bold">Bold text.</p> +<p class="font-weight-bold">Bold text.</p> +<p class="font-weight-normal">Normal weight text.</p> <p class="font-italic">Italicized text.</p> {% endexample %} diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 87c507c3d..764df3ecd 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -35,7 +35,7 @@ <a class="nav-item nav-link" href="#">Profile</a> <a class="nav-item nav-link" href="#">Help</a> </nav> - <form class="navbar-form pull-xs-right"> + <form class="pull-xs-right"> <input type="text" class="form-control" placeholder="Search..."> </form> </div> diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index 029ce8ed2..3eda94933 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -41,7 +41,7 @@ <a class="nav-link" href="#">About</a> </li> </ul> - <form class="form-inline navbar-form pull-xs-right"> + <form class="form-inline pull-xs-right"> <input class="form-control" type="text" placeholder="Search"> <button class="btn btn-success-outline" type="submit">Search</button> </form> diff --git a/docs/migration.md b/docs/migration.md index 0d1fd5211..5d14f34a7 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -102,6 +102,10 @@ New to Bootstrap 4 is the Reboot, a new stylesheet that builds on Normalize with - Dropped nearly all `>` selectors for simpler styling via un-nested classes. - Instead of HTML-specific selectors like `.nav > li > a`, we use separate classes for `.nav`s, `.nav-item`s, and `.nav-link`s. This makes your HTML more flexible while bringing along increased extensibility. +## Navbar + +- Dropped the `.navbar-form` class entirely. It's no longer necessary. + ### Pager - Renamed `.previous` and `.next` to `.pager-prev` and `.pager-next`. diff --git a/scss/_utilities.scss b/scss/_utilities.scss index 25ace532c..520666ec1 100644 --- a/scss/_utilities.scss +++ b/scss/_utilities.scss @@ -72,11 +72,11 @@ .text-uppercase { text-transform: uppercase !important; } .text-capitalize { text-transform: capitalize !important; } -// Weight +// Weight and italics -.font-normal { font-weight: normal; } -.font-bold { font-weight: bold; } -.font-italic { font-style: normal; } +.font-weight-normal { font-weight: normal; } +.font-weight-bold { font-weight: bold; } +.font-italic { font-style: italic; } // Contextual colors |