2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'v4-dev' into stretched-link

This commit is contained in:
XhmikosR
2018-12-05 11:38:55 +02:00
committed by GitHub
123 changed files with 829 additions and 1136 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

+4 -16
View File
File diff suppressed because one or more lines are too long
+5 -1
View File
@@ -10,7 +10,7 @@
* details, see https://creativecommons.org/licenses/by/3.0/.
*/
/* global ClipboardJS: false, bsCustomFileInput: false */
/* global ClipboardJS: false, anchors: false, bsCustomFileInput: false */
(function ($) {
'use strict'
@@ -101,6 +101,10 @@
.tooltip('_fixTitle')
})
anchors.options = {
icon: '#'
}
anchors.add('.bd-content > h2, .bd-content > h3, .bd-content > h4, .bd-content > h5')
$('.bd-content').children('h2, h3, h4, h5').wrapInner('<span class="bd-content-title"></span>')
bsCustomFileInput.init()
File diff suppressed because one or more lines are too long
+4 -9
View File
@@ -1,15 +1,10 @@
.bd-anchor {
padding-left: .25rem;
.anchorjs-link {
font-weight: 400;
color: $link-color;
opacity: 0;
@include transition(opacity .16s linear);
color: rgba($link-color, .5);
@include transition(color .15s ease-in-out, opacity .15s ease-in-out);
:hover > &,
&:hover,
&:focus {
&:hover {
color: $link-color;
text-decoration: none;
opacity: 1;
}
}
+44 -18
View File
@@ -10,14 +10,16 @@ toc: true
Bootstrap "spinners" can be used to show the loading state in your projects. They're built only with HTML and CSS, meaning you don't need any JavaScript to create them. You will, however, need some custom JavaScript to toggle their visibility. Their appearance, alignment, and sizing can be easily customized with our amazing utility classes.
For accessibility purposes, each loader here includes `role="status"` and `Loading...` text within. We account for this in our CSS, using a text hiding technique to prevent it from rendering on screen.
For accessibility purposes, each loader here includes `role="status"` and a nested `<span class="sr-only">Loading...</span>`.
## Border spinner
Use the border spinners for a lightweight loading indicator.
{% capture example %}
<div class="spinner-border" role="status">Loading...</div>
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
</div>
{% endcapture %}
{% include example.html content=example %}
@@ -27,7 +29,9 @@ The border spinner uses `currentColor` for its `border-color`, meaning you can c
{% capture example %}
{% for color in site.data.theme-colors %}
<div class="spinner-border text-{{ color.name }}" role="status">Loading...</div>{% endfor %}
<div class="spinner-border text-{{ color.name }}" role="status">
<span class="sr-only">Loading...</span>
</div>{% endfor %}
{% endcapture %}
{% include example.html content=example %}
@@ -41,7 +45,9 @@ The border spinner uses `currentColor` for its `border-color`, meaning you can c
If you don't fancy a border spinner, switch to the grow spinner. While it doesn't technically spin, it does repeatedly grow!
{% capture example %}
<div class="spinner-grow" role="status">Loading...</div>
<div class="spinner-grow" role="status">
<span class="sr-only">Loading...</span>
</div>
{% endcapture %}
{% include example.html content=example %}
@@ -49,7 +55,9 @@ Once again, this spinner is built with `currentColor`, so you can easily change
{% capture example %}
{% for color in site.data.theme-colors %}
<div class="spinner-grow text-{{ color.name }}" role="status">Loading...</div>{% endfor %}
<div class="spinner-grow text-{{ color.name }}" role="status">
<span class="sr-only">Loading...</span>
</div>{% endfor %}
{% endcapture %}
{% include example.html content=example %}
@@ -62,7 +70,9 @@ Spinners in Bootstrap are built with `rem`s, `currentColor`, and `display: inlin
Use [margin utilities][margin] like `.m-5` for easy spacing.
{% capture example %}
<div class="spinner-border m-5" role="status">Loading...</div>
<div class="spinner-border m-5" role="status">
<span class="sr-only">Loading...</span>
</div>
{% endcapture %}
{% include example.html content=example %}
@@ -74,7 +84,9 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
{% capture example %}
<div class="d-flex justify-content-center">
<div class="spinner-border" role="status">Loading...</div>
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
{% endcapture %}
{% include example.html content=example %}
@@ -82,7 +94,7 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
{% capture example %}
<div class="d-flex align-items-center">
<strong>Loading...</strong>
<div class="spinner-border ml-auto" role="status"></div>
<div class="spinner-border ml-auto" role="status" aria-hidden="true"></div>
</div>
{% endcapture %}
{% include example.html content=example %}
@@ -91,7 +103,9 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
{% capture example %}
<div class="clearfix">
<div class="spinner-border float-right" role="status">Loading...</div>
<div class="spinner-border float-right" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
{% endcapture %}
{% include example.html content=example %}
@@ -100,7 +114,9 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
{% capture example %}
<div class="text-center">
<div class="spinner-border" role="status">Loading...</div>
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
{% endcapture %}
{% include example.html content=example %}
@@ -110,16 +126,24 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
Add `.spinner-border-sm` and `.spinner-grow-sm` to make a smaller spinner that can quickly be used within other components.
{% capture example %}
<div class="spinner-border spinner-border-sm" role="status">Loading...</div>
<div class="spinner-grow spinner-grow-sm" role="status">Loading...</div>
<div class="spinner-border spinner-border-sm" role="status">
<span class="sr-only">Loading...</span>
</div>
<div class="spinner-grow spinner-grow-sm" role="status">
<span class="sr-only">Loading...</span>
</div>
{% endcapture %}
{% include example.html content=example %}
Or, use custom CSS or inline styles to change the dimensions as needed.
{% capture example %}
<div class="spinner-border" style="width: 3rem; height: 3rem;" role="status">Loading...</div>
<div class="spinner-grow" style="width: 3rem; height: 3rem;" role="status">Loading...</div>
<div class="spinner-border" style="width: 3rem; height: 3rem;" role="status">
<span class="sr-only">Loading...</span>
</div>
<div class="spinner-grow" style="width: 3rem; height: 3rem;" role="status">
<span class="sr-only">Loading...</span>
</div>
{% endcapture %}
{% include example.html content=example %}
@@ -129,10 +153,11 @@ Use spinners within buttons to indicate an action is currently processing or tak
{% capture example %}
<button class="btn btn-primary" type="button" disabled>
<span class="spinner-border spinner-border-sm" role="status">Loading...</span>
<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
<span class="sr-only">Loading...</span>
</button>
<button class="btn btn-primary" type="button" disabled>
<span class="spinner-border spinner-border-sm" role="status"></span>
<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
Loading...
</button>
{% endcapture %}
@@ -140,10 +165,11 @@ Use spinners within buttons to indicate an action is currently processing or tak
{% capture example %}
<button class="btn btn-primary" type="button" disabled>
<span class="spinner-grow spinner-grow-sm" role="status">Loading...</span>
<span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
<span class="sr-only">Loading...</span>
</button>
<button class="btn btn-primary" type="button" disabled>
<span class="spinner-grow spinner-grow-sm" role="status"></span>
<span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
Loading...
</button>
{% endcapture %}
+2 -2
View File
@@ -33,9 +33,9 @@ The default web fonts (Helvetica Neue, Helvetica, and Arial) have been dropped i
{% highlight sass %}
$font-family-sans-serif:
// Safari for OS X and iOS (San Francisco)
// Safari for macOS and iOS (San Francisco)
-apple-system,
// Chrome < 56 for OS X (San Francisco)
// Chrome < 56 for macOS (San Francisco)
BlinkMacSystemFont,
// Windows
"Segoe UI",
-11
View File
@@ -1,11 +0,0 @@
{
"env": {
"es6": false,
"jquery": true
},
"parserOptions": {
"ecmaVersion": 5,
"sourceType": "script"
},
"extends": "../../../../js/tests/unit/.eslintrc.json"
}
@@ -40,6 +40,7 @@ body {
margin-bottom: 0; /* Override default `<label>` margin */
line-height: 1.5;
color: #495057;
pointer-events: none;
cursor: text; /* Match the input under the label */
border: 1px solid transparent;
border-radius: .25rem;
+3 -1
View File
@@ -15,7 +15,9 @@ redirect_from:
{% if forloop.first %}<div class="row">{% endif %}
<div class="col-sm-6 col-md-4 col-xl-3 mb-3">
<a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/{{ example.name | slugify }}/">
<img class="img-thumbnail mb-3" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/screenshots/{{ example.name | slugify }}.png" alt="{{ example.name }} screenshot" width="960" height="600">
<img class="img-thumbnail mb-3" srcset="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}.png,
{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}@2x.png 2x"
src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}.png" alt="{{ example.name }} screenshot" width="480" height="300">
<h5 class="mb-1">{{ example.name }}</h5>
</a>
<p class="text-muted">{{ example.description }}</p>
+5 -3
View File
@@ -129,10 +129,12 @@ bootstrap/
├── dist/
│ ├── css/
│ └── js/
├── docs/
│ └── examples/
├── site/
│ └──docs/
│ └── 4.1/
│ └── examples/
├── js/
└── scss/
{% endhighlight %}
The `scss/` and `js/` are the source code for our CSS and JavaScript. The `dist/` folder includes everything listed in the precompiled download section above. The `docs/` folder includes the source code for our documentation, and `examples/` of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.
The `scss/` and `js/` are the source code for our CSS and JavaScript. The `dist/` folder includes everything listed in the precompiled download section above. The `site/docs/` folder includes the source code for our documentation, and `examples/` of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.
+1 -1
View File
@@ -8,7 +8,7 @@ toc: true
## Stable changes
Moving from Beta 3 to our stable v4.0 release, there are no breaking changes, but there are some notable changes.
Moving from Beta 3 to our stable v4.x release, there are no breaking changes, but there are some notable changes.
### Printing
- Fixed broken print utilities. Previously, using a `.d-print-*` class would unexpectedly overrule any other `.d-*` class. Now, they match our other display utilities and only apply to that media (`@media print`).