rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'v4-dev' into v4-docs-streamlined

Browse Source
This commit is contained in:
Mark Otto 2016-09-05 16:21:58 -07:00
commit c5a9091470
68 changed files with 207 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -28,10 +28,6 @@ cache:
env:
global:
- NPM_CONFIG_PROGRESS="false"
- SAUCE_USERNAME="bootstrap"
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
- secure: "RKWpS+P20b4tG9tawzCMJSmQftoonmC7tJzyGYiHuEM1TcpHALLBcnzKlr/+DiPTfzDJWY4kS8pxfhK4uXOe8OHnhpMNub7LEWtFPePlZIervOJcsOydaQocTKqVVWD6OUubMeQmQ+tZmvmpjoJ1uPPEbFs9ciF7+dv3U5tLUZ0="
- secure: "XswSKBY0HJ/aO9VOBeWlvGpqSFF/DsJmNKz7o5RkJMJX340qe44J929uUNwwOwlv9YrgptzC2W6l8bpmZQV+p6IYs99SoSA8CCaUfIJaqeU9x/UiT5vIHgqaNax+vFJwvzHLpF5v/ggFqFEKCd54gCDasePLTztHeC4oL104iaQ="
matrix:
- TWBS_TEST=core
- TWBS_TEST=validate-html

11
README.md
View File

