rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Browse Source
This commit is contained in:
Mark Otto 2015-12-07 09:25:28 -08:00
commit ef5b6a224e
6 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/_data/browser-bugs.yml
View File

@ -290,6 +290,16 @@
origin: > origin: >
Bootstrap#11266, Bootstrap#13098 Bootstrap#11266, Bootstrap#13098
-
browser: >
Safari (iOS)
summary: >
Tapping on `<body>` doesn't fire `click` events
upstream_bug: >
WebKit#151933
origin: >
Bootstrap#16028
- -
browser: > browser: >
Safari (iOS 9+) Safari (iOS 9+)

8
docs/components/utilities.md
View File

@ -121,13 +121,13 @@ Transform text in components with text capitalization classes.
<p class="text-capitalize">CapiTaliZed text.</p> <p class="text-capitalize">CapiTaliZed text.</p>
{% endexample %} {% 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 %} {% example html %}
<p class="font-normal">Normal text.</p> <p class="font-weight-bold">Bold text.</p>
<p class="font-bold">Bold text.</p> <p class="font-weight-normal">Normal weight text.</p>
<p class="font-italic">Italicized text.</p> <p class="font-italic">Italicized text.</p>
{% endexample %} {% endexample %}

2
docs/examples/dashboard/index.html
View File

@ -35,7 +35,7 @@
<a class="nav-item nav-link" href="#">Profile</a> <a class="nav-item nav-link" href="#">Profile</a>
<a class="nav-item nav-link" href="#">Help</a> <a class="nav-item nav-link" href="#">Help</a>
</nav> </nav>
<form class="navbar-form pull-xs-right"> <form class="pull-xs-right">
<input type="text" class="form-control" placeholder="Search..."> <input type="text" class="form-control" placeholder="Search...">
</form> </form>
</div> </div>

2
docs/examples/navbar/index.html
View File

@ -41,7 +41,7 @@
<a class="nav-link" href="#">About</a> <a class="nav-link" href="#">About</a>
</li> </li>
</ul> </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"> <input class="form-control" type="text" placeholder="Search">
<button class="btn btn-success-outline" type="submit">Search</button> <button class="btn btn-success-outline" type="submit">Search</button>
</form> </form>

4
docs/migration.md
View File

@ -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. - 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. - 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 ### Pager
- Renamed `.previous` and `.next` to `.pager-prev` and `.pager-next`. - Renamed `.previous` and `.next` to `.pager-prev` and `.pager-next`.

8
scss/_utilities.scss
View File

@ -72,11 +72,11 @@
.text-uppercase { text-transform: uppercase !important; } .text-uppercase { text-transform: uppercase !important; }
.text-capitalize { text-transform: capitalize !important; } .text-capitalize { text-transform: capitalize !important; }
// Weight // Weight and italics
.font-normal { font-weight: normal; } .font-weight-normal { font-weight: normal; }
.font-bold { font-weight: bold; } .font-weight-bold { font-weight: bold; }
.font-italic { font-style: normal; } .font-italic { font-style: italic; }
// Contextual colors // Contextual colors