mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
Merge branch 'v4-dev' into v4-docs-streamlined
This commit is contained in:
Mark Otto
+24
-25
@@ -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—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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
+19
-38
@@ -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 {
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+2
-2
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
+22
-22
@@ -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];
|
||||
|
||||
Vendored
+3
-3
File diff suppressed because one or more lines are too long
+2
-1
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user