From baba07cc43cc17c7d05c646e6e183e77713ffd3c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 2 Jul 2017 04:51:53 +0300 Subject: [PATCH 1/4] Add Bootstrap's very first spinners omfg it's actually happening --- scss/_spinners.scss | 69 +++++++++++ scss/_variables.scss | 11 ++ scss/bootstrap.scss | 1 + site/_data/nav.yml | 1 + site/docs/4.1/components/spinners.md | 167 +++++++++++++++++++++++++++ 5 files changed, 249 insertions(+) create mode 100644 scss/_spinners.scss create mode 100644 site/docs/4.1/components/spinners.md diff --git a/scss/_spinners.scss b/scss/_spinners.scss new file mode 100644 index 000000000000..4235662b3f4e --- /dev/null +++ b/scss/_spinners.scss @@ -0,0 +1,69 @@ +// +// Rotating border +// + +@keyframes spinner-border { + to { transform: rotate(360deg); } +} + +.spinner-border { + position: relative; + display: inline-block; + width: $spinner-width; + height: $spinner-height; + overflow: hidden; + text-indent: -999em; + vertical-align: text-bottom; + border: $spinner-border-width solid; + border-color: currentColor transparent currentColor currentColor; + border-radius: 50%; + animation-name: spinner-border; + animation-duration: .75s; + animation-timing-function: linear; + animation-iteration-count: infinite; +} + +.spinner-border-sm { + width: $spinner-width-sm; + height: $spinner-height-sm; + border-width: $spinner-border-width-sm; +} + +// +// Growing circle +// + +@keyframes spinner-grow { + 0% { + opacity: 0; + transform: scale(0); + } + 50% { + opacity: 1; + } + 100% { + opacity: 0; + transform: scale(1); + } +} + +.spinner-grow { + position: relative; + display: inline-block; + width: $spinner-width; + height: $spinner-height; + overflow: hidden; + text-indent: -999em; + vertical-align: text-bottom; + background-color: currentColor; + border-radius: 50%; + animation-name: spinner-grow; + animation-duration: .75s; + animation-timing-function: linear; + animation-iteration-count: infinite; +} + +.spinner-grow-sm { + width: $spinner-width-sm; + height: $spinner-height-sm; +} diff --git a/scss/_variables.scss b/scss/_variables.scss index dac260c19708..c636860bdadc 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1024,6 +1024,17 @@ $carousel-transition-duration: .6s !default; $carousel-transition: transform $carousel-transition-duration ease-in-out !default; // Define transform transition first if using multiple transitions (e.g., `transform 2s ease, opacity .5s ease-out`) +// Spinners + +$spinner-width: 2rem !default; +$spinner-height: $spinner-width !default; +$spinner-border-width: .25em !default; + +$spinner-width-sm: 1rem !default; +$spinner-height-sm: $spinner-width-sm !default; +$spinner-border-width-sm: .2em !default; + + // Close $close-font-size: $font-size-base * 1.5 !default; diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index e3f76546b24a..6f7e4eef15bf 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -38,5 +38,6 @@ @import "tooltip"; @import "popover"; @import "carousel"; +@import "spinners"; @import "utilities"; @import "print"; diff --git a/site/_data/nav.yml b/site/_data/nav.yml index 14002d395155..cb0defd890f4 100644 --- a/site/_data/nav.yml +++ b/site/_data/nav.yml @@ -49,6 +49,7 @@ - title: Popovers - title: Progress - title: Scrollspy + - title: Spinners - title: Tooltips - title: Utilities diff --git a/site/docs/4.1/components/spinners.md b/site/docs/4.1/components/spinners.md new file mode 100644 index 000000000000..878c2a7de4c2 --- /dev/null +++ b/site/docs/4.1/components/spinners.md @@ -0,0 +1,167 @@ +--- +layout: docs +title: Spinners +description: Indicate the loading state of a component or page with Bootstrap spinners, built entirely with HTML, CSS, and no JavaScript. +group: components +toc: true +--- + +## About + +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. + +## Border spinner + +Use the border spinners for a lightweight loading indicator. + +{% capture example %} + +{% endcapture %} +{% include example.html content=example %} + +### Colors + +The border spinner uses `currentColor` for its `border-color`, meaning you can customize the color with [text color utilities][color]. Here's the regular border spinner in blue. + +
+ +
+ +Use any of our text color utilities on the standard spinner. + +{% highlight html %} +{% for color in site.data.theme-colors %} +{% endfor %} +{% endhighlight %} + +{% capture callout %} +**Why not use `border-color` utilities?** Each border spinner specifies a `transparent` border for at least one side, so `.border-{color}` utilities would override that. +{% endcapture %} +{% include callout.html content=callout type="info" %} + +## Growing spinner + +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 %} + +{% endcapture %} +{% include example.html content=example %} + +Once again, this spinner is built with `currentColor`, so you can easily change its appearance with [text color utilities][color]. Here it is in blue, along with the supported variants. + +
+ +
+ +{% highlight html %} +{% for color in site.data.theme-colors %} +{% endfor %} +{% endhighlight %} + +## Alignment + +Spinners in Bootstrap are built with `rem`s, `currentColor`, and `display: inline-flex`. This means they can easily be resized, recolored, and quickly aligned. + +### Margin + +Use [margin utilities][margin] like `.m-5` for easy spacing. + +{% capture example %} + +{% endcapture %} +{% include example.html content=example %} + +### Placement + +Use [flexbox utilities][flex], [float utilities][float], or [text alignment][text] utilities to place spinners exactly where you need them in any situation. + +#### Flex + +{% capture example %} +
+ +
+{% endcapture %} +{% include example.html content=example %} + +{% capture example %} +
+ Loading... + +
+{% endcapture %} +{% include example.html content=example %} + +#### Floats + +{% capture example %} +
+ +
+{% endcapture %} +{% include example.html content=example %} + +#### Text align + +{% capture example %} +
+ +
+{% endcapture %} +{% include example.html content=example %} + +## Size + +Add `.spinner-border-sm` and `.spinner-grow-sm` to make a smaller spinner that can quickly be used within other components. + +{% capture example %} + + +{% endcapture %} +{% include example.html content=example %} + +Or, use custom CSS or inline styles to change the dimensions as needed. + +{% capture example %} + + +{% endcapture %} +{% include example.html content=example %} + +## Buttons + +Use spinners within buttons to indicate an action is currently processing or taking place. You may also swap the text out of the spinner element and utilize button text as needed. + +{% capture example %} + + +{% endcapture %} +{% include example.html content=example %} + +{% capture example %} + + +{% endcapture %} +{% include example.html content=example %} + + +[color]: {{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/colors/ +[display]: {{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/display/ +[flex]: {{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/flex/ +[float]: {{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/float/ +[margin]: {{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/spacing/ +[sizing]: {{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/sizing/ +[text]: {{ site.baseurl }}/docs/{{ site.docs_version }}/content/typography/ From 23ca80698642ca4cc33fac27c85c2b14c75abc55 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 14 Sep 2018 08:52:25 +0300 Subject: [PATCH 2/4] spinners: use the animation shorthand property. --- scss/_spinners.scss | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scss/_spinners.scss b/scss/_spinners.scss index 4235662b3f4e..edf70d9fbe2e 100644 --- a/scss/_spinners.scss +++ b/scss/_spinners.scss @@ -17,10 +17,7 @@ border: $spinner-border-width solid; border-color: currentColor transparent currentColor currentColor; border-radius: 50%; - animation-name: spinner-border; - animation-duration: .75s; - animation-timing-function: linear; - animation-iteration-count: infinite; + animation: spinner-border .75s linear infinite; } .spinner-border-sm { @@ -57,10 +54,7 @@ vertical-align: text-bottom; background-color: currentColor; border-radius: 50%; - animation-name: spinner-grow; - animation-duration: .75s; - animation-timing-function: linear; - animation-iteration-count: infinite; + animation: spinner-grow .75s linear infinite; } .spinner-grow-sm { From 05ccc43d2afa1abb9a2d7fe7bf01521c5aaae84b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 11 Nov 2018 11:19:27 +0200 Subject: [PATCH 3/4] Bump bootstrap.min.css bundle size. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 29665aa4ae19..a91e04f9fdeb 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ }, { "path": "./dist/css/bootstrap.min.css", - "maxSize": "22 kB" + "maxSize": "22.5 kB" }, { "path": "./dist/js/bootstrap.bundle.js", From 3aeabfa371de1ac880d7764c6b0d38b09c0851de Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 11 Nov 2018 15:47:23 +0200 Subject: [PATCH 4/4] Spinners: show all color variants. --- site/docs/4.1/components/spinners.md | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/site/docs/4.1/components/spinners.md b/site/docs/4.1/components/spinners.md index 878c2a7de4c2..d1506700296c 100644 --- a/site/docs/4.1/components/spinners.md +++ b/site/docs/4.1/components/spinners.md @@ -23,18 +23,13 @@ Use the border spinners for a lightweight loading indicator. ### Colors -The border spinner uses `currentColor` for its `border-color`, meaning you can customize the color with [text color utilities][color]. Here's the regular border spinner in blue. +The border spinner uses `currentColor` for its `border-color`, meaning you can customize the color with [text color utilities][color]. You can use any of our text color utilities on the standard spinner. -
- -
- -Use any of our text color utilities on the standard spinner. - -{% highlight html %} +{% capture example %} {% for color in site.data.theme-colors %} {% endfor %} -{% endhighlight %} +{% endcapture %} +{% include example.html content=example %} {% capture callout %} **Why not use `border-color` utilities?** Each border spinner specifies a `transparent` border for at least one side, so `.border-{color}` utilities would override that. @@ -52,14 +47,11 @@ If you don't fancy a border spinner, switch to the grow spinner. While it doesn' Once again, this spinner is built with `currentColor`, so you can easily change its appearance with [text color utilities][color]. Here it is in blue, along with the supported variants. -
- -
- -{% highlight html %} +{% capture example %} {% for color in site.data.theme-colors %} {% endfor %} -{% endhighlight %} +{% endcapture %} +{% include example.html content=example %} ## Alignment