@ -8,7 +8,8 @@
[![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
[![Meteor Atmosphere](https://img.shields.io/badge/meteor-twbs%3Abootstrap-blue.svg)](https://atmospherejs.com/twbs/bootstrap)
[![Packagist Prerelease](https://img.shields.io/packagist/vpre/twbs/bootstrap.svg)](https://packagist.org/packages/twbs/bootstrap)
[![NuGet](https://img.shields.io/nuget/vpre/bootstrap.svg)](https://www.nuget.org/packages/bootstrap/4.0.0-alpha3)
[![NuGet](https://img.shields.io/nuget/vpre/bootstrap.svg)](https://www.nuget.org/packages/bootstrap/4.0.0-alpha4)
[![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community.
@ -30,12 +31,12 @@ To get started, check out <http://getbootstrap.com>!
Several quick start options are available:
- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.3.zip)
- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.4.zip)
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
- Install with [npm](https://www.npmjs.com): `npm install bootstrap@4.0.0-alpha.3`
- Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap@=4.0.0-alpha.3`
- Install with [npm](https://www.npmjs.com): `npm install bootstrap@4.0.0-alpha.4`
- Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap@=4.0.0-alpha.4`
- Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`
- Install with [Bower](http://bower.io): `bower install bootstrap#v4.0.0-alpha.3`
- Install with [Bower](http://bower.io): `bower install bootstrap#v4.0.0-alpha.4`
- Install with [NuGet](https://www.nuget.org): CSS: `Install-Package bootstrap -Pre` Sass: `Install-Package bootstrap.sass -Pre` (`-Pre` is only required until Bootstrap v4 has a stable release).
Read the [Getting started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.

14
_config.yml
View File

@ -23,13 +23,13 @@ gems:
- jekyll-sitemap
# Custom vars
current_version: 4.0.0-alpha.3
current_version: 4.0.0-alpha.4
repo: https://github.com/twbs/bootstrap
slack: https://bootstrap-slack.herokuapp.com
download:
source: https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.3.zip
dist: https://github.com/twbs/bootstrap/releases/download/v4.0.0-alpha.3/bootstrap-4.0.0-alpha.3-dist.zip
source: https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.4.zip
dist: https://github.com/twbs/bootstrap/releases/download/v4.0.0-alpha.4/bootstrap-4.0.0-alpha.4-dist.zip
blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com
@ -37,10 +37,10 @@ themes: http://themes.getbootstrap.com
cdn:
# See https://www.srihash.org for info on how to generate the hashes
css: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.3/css/bootstrap.min.css
css_hash: "sha384-MIwDKRSSImVFAZCVLtU0LMDdON6KVCrZHyVQQj6e8wIEJkW4tvwqXrbMIya1vriY"
js: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.3/js/bootstrap.min.js
js_hash: "sha384-ux8v3A6CPtOTqOzMKiuo3d/DomGaaClxFYdCu2HPMBEkf6x2xiDyJ7gkXU0MWwaD"
css: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.4/css/bootstrap.min.css
css_hash: "2hfp1SzUoho7/TsGGGDaFdsuuDL0LX2hnUp6VkX3CUQ2K4K+xjboZdsXyp4oUHZj"
js: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.4/js/bootstrap.min.js
js_hash: "VjEeINv9OSwtWFLAtmc4JCtEJXXBub00gtSnszmspDLCtC0I4z4nqz7rEFbIZLLU"
jquery: https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js
jquery_hash: "sha384-THPy051/pYDQGanwU6poAc/hOdQxjnOEXzbT+OuUAFqNqFjL+4IGLBgCJC3ZOShY"
tether: https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js

57
dist/css/bootstrap.css
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v4.0.0-alpha.3 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha.4 (http://getbootstrap.com)
* Copyright 2011-2016 The Bootstrap Authors
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
@ -2097,14 +2097,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.has-success .form-control-feedback,
.has-success .form-control-label,
.has-success .radio,
.has-success .checkbox,
.has-success .radio-inline,
.has-success .checkbox-inline,
.has-success.radio label,
.has-success.checkbox label,
.has-success.radio-inline label,
.has-success.checkbox-inline label,
.has-success .form-check-label,
.has-success .form-check-inline,
.has-success .custom-control {
color: #5cb85c;
}
@ -2129,14 +2123,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.has-warning .form-control-feedback,
.has-warning .form-control-label,
.has-warning .radio,
.has-warning .checkbox,
.has-warning .radio-inline,
.has-warning .checkbox-inline,
.has-warning.radio label,
.has-warning.checkbox label,
.has-warning.radio-inline label,
.has-warning.checkbox-inline label,
.has-warning .form-check-label,
.has-warning .form-check-inline,
.has-warning .custom-control {
color: #f0ad4e;
}
@ -2161,14 +2149,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.has-danger .form-control-feedback,
.has-danger .form-control-label,
.has-danger .radio,
.has-danger .checkbox,
.has-danger .radio-inline,
.has-danger .checkbox-inline,
.has-danger.radio label,
.has-danger.checkbox label,
.has-danger.radio-inline label,
.has-danger.checkbox-inline label,
.has-danger .form-check-label,
.has-danger .form-check-inline,
.has-danger .custom-control {
color: #d9534f;
}
@ -4251,7 +4233,6 @@ input[type="button"].btn-block {
column-gap: 1.25rem;
}
.card-columns .card {
display: inline-block;
width: 100%;
}
}
@ -4486,7 +4467,7 @@ a.tag:focus, a.tag:hover {
}
.alert {
padding: 15px;
padding: 1rem;
margin-bottom: 1rem;
border: 1px solid transparent;
border-radius: 0.25rem;
@ -4501,13 +4482,13 @@ a.tag:focus, a.tag:hover {
}
.alert-dismissible {
padding-right: 35px;
padding-right: 2rem;
}
.alert-dismissible .close {
position: relative;
top: -2px;
right: -21px;
top: -.125rem;
right: -1rem;
color: inherit;
}
@ -5131,7 +5112,7 @@ button.close {
.modal.fade .modal-dialog {
-webkit-transition: -webkit-transform .3s ease-out;
transition: -webkit-transform .3s ease-out;
-o-transition: transform .3s ease-out, -o-transform .3s ease-out;
-o-transition: -o-transform .3s ease-out;
transition: transform .3s ease-out;
transition: transform .3s ease-out, -webkit-transform .3s ease-out, -o-transform .3s ease-out;
-webkit-transform: translate(0, -25%);
@ -5516,7 +5497,7 @@ button.close {
.carousel-inner > .carousel-item {
-webkit-transition: -webkit-transform .6s ease-in-out;
transition: -webkit-transform .6s ease-in-out;
-o-transition: transform .6s ease-in-out, -o-transform .6s ease-in-out;
-o-transition: -o-transform .6s ease-in-out;
transition: transform .6s ease-in-out;
transition: transform .6s ease-in-out, -webkit-transform .6s ease-in-out, -o-transform .6s ease-in-out;
-webkit-backface-visibility: hidden;
@ -6238,7 +6219,7 @@ a.bg-inverse:focus, a.bg-inverse:hover {
}
a.text-muted:focus, a.text-muted:hover {
color: #687077;
color: #687077 !important;
}
.text-primary {
@ -6246,7 +6227,7 @@ a.text-muted:focus, a.text-muted:hover {
}
a.text-primary:focus, a.text-primary:hover {
color: #025aa5;
color: #025aa5 !important;
}
.text-success {
@ -6254,7 +6235,7 @@ a.text-primary:focus, a.text-primary:hover {
}
a.text-success:focus, a.text-success:hover {
color: #449d44;
color: #449d44 !important;
}
.text-info {
@ -6262,7 +6243,7 @@ a.text-success:focus, a.text-success:hover {
}
a.text-info:focus, a.text-info:hover {
color: #31b0d5;
color: #31b0d5 !important;
}
.text-warning {
@ -6270,7 +6251,7 @@ a.text-info:focus, a.text-info:hover {
}
a.text-warning:focus, a.text-warning:hover {
color: #ec971f;
color: #ec971f !important;
}
.text-danger {
@ -6278,7 +6259,7 @@ a.text-warning:focus, a.text-warning:hover {
}
a.text-danger:focus, a.text-danger:hover {
color: #c9302c;
color: #c9302c !important;
}
.text-hide {

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

44
dist/js/bootstrap.js
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v4.0.0-alpha.3 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha.4 (http://getbootstrap.com)
* Copyright 2011-2016 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@ -20,7 +20,7 @@ if (typeof jQuery === 'undefined') {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): util.js
* Bootstrap (v4.0.0-alpha.4): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -190,7 +190,7 @@ var Util = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): alert.js
* Bootstrap (v4.0.0-alpha.4): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -204,7 +204,7 @@ var Alert = (function ($) {
*/
var NAME = 'alert';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -376,7 +376,7 @@ var Alert = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): button.js
* Bootstrap (v4.0.0-alpha.4): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -390,7 +390,7 @@ var Button = (function ($) {
*/
var NAME = 'button';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.button';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -544,7 +544,7 @@ var Button = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): carousel.js
* Bootstrap (v4.0.0-alpha.4): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -558,7 +558,7 @@ var Carousel = (function ($) {
*/
var NAME = 'carousel';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1020,7 +1020,7 @@ var Carousel = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): collapse.js
* Bootstrap (v4.0.0-alpha.4): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1034,7 +1034,7 @@ var Collapse = (function ($) {
*/
var NAME = 'collapse';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1378,7 +1378,7 @@ var Collapse = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): dropdown.js
* Bootstrap (v4.0.0-alpha.4): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1392,7 +1392,7 @@ var Dropdown = (function ($) {
*/
var NAME = 'dropdown';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1669,7 +1669,7 @@ var Dropdown = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): modal.js
* Bootstrap (v4.0.0-alpha.4): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1683,7 +1683,7 @@ var Modal = (function ($) {
*/
var NAME = 'modal';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -2196,7 +2196,7 @@ var Modal = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): scrollspy.js
* Bootstrap (v4.0.0-alpha.4): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -2210,7 +2210,7 @@ var ScrollSpy = (function ($) {
*/
var NAME = 'scrollspy';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -2511,7 +2511,7 @@ var ScrollSpy = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): tab.js
* Bootstrap (v4.0.0-alpha.4): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -2525,7 +2525,7 @@ var Tab = (function ($) {
*/
var NAME = 'tab';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -2770,7 +2770,7 @@ var Tab = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): tooltip.js
* Bootstrap (v4.0.0-alpha.4): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -2792,7 +2792,7 @@ var Tooltip = (function ($) {
*/
var NAME = 'tooltip';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
@ -3381,7 +3381,7 @@ var Tooltip = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): popover.js
* Bootstrap (v4.0.0-alpha.4): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -3395,7 +3395,7 @@ var Popover = (function ($) {
*/
var NAME = 'popover';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];

6
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

49
docs/components/forms.md
View File

@ -59,28 +59,29 @@ Remember, since Bootstrap utilizes the HTML5 doctype, **all inputs must have a `
</div>
<fieldset class="form-group">
<legend>Radio buttons</legend>
<div class="radio">
<label>
<input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
<div class="form-check">
<label class="form-check-label">
<input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked>
Option one is this and that&mdash;be sure to include why it's great
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
<div class="form-check">
<label class="form-check-label">
<input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios2" value="option2">
Option two can be something else and selecting it will deselect option one
</label>
</div>
<div class="radio disabled">
<label>
<input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
<div class="form-check disabled">
<label class="form-check-label">
<input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
Option three is disabled
</label>
</div>
</fieldset>
<div class="checkbox">
<label>
<input type="checkbox"> Check me out
<div class="form-check">
<label class="form-check-label">
<input type="checkbox" class="form-check-input">
Check me out
</label>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
@ -150,10 +151,8 @@ Below is a complete list of the specific form controls supported by Bootstrap an
<tr>
<td class="text-nowrap">
{% markdown %}
`.radio`<br>
`.radio-inline`<br>
`.checkbox`<br>
`.checkbox-inline`
`.form-check`<br>
`.form-check-inline`
{% endmarkdown %}
</td>
<td class="text-nowrap">
@ -730,21 +729,21 @@ Ensure that an alternative indication of state is also provided. For instance, y
{% endexample %}
{% example html %}
<div class="checkbox has-success">
<label>
<input type="checkbox" id="checkboxSuccess" value="option1">
<div class="form-check has-success">
<label class="form-check-label">
<input type="checkbox" class="form-check-input" id="checkboxSuccess" value="option1">
Checkbox with success
</label>
</div>
<div class="checkbox has-warning">
<label>
<input type="checkbox" id="checkboxWarning" value="option1">
<div class="form-check has-warning">
<label class="form-check-label">
<input type="checkbox" class="form-check-input" id="checkboxWarning" value="option1">
Checkbox with warning
</label>
</div>
<div class="checkbox has-danger">
<label>
<input type="checkbox" id="checkboxDanger" value="option1">
<div class="form-check has-danger">
<label class="form-check-label">
<input type="checkbox" class="form-check-input" id="checkboxDanger" value="option1">
Checkbox with danger
</label>
</div>

4
docs/components/input-group.md
View File

@ -200,7 +200,7 @@ Buttons in input groups are a bit different and require one extra level of nesti
<div class="input-group">
<div class="input-group-btn">
<button type="button" class="btn btn-secondary">Action</button>
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu">
@ -219,7 +219,7 @@ Buttons in input groups are a bit different and require one extra level of nesti
<input type="text" class="form-control" aria-label="Text input with segmented button dropdown">
<div class="input-group-btn">
<button type="button" class="btn btn-secondary">Action</button>
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu dropdown-menu-right">

57
docs/dist/css/bootstrap.css
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v4.0.0-alpha.3 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha.4 (http://getbootstrap.com)
* Copyright 2011-2016 The Bootstrap Authors
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
@ -2097,14 +2097,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.has-success .form-control-feedback,
.has-success .form-control-label,
.has-success .radio,
.has-success .checkbox,
.has-success .radio-inline,
.has-success .checkbox-inline,
.has-success.radio label,
.has-success.checkbox label,
.has-success.radio-inline label,
.has-success.checkbox-inline label,
.has-success .form-check-label,
.has-success .form-check-inline,
.has-success .custom-control {
color: #5cb85c;
}
@ -2129,14 +2123,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.has-warning .form-control-feedback,
.has-warning .form-control-label,
.has-warning .radio,
.has-warning .checkbox,
.has-warning .radio-inline,
.has-warning .checkbox-inline,
.has-warning.radio label,
.has-warning.checkbox label,
.has-warning.radio-inline label,
.has-warning.checkbox-inline label,
.has-warning .form-check-label,
.has-warning .form-check-inline,
.has-warning .custom-control {
color: #f0ad4e;
}
@ -2161,14 +2149,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.has-danger .form-control-feedback,
.has-danger .form-control-label,
.has-danger .radio,
.has-danger .checkbox,
.has-danger .radio-inline,
.has-danger .checkbox-inline,
.has-danger.radio label,
.has-danger.checkbox label,
.has-danger.radio-inline label,
.has-danger.checkbox-inline label,
.has-danger .form-check-label,
.has-danger .form-check-inline,
.has-danger .custom-control {
color: #d9534f;
}
@ -4251,7 +4233,6 @@ input[type="button"].btn-block {
column-gap: 1.25rem;
}
.card-columns .card {
display: inline-block;
width: 100%;
}
}
@ -4486,7 +4467,7 @@ a.tag:focus, a.tag:hover {
}
.alert {
padding: 15px;
padding: 1rem;
margin-bottom: 1rem;
border: 1px solid transparent;
border-radius: 0.25rem;
@ -4501,13 +4482,13 @@ a.tag:focus, a.tag:hover {
}
.alert-dismissible {
padding-right: 35px;
padding-right: 2rem;
}
.alert-dismissible .close {
position: relative;
top: -2px;
right: -21px;
top: -.125rem;
right: -1rem;
color: inherit;
}
@ -5131,7 +5112,7 @@ button.close {
.modal.fade .modal-dialog {
-webkit-transition: -webkit-transform .3s ease-out;
transition: -webkit-transform .3s ease-out;
-o-transition: transform .3s ease-out, -o-transform .3s ease-out;
-o-transition: -o-transform .3s ease-out;
transition: transform .3s ease-out;
transition: transform .3s ease-out, -webkit-transform .3s ease-out, -o-transform .3s ease-out;
-webkit-transform: translate(0, -25%);
@ -5516,7 +5497,7 @@ button.close {
.carousel-inner > .carousel-item {
-webkit-transition: -webkit-transform .6s ease-in-out;
transition: -webkit-transform .6s ease-in-out;
-o-transition: transform .6s ease-in-out, -o-transform .6s ease-in-out;
-o-transition: -o-transform .6s ease-in-out;
transition: transform .6s ease-in-out;
transition: transform .6s ease-in-out, -webkit-transform .6s ease-in-out, -o-transform .6s ease-in-out;
-webkit-backface-visibility: hidden;
@ -6238,7 +6219,7 @@ a.bg-inverse:focus, a.bg-inverse:hover {
}
a.text-muted:focus, a.text-muted:hover {
color: #687077;
color: #687077 !important;
}
.text-primary {
@ -6246,7 +6227,7 @@ a.text-muted:focus, a.text-muted:hover {
}
a.text-primary:focus, a.text-primary:hover {
color: #025aa5;
color: #025aa5 !important;
}
.text-success {
@ -6254,7 +6235,7 @@ a.text-primary:focus, a.text-primary:hover {
}
a.text-success:focus, a.text-success:hover {
color: #449d44;
color: #449d44 !important;
}
.text-info {
@ -6262,7 +6243,7 @@ a.text-success:focus, a.text-success:hover {
}
a.text-info:focus, a.text-info:hover {
color: #31b0d5;
color: #31b0d5 !important;
}
.text-warning {
@ -6270,7 +6251,7 @@ a.text-info:focus, a.text-info:hover {
}
a.text-warning:focus, a.text-warning:hover {
color: #ec971f;
color: #ec971f !important;
}
.text-danger {
@ -6278,7 +6259,7 @@ a.text-warning:focus, a.text-warning:hover {
}
a.text-danger:focus, a.text-danger:hover {
color: #c9302c;
color: #c9302c !important;
}
.text-hide {

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

4
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

44
docs/dist/js/bootstrap.js
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v4.0.0-alpha.3 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha.4 (http://getbootstrap.com)
* Copyright 2011-2016 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@ -20,7 +20,7 @@ if (typeof jQuery === 'undefined') {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): util.js
* Bootstrap (v4.0.0-alpha.4): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -190,7 +190,7 @@ var Util = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): alert.js
* Bootstrap (v4.0.0-alpha.4): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -204,7 +204,7 @@ var Alert = (function ($) {
*/
var NAME = 'alert';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -376,7 +376,7 @@ var Alert = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): button.js
* Bootstrap (v4.0.0-alpha.4): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -390,7 +390,7 @@ var Button = (function ($) {
*/
var NAME = 'button';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.button';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -544,7 +544,7 @@ var Button = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): carousel.js
* Bootstrap (v4.0.0-alpha.4): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -558,7 +558,7 @@ var Carousel = (function ($) {
*/
var NAME = 'carousel';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1020,7 +1020,7 @@ var Carousel = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): collapse.js
* Bootstrap (v4.0.0-alpha.4): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1034,7 +1034,7 @@ var Collapse = (function ($) {
*/
var NAME = 'collapse';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1378,7 +1378,7 @@ var Collapse = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): dropdown.js
* Bootstrap (v4.0.0-alpha.4): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1392,7 +1392,7 @@ var Dropdown = (function ($) {
*/
var NAME = 'dropdown';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -1669,7 +1669,7 @@ var Dropdown = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): modal.js
* Bootstrap (v4.0.0-alpha.4): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -1683,7 +1683,7 @@ var Modal = (function ($) {
*/
var NAME = 'modal';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -2196,7 +2196,7 @@ var Modal = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): scrollspy.js
* Bootstrap (v4.0.0-alpha.4): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -2210,7 +2210,7 @@ var ScrollSpy = (function ($) {
*/
var NAME = 'scrollspy';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -2511,7 +2511,7 @@ var ScrollSpy = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): tab.js
* Bootstrap (v4.0.0-alpha.4): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -2525,7 +2525,7 @@ var Tab = (function ($) {
*/
var NAME = 'tab';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@ -2770,7 +2770,7 @@ var Tab = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): tooltip.js
* Bootstrap (v4.0.0-alpha.4): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -2792,7 +2792,7 @@ var Tooltip = (function ($) {
*/
var NAME = 'tooltip';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
@ -3381,7 +3381,7 @@ var Tooltip = (function ($) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): popover.js
* Bootstrap (v4.0.0-alpha.4): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -3395,7 +3395,7 @@ var Popover = (function ($) {
*/
var NAME = 'popover';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];

6
docs/dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
docs/migration.md
View File

@ -80,7 +80,8 @@ New to Bootstrap 4 is the Reboot, a new stylesheet that builds on Normalize with
- Renamed `.table-condensed` to `.table-sm` for consistency.
- Added a new `.table-inverse` option.
- Added a new `.table-reflow` option.
- Added table header modifiers: `.thead-default` and `.thead-inverse`
- Added table header modifiers: `.thead-default` and `.thead-inverse`.
- Renamed contextual classes to have a `.table-`-prefix. Hence `.active`, `.success`, `.warning`, `.danger` and `.table-info` to `.table-active`, `.table-success`, `.table-warning`, `.table-danger` and `.table-info`.
### Forms

2
grunt/npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{
"name": "bootstrap",
"version": "4.0.0-alpha.3",
"version": "4.0.0-alpha.4",
"dependencies": {
"abbrev": {
"version": "1.0.9",

4
js/dist/alert.js vendored
View File

@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): alert.js
* Bootstrap (v4.0.0-alpha.4): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -20,7 +20,7 @@ var Alert = (function ($) {
*/
var NAME = 'alert';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';

2
js/dist/alert.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/button.js vendored
View File

@ -1,6 +1,6 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): button.js
* Bootstrap (v4.0.0-alpha.4): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -20,7 +20,7 @@ var Button = (function ($) {
*/
var NAME = 'button';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.button';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';

2
js/dist/button.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/carousel.js vendored
View File

@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): carousel.js
* Bootstrap (v4.0.0-alpha.4): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -20,7 +20,7 @@ var Carousel = (function ($) {
*/
var NAME = 'carousel';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';

2
js/dist/carousel.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/collapse.js vendored
View File

@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): collapse.js
* Bootstrap (v4.0.0-alpha.4): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -20,7 +20,7 @@ var Collapse = (function ($) {
*/
var NAME = 'collapse';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';

2
js/dist/collapse.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/dropdown.js vendored
View File

@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): dropdown.js
* Bootstrap (v4.0.0-alpha.4): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -20,7 +20,7 @@ var Dropdown = (function ($) {
*/
var NAME = 'dropdown';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';

2
js/dist/dropdown.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/modal.js vendored
View File

@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): modal.js
* Bootstrap (v4.0.0-alpha.4): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -20,7 +20,7 @@ var Modal = (function ($) {
*/
var NAME = 'modal';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';

2
js/dist/modal.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/popover.js vendored
View File

@ -10,7 +10,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): popover.js
* Bootstrap (v4.0.0-alpha.4): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -24,7 +24,7 @@ var Popover = (function ($) {
*/
var NAME = 'popover';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];

2
js/dist/popover.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/scrollspy.js vendored
View File

@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): scrollspy.js
* Bootstrap (v4.0.0-alpha.4): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -20,7 +20,7 @@ var ScrollSpy = (function ($) {
*/
var NAME = 'scrollspy';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';

2
js/dist/scrollspy.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/tab.js vendored
View File

@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): tab.js
* Bootstrap (v4.0.0-alpha.4): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -20,7 +20,7 @@ var Tab = (function ($) {
*/
var NAME = 'tab';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';

2
js/dist/tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/dist/tooltip.js vendored
View File

@ -8,7 +8,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): tooltip.js
* Bootstrap (v4.0.0-alpha.4): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -30,7 +30,7 @@ var Tooltip = (function ($) {
*/
var NAME = 'tooltip';
var VERSION = '4.0.0-alpha.3';
var VERSION = '4.0.0-alpha.4';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = '.' + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];

2
js/dist/tooltip.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
js/dist/util.js vendored
View File

@ -1,6 +1,6 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): util.js
* Bootstrap (v4.0.0-alpha.4): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/

2
js/dist/util.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
js/src/alert.js
View File

@ -3,7 +3,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): alert.js
* Bootstrap (v4.0.0-alpha.4): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -18,7 +18,7 @@ const Alert = (($) => {
*/
const NAME = 'alert'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.alert'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'

4
js/src/button.js
View File

@ -1,6 +1,6 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): button.js
* Bootstrap (v4.0.0-alpha.4): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -15,7 +15,7 @@ const Button = (($) => {
*/
const NAME = 'button'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.button'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'

4
js/src/carousel.js
View File

@ -3,7 +3,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): carousel.js
* Bootstrap (v4.0.0-alpha.4): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -18,7 +18,7 @@ const Carousel = (($) => {
*/
const NAME = 'carousel'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.carousel'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'

4
js/src/collapse.js
View File

@ -3,7 +3,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): collapse.js
* Bootstrap (v4.0.0-alpha.4): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -18,7 +18,7 @@ const Collapse = (($) => {
*/
const NAME = 'collapse'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.collapse'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'

4
js/src/dropdown.js
View File

@ -3,7 +3,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): dropdown.js
* Bootstrap (v4.0.0-alpha.4): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -18,7 +18,7 @@ const Dropdown = (($) => {
*/
const NAME = 'dropdown'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.dropdown'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'

4
js/src/modal.js
View File

@ -3,7 +3,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): modal.js
* Bootstrap (v4.0.0-alpha.4): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -18,7 +18,7 @@ const Modal = (($) => {
*/
const NAME = 'modal'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.modal'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'

4
js/src/popover.js
View File

@ -3,7 +3,7 @@ import Tooltip from './tooltip'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): popover.js
* Bootstrap (v4.0.0-alpha.4): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -18,7 +18,7 @@ const Popover = (($) => {
*/
const NAME = 'popover'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.popover'
const EVENT_KEY = `.${DATA_KEY}`
const JQUERY_NO_CONFLICT = $.fn[NAME]

4
js/src/scrollspy.js
View File

@ -3,7 +3,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): scrollspy.js
* Bootstrap (v4.0.0-alpha.4): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -18,7 +18,7 @@ const ScrollSpy = (($) => {
*/
const NAME = 'scrollspy'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.scrollspy'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'

4
js/src/tab.js
View File

@ -3,7 +3,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): tab.js
* Bootstrap (v4.0.0-alpha.4): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -18,7 +18,7 @@ const Tab = (($) => {
*/
const NAME = 'tab'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.tab'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'

4
js/src/tooltip.js
View File

@ -5,7 +5,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): tooltip.js
* Bootstrap (v4.0.0-alpha.4): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@ -28,7 +28,7 @@ const Tooltip = (($) => {
*/
const NAME = 'tooltip'
const VERSION = '4.0.0-alpha.3'
const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.tooltip'
const EVENT_KEY = `.${DATA_KEY}`
const JQUERY_NO_CONFLICT = $.fn[NAME]

2
js/src/util.js
View File

@ -1,6 +1,6 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.3): util.js
* Bootstrap (v4.0.0-alpha.4): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/

2
package.js
View File

@ -5,7 +5,7 @@
Package.describe({
name: 'twbs:bootstrap', // http://atmospherejs.com/twbs/bootstrap
summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.',
version: '4.0.0-alpha.3',
version: '4.0.0-alpha.4',
git: 'https://github.com/twbs/bootstrap.git'
});

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "4.0.0-alpha.3",
"version": "4.0.0-alpha.4",
"keywords": [
"css",
"sass",

2
scss/.scss-lint.yml
View File

@ -89,7 +89,7 @@ linters:
enabled: true
ImportantRule:
enabled: true
enabled: false
ImportPath:
enabled: true

6
scss/_alert.scss
View File

@ -26,13 +26,13 @@
// Expand the right padding and account for the close button's positioning.
.alert-dismissible {
padding-right: ($alert-padding + 20px);
padding-right: ($alert-padding * 2);
// Adjust close link position
.close {
position: relative;
top: -2px;
right: -21px;
top: -.125rem;
right: -$alert-padding;
color: inherit;
}
}

1
scss/_card.scss
View File

@ -314,7 +314,6 @@
column-gap: $card-columns-sm-up-column-gap;
.card {
display: inline-block;
width: 100%; // Don't let them exceed the column width
}
}

2
scss/_navbar.scss
View File

@ -214,7 +214,6 @@
//
// Custom override for collapse plugin in navbar.
// scss-lint:disable ImportantRule
.navbar-toggleable {
&-xs {
@include clearfix;
@ -255,4 +254,3 @@
}
}
}
// scss-lint:enable ImportantRule

2
scss/_print.scss
View File

@ -1,4 +1,4 @@
// scss-lint:disable ImportantRule, QualifyingElement
// scss-lint:disable QualifyingElement
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css

2
scss/_reboot.scss
View File

@ -1,4 +1,4 @@
// scss-lint:disable ImportantRule, QualifyingElement, DuplicateProperty
// scss-lint:disable QualifyingElement, DuplicateProperty
// Reboot
//

2
scss/_tables.scss
View File

@ -184,7 +184,6 @@
}
}
// scss-lint:disable ImportantRule
tr {
float: left;
@ -194,5 +193,4 @@
border: $table-border-width solid $table-border-color;
}
}
// scss-lint:enable ImportantRule
}

2
scss/_variables.scss
View File

@ -685,7 +685,7 @@ $modal-sm: 300px !default;
//
// Define alert colors, border radius, and padding.
$alert-padding: 15px !default;
$alert-padding: 1rem !default;
$alert-border-radius: $border-radius !default;
$alert-link-font-weight: bold !default;
$alert-border-width: $border-width !default;

2
scss/bootstrap.scss vendored
View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v4.0.0-alpha.3 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha.4 (http://getbootstrap.com)
* Copyright 2011-2016 The Bootstrap Authors
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

10
scss/mixins/_forms.scss
View File

@ -7,14 +7,8 @@
// Color the label and help text
.form-control-feedback,
.form-control-label,
.radio,
.checkbox,
.radio-inline,
.checkbox-inline,
&.radio label,
&.checkbox label,
&.radio-inline label,
&.checkbox-inline label,
.form-check-label,
.form-check-inline,
.custom-control {
color: $color;
}

2
scss/mixins/_grid-framework.scss
View File

@ -45,7 +45,7 @@
@for $i from 1 through $columns {
.col-#{$breakpoint}-#{$i} {
@include make-col($i, $columns, $gutter);
@include make-col($i, $columns);
}
}

4
scss/mixins/_grid.scss
View File

@ -33,7 +33,7 @@
margin-right: ($gutter / -2);
}
@mixin make-col-ready($columns: $grid-columns, $gutter: $grid-gutter-width) {
@mixin make-col-ready($gutter: $grid-gutter-width) {
position: relative;
min-height: 1px; // Prevent collapsing
padding-right: ($gutter / 2);
@ -47,7 +47,7 @@
}
}
@mixin make-col($size, $columns: $grid-columns, $gutter: $grid-gutter-width) {
@mixin make-col($size, $columns: $grid-columns) {
@if $enable-flex {
flex: 0 0 percentage($size / $columns);
// Add a `max-width` to ensure content within each column does not blow out

2
scss/mixins/_text-emphasis.scss
View File

@ -6,7 +6,7 @@
}
a#{$parent} {
@include hover-focus {
color: darken($color, 10%);
color: darken($color, 10%) !important;
}
}
}

2
scss/utilities/_visibility.scss
View File

@ -1,5 +1,3 @@
// scss-lint:disable ImportantRule
//
// Visibility utilities
//