root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
10,871 Commits 108 Branches 92 Tags 662 MiB
Commit Graph

5050 Commits

Author SHA1 Message Date
Mark Otto fd03025b09 Merge pull request #16 from twbs/android-lollipop 
Officially support the Android Browser on Android v5.0+
 2014-12-11 13:53:58 -08:00
Mark Otto 235e815e6a Merge pull request #15 from twbs/v4_builds 
Stub out v4 custom builds
 2014-12-11 12:21:26 -08:00
Mark Otto e0a9a7722f Merge pull request #14 from twbs/nuke_customizer 
Nuke the customizer
 2014-12-11 12:21:05 -08:00
Mark Otto 2edc779391 Merge branch 'v4' into scss-lint 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	scss/_card.scss
 2014-12-11 12:07:09 -08:00
Mark Otto 2a78159a20 grunt 2014-12-11 12:06:08 -08:00
Mark Otto fef873a840 fix all validation, turn off some settings, add sort order 2014-12-11 12:05:29 -08:00
Chris Rebert 6ae16b0a49 Officially support the Android Browser on Android v5.0+ 2014-12-11 10:48:32 -08:00
Mark Otto 0e371ddf87 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map
 2014-12-10 20:51:17 -08:00
Mark Otto 58fee94f8d stub out descriptions and titles for potential custom builds 2014-12-10 14:12:20 -08:00
Mark Otto 95da2a9428 nuke the customizer 2014-12-10 13:51:43 -08:00
Mark Otto 63d4423fc0 grunt 2014-12-10 13:49:53 -08:00
Mark Otto 2ade44a9ca inline-block on labels now instead of inline 2014-12-06 00:33:36 -08:00
Mark Otto 6f2e9d8111 remove docs warning on inline vs inline-block for labels 2014-12-06 00:30:28 -08:00
Mark Otto 8ef926b4fb clean up some docs css 2014-12-06 00:20:57 -08:00
Mark Otto d9c2ecd70d stub out extend section a bit 2014-12-06 00:18:44 -08:00
Mark Otto ebfe358495 tweak label component padding 2014-12-06 00:18:11 -08:00
Mark Otto 57071cc68a grunt--fuuuuuuuuuuuuuck you line comments 2014-12-05 14:56:29 -08:00
Mark Otto bc3a2f669d fix vars order, remove rando grid class from mixin 2014-12-04 22:32:39 -08:00
Mark Otto be1473128b Merge branch 'v4' into v4_grid 2014-12-04 21:21:30 -08:00
Mark Otto 8454382b6a Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-04 21:20:54 -08:00
Mark Otto a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Chris Rebert fc9b7e5464 Merge pull request #2 from twbs/data-example-id 
Add support for example IDs to {% example %} template tag
 2014-12-04 19:14:55 -08:00
Mark Otto 156750941b move media queries docs to new section of layout 2014-12-04 16:51:19 -08:00
Mark Otto 824f26a3c0 grunt dist 2014-12-04 15:29:53 -08:00
Mark Otto 7bc020cce0 sass, not less 2014-12-04 15:25:24 -08:00
Mark Otto d05e58449a linting 2014-12-04 15:20:55 -08:00
Mark Otto 2fa4ab8209 grunt 2014-12-04 15:20:45 -08:00
Mark Otto aab9218c7f rem-ify blog example and clean a few visuals up 2014-12-04 14:32:13 -08:00
Mark Otto b811553147 new look for carousel example, convert to rems 2014-12-04 14:18:13 -08:00
Mark Otto 908f776c08 more rem fixes for examples 2014-12-04 14:02:38 -08:00
Mark Otto 0d7115928b convert narrow jumbotron to rems 2014-12-04 01:10:26 -08:00
Mark Otto 7c391867d7 use static top navbar in jumbotron 2014-12-04 01:07:04 -08:00
Mark Otto 04d9091158 rename css file 2014-12-04 01:06:09 -08:00
Mark Otto 15ec0e9811 rename 2014-12-04 01:05:43 -08:00
Mark Otto 471e5969ac convert jumbotron example to new navbar, fix container, and use rems in css 2014-12-04 01:04:07 -08:00
Mark Otto d0cffbb680 grunt dist 2014-12-04 01:03:54 -08:00
Mark Otto 95e27d0034 fix nav for grid template 2014-12-04 01:00:15 -08:00
Mark Otto c7c46acf48 update starter template to use new navbar 2014-12-04 00:59:36 -08:00
Mark Otto 4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Chris Rebert 833f391090 Add support for example IDs to {% example %} template tag 
e.g. {% example html id=some-example-id-here %}
 2014-12-02 18:46:42 -08:00
Mark Otto 27df020852 convert to scss 2014-12-02 14:02:35 -08:00
Mark Otto 6bd84210ff remove broken examples link 2014-12-02 02:04:37 -08:00
Mark Otto 67c9d9e185 add examples description, remove browser bugs description 2014-12-01 16:51:48 -08:00
Mark Otto 8fdac3d3a2 move examples index again, clean up nav 2014-12-01 16:51:31 -08:00
Mark Otto af30e237c7 rearrange examples 2014-12-01 16:12:15 -08:00
Mark Otto 75943868be update home and side nav to use new navbar structure 2014-12-01 15:41:11 -08:00
Mark Otto 639a211344 add new album example 2014-12-01 15:19:15 -08:00
Mark Otto 9180e15e33 Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse 2014-12-01 15:03:09 -08:00
Mark Otto 19d15476d8 nav tweaks 2014-12-01 02:06:30 -08:00