diff --git a/LICENSE b/LICENSE index 72dda23..dda75ca 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ The MIT License (MIT) -Copyright (c) 2011-2021 Twitter, Inc. -Copyright (c) 2011-2021 The Bootstrap Authors +Copyright (c) 2011-2022 Twitter, Inc. +Copyright (c) 2011-2022 The Bootstrap Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index c86b5ff..43ff630 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,28 @@ -# Bootstrap SCSS +# Bootstrap SCSS [![npm version](https://img.shields.io/npm/v/bootstrap-scss.svg)](https://www.npmjs.com/package/bootstrap-scss) > Bootstrap's SCSS files (only) -

- - Bootstrap logo - -

- -

Bootstrap

- -

- Sleek, intuitive, and powerful front-end framework for faster and easier web development. -
- Explore Bootstrap docs » -
-
- Report bug - · - Request feature - · - Themes - · - Blog -

- -
- ## Table of contents - [Quick start](#quick-start) -- [Status](#status) - [What's included](#whats-included) -- [Documentation](#documentation) - [Versioning](#versioning) -- [Copyright and license](#copyright-and-license) +- [License](#license) ## Quick start Several quick start options are available: -- Install with [npm](https://www.npmjs.com/): `npm install bootstrap-scss@4.6.1` -- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap-scss@4.6.1` - -Read the [Getting started page](https://getbootstrap.com/docs/4.6/getting-started/introduction/) for information on the framework contents, templates and examples, and more. +- Install with [npm](https://www.npmjs.com/): `npm install bootstrap-scss@4.6.2` +- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap-scss@4.6.2` -## Status - -[![npm version](https://img.shields.io/npm/v/bootstrap-scss.svg)](https://www.npmjs.com/package/bootstrap-scss) +Read the [Getting started page](https://getbootstrap.com/docs/4.6/getting-started/introduction/) for information on the +framework contents, templates and examples, and more. ## What's included -Within this package you'll find the following directories and files, logically grouping common assets and providing only SCSS variations. You'll see something like this: +Within this package you'll find the following directories and files, logically grouping common assets and providing only +SCSS variations. You'll see something like this: ``` bootstrap-scss/ @@ -66,18 +37,10 @@ bootstrap-scss/ └─ ... ``` -## Documentation - -[Bootstrap's official documentation](https://getbootstrap.com/) powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). - ## Versioning For simplicity, this project will use the same version numbers as Bootstrap. -## Changelog - -https://blog.getbootstrap.com/2021/10/28/bootstrap-4.6.1/ - -## Copyright and license +## License -Code and documentation copyright 2011-2021 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). +Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). diff --git a/_custom-forms.scss b/_custom-forms.scss index b3db8c4..750ea9c 100644 --- a/_custom-forms.scss +++ b/_custom-forms.scss @@ -13,7 +13,7 @@ display: block; min-height: $font-size-base * $line-height-base; padding-left: $custom-control-gutter + $custom-control-indicator-size; - color-adjust: exact; // Keep themed appearance for print + print-color-adjust: exact; // Keep themed appearance for print } .custom-control-inline { @@ -91,7 +91,7 @@ pointer-events: none; content: ""; background-color: $custom-control-indicator-bg; - border: $custom-control-indicator-border-color solid $custom-control-indicator-border-width; + border: $custom-control-indicator-border-width solid $custom-control-indicator-border-color; @include box-shadow($custom-control-indicator-box-shadow); } diff --git a/_nav.scss b/_nav.scss index fad684e..7626f93 100644 --- a/_nav.scss +++ b/_nav.scss @@ -37,10 +37,13 @@ .nav-link { margin-bottom: -$nav-tabs-border-width; + background-color: transparent; border: $nav-tabs-border-width solid transparent; @include border-top-radius($nav-tabs-border-radius); @include hover-focus() { + // Prevents active .nav-link tab overlapping focus outline of previous/next .nav-link + isolation: isolate; border-color: $nav-tabs-link-hover-border-color; } @@ -73,6 +76,8 @@ .nav-pills { .nav-link { + background: none; + border: 0; @include border-radius($nav-pills-border-radius); } diff --git a/_spinners.scss b/_spinners.scss index 98c0108..61f3e0a 100644 --- a/_spinners.scss +++ b/_spinners.scss @@ -11,7 +11,7 @@ width: $spinner-width; height: $spinner-height; vertical-align: $spinner-vertical-align; - border: $spinner-border-width solid currentColor; + border: $spinner-border-width solid currentcolor; border-right-color: transparent; // stylelint-disable-next-line property-disallowed-list border-radius: 50%; @@ -43,7 +43,7 @@ width: $spinner-width; height: $spinner-height; vertical-align: $spinner-vertical-align; - background-color: currentColor; + background-color: currentcolor; // stylelint-disable-next-line property-disallowed-list border-radius: 50%; opacity: 0; diff --git a/_transitions.scss b/_transitions.scss index 40be4d9..a261f2d 100644 --- a/_transitions.scss +++ b/_transitions.scss @@ -17,4 +17,10 @@ height: 0; overflow: hidden; @include transition($transition-collapse); + + &.width { + width: 0; + height: auto; + @include transition($transition-collapse-width); + } } diff --git a/_variables.scss b/_variables.scss index 7d8fb3b..293d238 100644 --- a/_variables.scss +++ b/_variables.scss @@ -257,6 +257,7 @@ $caret-spacing: $caret-width * .85 !default; $transition-base: all .2s ease-in-out !default; $transition-fade: opacity .15s linear !default; $transition-collapse: height .35s ease !default; +$transition-collapse-width: width .35s ease !default; $embed-responsive-aspect-ratios: () !default; $embed-responsive-aspect-ratios: join( @@ -319,7 +320,7 @@ $display-line-height: $headings-line-height !default; $lead-font-size: $font-size-base * 1.25 !default; $lead-font-weight: 300 !default; -$small-font-size: 80% !default; +$small-font-size: .875em !default; $text-muted: $gray-600 !default; diff --git a/bootstrap-grid.scss b/bootstrap-grid.scss index 0de912b..1d529a6 100644 --- a/bootstrap-grid.scss +++ b/bootstrap-grid.scss @@ -1,7 +1,7 @@ /*! - * Bootstrap Grid v4.6.1 (https://getbootstrap.com/) - * Copyright 2011-2021 The Bootstrap Authors - * Copyright 2011-2021 Twitter, Inc. + * Bootstrap Grid v4.6.2 (https://getbootstrap.com/) + * Copyright 2011-2022 The Bootstrap Authors + * Copyright 2011-2022 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ diff --git a/bootstrap-reboot.scss b/bootstrap-reboot.scss index aed4e37..8a5fcf0 100644 --- a/bootstrap-reboot.scss +++ b/bootstrap-reboot.scss @@ -1,7 +1,7 @@ /*! - * Bootstrap Reboot v4.6.1 (https://getbootstrap.com/) - * Copyright 2011-2021 The Bootstrap Authors - * Copyright 2011-2021 Twitter, Inc. + * Bootstrap Reboot v4.6.2 (https://getbootstrap.com/) + * Copyright 2011-2022 The Bootstrap Authors + * Copyright 2011-2022 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md) */ diff --git a/bootstrap.scss b/bootstrap.scss index 60bb836..ff38ed0 100644 --- a/bootstrap.scss +++ b/bootstrap.scss @@ -1,7 +1,7 @@ /*! - * Bootstrap v4.6.1 (https://getbootstrap.com/) - * Copyright 2011-2021 The Bootstrap Authors - * Copyright 2011-2021 Twitter, Inc. + * Bootstrap v4.6.2 (https://getbootstrap.com/) + * Copyright 2011-2022 The Bootstrap Authors + * Copyright 2011-2022 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ diff --git a/mixins/_reset-text.scss b/mixins/_reset-text.scss index 15b4407..8682533 100644 --- a/mixins/_reset-text.scss +++ b/mixins/_reset-text.scss @@ -11,7 +11,7 @@ text-transform: none; letter-spacing: normal; word-break: normal; - word-spacing: normal; white-space: normal; + word-spacing: normal; line-break: auto; } diff --git a/package.json b/package.json index 22c27ea..6965d62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-scss", - "version": "4.6.1", + "version": "4.6.2", "description": "Bootstrap's SCSS files (only)", "main": "bootstrap.scss", "repository": {