0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

7 Commits

Author SHA1 Message Date
Mark Otto
663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
Mark Otto
d9d351e2fe more flex grid stuff 2015-04-27 14:11:07 -07:00
Mark Otto
9d4d6ef3a2 stub out flexbox grid variation via -flex 2015-04-27 01:43:14 -07:00
Chris Rebert
746e09f8ae rename media-breakpoint-{min,max} => media-breakpoint-{up,down} 2015-01-06 17:47:13 -08:00
Gleb Mazovetskiy
93f51eb0e9 Automate breakpoints
Breakpoints and container widths are now defined as maps.
2014-12-24 22:27:11 +02:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00