Skip to content

Commit eed4276

Browse files
committed
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
2 parents b1d07a8 + 7e2d41b commit eed4276

18 files changed

+226
-149
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@
88
<p align="center">
99
Sleek, intuitive, and powerful front-end framework for faster and easier web development.
1010
<br>
11-
<a href="https://v4-alpha.getbootstrap.com"><strong>Visit Bootstrap &raquo;</strong></a>
11+
<a href="https://v4-alpha.getbootstrap.com"><strong>Explore Bootstrap docs &raquo;</strong></a>
12+
<br>
13+
<br>
14+
<a href="https://themes.getbootstrap.com">Bootstrap Themes</a>
15+
&middot;
16+
<a href="https://jobs.getbootstrap.com">Job Board</a>
17+
&middot;
18+
<a href="https://blog.getbootstrap.com">Blog</a>
1219
</p>
1320
</p>
1421

build/postcss.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ module.exports = (ctx) => ({
3535
'Android >= 4',
3636
'Opera >= 12'
3737
]
38-
},
39-
'postcss-flexbugs-fixes': {}
38+
}
4039
}
4140
})

dist/css/bootstrap.css

Lines changed: 44 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)