Skip to content

Commit

Permalink
Merge branch 'path7' into hot-fix
Browse files Browse the repository at this point in the history
* path7:
  UPDATE to 4.3.0

# Conflicts:
#	bower.json
  • Loading branch information
weilinzung committed Apr 7, 2020
2 parents 1273468 + b4ae471 commit 394bc01
Show file tree
Hide file tree
Showing 78 changed files with 1,502 additions and 867 deletions.
40 changes: 22 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1><img src="https://getbootstrap.com/docs/4.1/assets/img/bootstrap-stack.png" alt="Bootstrap" height=25 width=25> Bootstrap 4</h1>

> Version 4.2.1
> Version 4.3.0
## Quick start

Expand Down Expand Up @@ -90,6 +90,7 @@ bootstrap/
│   ├── _buttons.scss
│   ├── _caret.scss
│   ├── _clearfix.scss
│   ├── _deprecate.scss
│   ├── _float.scss
│   ├── _forms.scss
│   ├── _gradients.scss
Expand All @@ -111,23 +112,26 @@ bootstrap/
│   ├── _text-truncate.scss
│   ├── _transition.scss
│   └── _visibility.scss
└── utilities
├── _align.scss
├── _background.scss
├── _borders.scss
├── _clearfix.scss
├── _display.scss
├── _embed.scss
├── _flex.scss
├── _float.scss
├── _overflow.scss
├── _position.scss
├── _screenreaders.scss
├── _shadows.scss
├── _sizing.scss
├── _spacing.scss
├── _text.scss
└── _visibility.scss
├── utilities
│   ├── _align.scss
│   ├── _background.scss
│   ├── _borders.scss
│   ├── _clearfix.scss
│   ├── _display.scss
│   ├── _embed.scss
│   ├── _flex.scss
│   ├── _float.scss
│   ├── _overflow.scss
│   ├── _position.scss
│   ├── _screenreaders.scss
│   ├── _shadows.scss
│   ├── _sizing.scss
│   ├── _spacing.scss
│   ├── _stretched-link.scss
│   ├── _text.scss
│   └── _visibility.scss
└── vendor
└── _rfs.scss
```


Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap4-bower",
"version": "v4.2.1",
"version": "v4.3.0",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"keywords": [
"css",
Expand Down Expand Up @@ -33,6 +33,6 @@
],
"dependencies": {
"jquery": "1.9.1 - 3",
"popper.js": "1.14.6"
"popper.js": "1.14.7"
}
}
6 changes: 3 additions & 3 deletions dist/css/bootstrap-grid.css
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.css.map
100755 → 100644

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/css/bootstrap-grid.min.css
100755 → 100644

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.min.css.map
100755 → 100644

Large diffs are not rendered by default.

18 changes: 15 additions & 3 deletions dist/css/bootstrap-reboot.css
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-reboot.css.map
100755 → 100644

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/css/bootstrap-reboot.min.css
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-reboot.min.css.map
100755 → 100644

Large diffs are not rendered by default.

Loading

0 comments on commit 394bc01

Please sign in to comment.