mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-03-23 16:00:23 +00:00
Merge branch 'v4-dev' into v4-form-sizing
This commit is contained in:
Mark Otto
commit
e455b6b8d2
18 changed files with 147 additions and 208 deletions
|
|
@ -2130,7 +2130,7 @@ pre code {
|
|||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
select.form-control:not([size], [multiple]) {
|
||||
select.form-control:not([size]):not([multiple]) {
|
||||
height: 2.25rem;
|
||||
}
|
||||
|
||||
|
|
@ -3145,11 +3145,6 @@ input[type="button"].btn-block {
|
|||
z-index: 990;
|
||||
}
|
||||
|
||||
.pull-right > .dropdown-menu {
|
||||
right: 0;
|
||||
left: auto;
|
||||
}
|
||||
|
||||
.dropup .caret,
|
||||
.navbar-fixed-bottom .dropdown .caret {
|
||||
content: "";
|
||||
|
|
|
|||
BIN
dist/css/bootstrap.css.map
vendored
BIN
dist/css/bootstrap.css.map
vendored
Binary file not shown.
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
BIN
dist/css/bootstrap.min.css.map
vendored
BIN
dist/css/bootstrap.min.css.map
vendored
Binary file not shown.
|
|
@ -280,16 +280,6 @@
|
|||
origin: >
|
||||
Bootstrap#14603
|
||||
|
||||
-
|
||||
browser: >
|
||||
Safari (iOS)
|
||||
summary: >
|
||||
Text input's cursor doesn't move while scrolling the page.
|
||||
upstream_bug: >
|
||||
WebKit#138201, Safari#18819624
|
||||
origin: >
|
||||
Bootstrap#14708
|
||||
|
||||
-
|
||||
browser: >
|
||||
Safari (iOS)
|
||||
|
|
|
|||
|
|
@ -639,7 +639,7 @@ Bootstrap includes validation styles for danger, warning, and success states on
|
|||
- To use, add `.has-warning`, `.has-danger`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles.
|
||||
- Validation icons are `url()`s configured via Sass variables that are applied to `background-image` declarations for each state.
|
||||
- You may use your own base64 PNGs or SVGs by updating the Sass variables and recompiling.
|
||||
- Icons can also be disabled entirely by changing the variables to `non` or commenting out the source Sass.
|
||||
- Icons can also be disabled entirely by setting the variables to `none` or commenting out the source Sass.
|
||||
|
||||
{% comment %}
|
||||
{% callout warning %}
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ Embedding YouTube videos in modals requires additional JavaScript not in Bootstr
|
|||
|
||||
## Optional sizes
|
||||
|
||||
Modals have two optional sizes, available via modifier classes to be placed on a `.modal-dialog`. These size kick in at certain breakpoints to avoid horizontal scrollbars on narrower viewports.
|
||||
Modals have two optional sizes, available via modifier classes to be placed on a `.modal-dialog`. These sizes kick in at certain breakpoints to avoid horizontal scrollbars on narrower viewports.
|
||||
|
||||
<div class="bd-example">
|
||||
<button type="button" class="btn btn-primary" data-toggle="modal" data-target=".bd-example-modal-lg">Large modal</button>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@ Here are some representative examples of these classes:
|
|||
}
|
||||
{% endhighlight %}
|
||||
|
||||
Additionally, Bootstrap also includes an `.m-x-auto` class for centering fixed-width block level content by setting the horizontal margins to `auto`.
|
||||
### Horizontal centering
|
||||
Additionally, Bootstrap also includes an `.m-x-auto` class for horizontally centering fixed-width block level content by setting the horizontal margins to `auto`.
|
||||
|
||||
<div class="bd-example">
|
||||
<div class="m-x-auto" style="width: 200px; background-color: rgba(86,61,124,.15);">
|
||||
|
|
@ -69,7 +70,7 @@ Additionally, Bootstrap also includes an `.m-x-auto` class for centering fixed-w
|
|||
</div>
|
||||
|
||||
{% highlight html %}
|
||||
<div class="m-x-auto" style="width: 200px;"">
|
||||
<div class="m-x-auto" style="width: 200px;">
|
||||
Centered element
|
||||
</div>
|
||||
{% endhighlight %}
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ While not shown above, feel free to use `<b>` and `<i>` in HTML5. `<b>` is meant
|
|||
|
||||
## Text utilities
|
||||
|
||||
Change text alignment, transform, style, weight, and color with our [text utilities](http://localhost:9001/components/utilities/#text-alignment).
|
||||
Change text alignment, transform, style, weight, and color with our [text utilities]({{ site.baseurl }}/components/utilities/#text-alignment).
|
||||
|
||||
## Abbreviations
|
||||
|
||||
|
|
|
|||
|
|
@ -2130,7 +2130,7 @@ pre code {
|
|||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
select.form-control:not([size], [multiple]) {
|
||||
select.form-control:not([size]):not([multiple]) {
|
||||
height: 2.25rem;
|
||||
}
|
||||
|
||||
|
|
@ -3145,11 +3145,6 @@ input[type="button"].btn-block {
|
|||
z-index: 990;
|
||||
}
|
||||
|
||||
.pull-right > .dropdown-menu {
|
||||
right: 0;
|
||||
left: auto;
|
||||
}
|
||||
|
||||
.dropup .caret,
|
||||
.navbar-fixed-bottom .dropdown .caret {
|
||||
content: "";
|
||||
|
|
|
|||
BIN
docs/dist/css/bootstrap.css.map
vendored
BIN
docs/dist/css/bootstrap.css.map
vendored
Binary file not shown.
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
BIN
docs/dist/css/bootstrap.min.css.map
vendored
BIN
docs/dist/css/bootstrap.min.css.map
vendored
Binary file not shown.
90
grunt/npm-shrinkwrap.json
generated
90
grunt/npm-shrinkwrap.json
generated
|
|
@ -315,8 +315,8 @@
|
|||
"resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"
|
||||
},
|
||||
"caniuse-db": {
|
||||
"version": "1.0.30000407",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000407.tgz"
|
||||
"version": "1.0.30000408",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000408.tgz"
|
||||
},
|
||||
"cardinal": {
|
||||
"version": "0.5.0",
|
||||
|
|
@ -510,26 +510,6 @@
|
|||
"version": "0.0.3",
|
||||
"resolved": "https://registry.npmjs.org/css-mq-parser/-/css-mq-parser-0.0.3.tgz"
|
||||
},
|
||||
"csscomb": {
|
||||
"version": "3.1.8",
|
||||
"resolved": "https://registry.npmjs.org/csscomb/-/csscomb-3.1.8.tgz",
|
||||
"dependencies": {
|
||||
"commander": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
"csscomb-core": {
|
||||
"version": "3.0.0-3.1",
|
||||
"resolved": "https://registry.npmjs.org/csscomb-core/-/csscomb-core-3.0.0-3.1.tgz",
|
||||
"dependencies": {
|
||||
"minimatch": {
|
||||
"version": "0.2.12",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ctype": {
|
||||
"version": "0.5.3",
|
||||
"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
|
||||
|
|
@ -735,8 +715,8 @@
|
|||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.3.tgz",
|
||||
"dependencies": {
|
||||
"argparse": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.5.tgz"
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.6.tgz"
|
||||
},
|
||||
"espree": {
|
||||
"version": "2.2.5",
|
||||
|
|
@ -994,10 +974,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"gonzales-pe": {
|
||||
"version": "3.0.0-28",
|
||||
"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.0.0-28.tgz"
|
||||
},
|
||||
"graceful-fs": {
|
||||
"version": "4.1.3",
|
||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"
|
||||
|
|
@ -1188,10 +1164,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"grunt-csscomb": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/grunt-csscomb/-/grunt-csscomb-3.1.0.tgz"
|
||||
},
|
||||
"grunt-eslint": {
|
||||
"version": "17.3.1",
|
||||
"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-17.3.1.tgz"
|
||||
|
|
@ -1549,8 +1521,8 @@
|
|||
"resolved": "https://registry.npmjs.org/jscs/-/jscs-2.9.0.tgz",
|
||||
"dependencies": {
|
||||
"argparse": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.5.tgz"
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.6.tgz"
|
||||
},
|
||||
"esprima": {
|
||||
"version": "2.7.2",
|
||||
|
|
@ -1567,28 +1539,6 @@
|
|||
"minimatch": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
|
||||
},
|
||||
"vow": {
|
||||
"version": "0.4.12",
|
||||
"resolved": "https://registry.npmjs.org/vow/-/vow-0.4.12.tgz"
|
||||
},
|
||||
"vow-fs": {
|
||||
"version": "0.3.4",
|
||||
"resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz",
|
||||
"dependencies": {
|
||||
"glob": {
|
||||
"version": "4.5.3",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
|
||||
},
|
||||
"minimatch": {
|
||||
"version": "2.0.10",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
"vow-queue": {
|
||||
"version": "0.4.2",
|
||||
"resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.2.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -1873,8 +1823,8 @@
|
|||
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-5.1.0.tgz",
|
||||
"dependencies": {
|
||||
"argparse": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.5.tgz"
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.6.tgz"
|
||||
},
|
||||
"entities": {
|
||||
"version": "1.1.1",
|
||||
|
|
@ -4233,30 +4183,22 @@
|
|||
"resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
|
||||
},
|
||||
"vow": {
|
||||
"version": "0.4.4",
|
||||
"resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz"
|
||||
"version": "0.4.12",
|
||||
"resolved": "https://registry.npmjs.org/vow/-/vow-0.4.12.tgz"
|
||||
},
|
||||
"vow-fs": {
|
||||
"version": "0.3.2",
|
||||
"resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.2.tgz",
|
||||
"version": "0.3.4",
|
||||
"resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz",
|
||||
"dependencies": {
|
||||
"glob": {
|
||||
"version": "3.2.8",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.8.tgz"
|
||||
},
|
||||
"minimatch": {
|
||||
"version": "0.2.14",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
|
||||
},
|
||||
"node-uuid": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"
|
||||
"version": "4.5.3",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
"vow-queue": {
|
||||
"version": "0.3.1",
|
||||
"resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.3.1.tgz"
|
||||
"version": "0.4.2",
|
||||
"resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.2.tgz"
|
||||
},
|
||||
"which": {
|
||||
"version": "1.0.9",
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
}
|
||||
|
||||
select.form-control {
|
||||
&:not([size], [multiple]) {
|
||||
&:not([size]):not([multiple]) {
|
||||
height: $input-height;
|
||||
}
|
||||
}
|
||||
|
|
@ -289,17 +289,17 @@ input[type="checkbox"] {
|
|||
|
||||
|
||||
// .form-control-success {
|
||||
// background-image: url("#{$form-icon-success}");
|
||||
// background-image: $form-icon-success;
|
||||
// border-color: $brand-success;
|
||||
// }
|
||||
//
|
||||
// .form-control-warning {
|
||||
// background-image: url("#{$form-icon-warning}");
|
||||
// background-image: $form-icon-warning;
|
||||
// border-color: $brand-warning;
|
||||
// }
|
||||
//
|
||||
// .form-control-error {
|
||||
// background-image: url("#{$form-icon-danger}");
|
||||
// background-image: $form-icon-danger;
|
||||
// border-color: $brand-danger;
|
||||
// }
|
||||
|
||||
|
|
|
|||
200
scss/_print.scss
200
scss/_print.scss
|
|
@ -8,107 +8,109 @@
|
|||
// http://www.phpied.com/delay-loading-your-print-css/
|
||||
// ==========================================================================
|
||||
|
||||
@media print {
|
||||
*,
|
||||
*::before,
|
||||
*::after,
|
||||
*::first-letter,
|
||||
*::first-line {
|
||||
// Bootstrap specific; comment out `color` and `background`
|
||||
//color: #000 !important; // Black prints faster:
|
||||
// http://www.sanbeiji.com/archives/953
|
||||
text-shadow: none !important;
|
||||
//background: transparent !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
|
||||
a,
|
||||
a:visited {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
// Bootstrap specific; comment the following selector out
|
||||
//a[href]::after {
|
||||
// content: " (" attr(href) ")";
|
||||
//}
|
||||
|
||||
abbr[title]::after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
|
||||
// Bootstrap specific; comment the following selector out
|
||||
//
|
||||
// Don't show links that are fragment identifiers,
|
||||
// or use the `javascript:` pseudo protocol
|
||||
//
|
||||
|
||||
//a[href^="#"]::after,
|
||||
//a[href^="javascript:"]::after {
|
||||
// content: "";
|
||||
//}
|
||||
|
||||
pre,
|
||||
blockquote {
|
||||
border: $border-width solid #999; // Bootstrap custom code; using `$border-width` instead of 1px
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
|
||||
//
|
||||
// Printing Tables:
|
||||
// http://css-discuss.incutio.com/wiki/Printing_Tables
|
||||
//
|
||||
|
||||
thead {
|
||||
display: table-header-group;
|
||||
}
|
||||
|
||||
tr,
|
||||
img {
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
|
||||
p,
|
||||
h2,
|
||||
h3 {
|
||||
orphans: 3;
|
||||
widows: 3;
|
||||
}
|
||||
|
||||
h2,
|
||||
h3 {
|
||||
page-break-after: avoid;
|
||||
}
|
||||
|
||||
// Bootstrap specific changes start
|
||||
|
||||
// Bootstrap components
|
||||
.navbar {
|
||||
display: none;
|
||||
}
|
||||
.btn,
|
||||
.dropup > .btn {
|
||||
> .caret {
|
||||
border-top-color: #000 !important;
|
||||
@if $enable-print-styles {
|
||||
@media print {
|
||||
*,
|
||||
*::before,
|
||||
*::after,
|
||||
*::first-letter,
|
||||
*::first-line {
|
||||
// Bootstrap specific; comment out `color` and `background`
|
||||
//color: #000 !important; // Black prints faster:
|
||||
// http://www.sanbeiji.com/archives/953
|
||||
text-shadow: none !important;
|
||||
//background: transparent !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
}
|
||||
.label {
|
||||
border: $border-width solid #000;
|
||||
}
|
||||
|
||||
.table {
|
||||
border-collapse: collapse !important;
|
||||
|
||||
td,
|
||||
th {
|
||||
background-color: #fff !important;
|
||||
a,
|
||||
a:visited {
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
.table-bordered {
|
||||
th,
|
||||
td {
|
||||
border: 1px solid #ddd !important;
|
||||
}
|
||||
}
|
||||
|
||||
// Bootstrap specific changes end
|
||||
// Bootstrap specific; comment the following selector out
|
||||
//a[href]::after {
|
||||
// content: " (" attr(href) ")";
|
||||
//}
|
||||
|
||||
abbr[title]::after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
|
||||
// Bootstrap specific; comment the following selector out
|
||||
//
|
||||
// Don't show links that are fragment identifiers,
|
||||
// or use the `javascript:` pseudo protocol
|
||||
//
|
||||
|
||||
//a[href^="#"]::after,
|
||||
//a[href^="javascript:"]::after {
|
||||
// content: "";
|
||||
//}
|
||||
|
||||
pre,
|
||||
blockquote {
|
||||
border: $border-width solid #999; // Bootstrap custom code; using `$border-width` instead of 1px
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
|
||||
//
|
||||
// Printing Tables:
|
||||
// http://css-discuss.incutio.com/wiki/Printing_Tables
|
||||
//
|
||||
|
||||
thead {
|
||||
display: table-header-group;
|
||||
}
|
||||
|
||||
tr,
|
||||
img {
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
|
||||
p,
|
||||
h2,
|
||||
h3 {
|
||||
orphans: 3;
|
||||
widows: 3;
|
||||
}
|
||||
|
||||
h2,
|
||||
h3 {
|
||||
page-break-after: avoid;
|
||||
}
|
||||
|
||||
// Bootstrap specific changes start
|
||||
|
||||
// Bootstrap components
|
||||
.navbar {
|
||||
display: none;
|
||||
}
|
||||
.btn,
|
||||
.dropup > .btn {
|
||||
> .caret {
|
||||
border-top-color: #000 !important;
|
||||
}
|
||||
}
|
||||
.label {
|
||||
border: $border-width solid #000;
|
||||
}
|
||||
|
||||
.table {
|
||||
border-collapse: collapse !important;
|
||||
|
||||
td,
|
||||
th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
}
|
||||
.table-bordered {
|
||||
th,
|
||||
td {
|
||||
border: 1px solid #ddd !important;
|
||||
}
|
||||
}
|
||||
|
||||
// Bootstrap specific changes end
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,8 +34,7 @@ html {
|
|||
//
|
||||
// @viewport is needed because IE 10+ doesn't honor <meta name="viewport"> in
|
||||
// some cases. See http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/.
|
||||
// Eventually @viewport will replace <meta name="viewport">. It's been manually
|
||||
// prefixed for forward-compatibility.
|
||||
// Eventually @viewport will replace <meta name="viewport">.
|
||||
//
|
||||
// However, `device-width` is broken on IE 10 on Windows (Phone) 8,
|
||||
// (see http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ and https://github.com/twbs/bootstrap/issues/10497)
|
||||
|
|
|
|||
|
|
@ -17,6 +17,18 @@
|
|||
// Fonts
|
||||
// Components
|
||||
|
||||
@mixin _assert-ascending($map, $map-name) {
|
||||
$prev-key: null;
|
||||
$prev-num: null;
|
||||
@each $key, $num in $map {
|
||||
@if $prev-num != null and $prev-num >= $num {
|
||||
@warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !";
|
||||
}
|
||||
$prev-key: $key;
|
||||
$prev-num: $num;
|
||||
}
|
||||
}
|
||||
|
||||
// General variable structure
|
||||
//
|
||||
// Variable format should follow the `$component-modifier-state-property` order.
|
||||
|
|
@ -50,6 +62,7 @@ $enable-gradients: false !default;
|
|||
$enable-transitions: false !default;
|
||||
$enable-hover-media-query: false !default;
|
||||
$enable-grid-classes: true !default;
|
||||
$enable-print-styles: true !default;
|
||||
|
||||
|
||||
// Spacing
|
||||
|
|
@ -111,6 +124,7 @@ $grid-breakpoints: (
|
|||
lg: 992px,
|
||||
xl: 1200px
|
||||
) !default;
|
||||
@include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
|
||||
|
||||
|
||||
// Grid containers
|
||||
|
|
@ -123,6 +137,7 @@ $container-max-widths: (
|
|||
lg: 940px,
|
||||
xl: 1140px
|
||||
) !default;
|
||||
@include _assert-ascending($container-max-widths, "$container-max-widths");
|
||||
|
||||
|
||||
// Grid columns
|
||||
|
|
|
|||
Loading…
Reference in a new issue