mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Code Activity
12,539 Commits 83 Branches 79 Tags
faacbdb49f31fc0cda07f2ebc3e28cd1e1e3690d
Commit Graph

1306 Commits

Author SHA1 Message Date
Mark Otto 5e928c7c2b Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 21:16:56 -07:00
Jacob Thornton 7ba24450be Merge branch 'v4' of github.com:twbs/derpstrap into v4 2015-08-12 21:18:36 -07:00
Jacob Thornton 17ba95c201 rebuild stuff 2015-08-12 21:17:43 -07:00
Mark Otto a0ae458a8a grunt 2015-08-12 21:15:23 -07:00
Jacob Thornton f2ae3ea043 Merge branch 'v4' of github.com:twbs/derpstrap into v4 2015-08-12 21:12:23 -07:00
Jacob Thornton 11abb0f7e9 fix modal 2015-08-12 21:12:03 -07:00
Thomas McDonald 35f064f96c Merge branch 'v4' of github.com:twbs/derpstrap into v4 2015-08-12 21:09:44 -07:00
Thomas McDonald 1d631e6ca3 remove .badge class from buttons 2015-08-12 21:07:41 -07:00
Mark Otto b1a74195c8 simpler type, docs callout for reproducing the v3 style headings and small text 2015-08-12 20:45:21 -07:00
Mark Otto 314161cb17 remove hella vars from the jumbotron 2015-08-12 20:28:46 -07:00
Mark Otto 46fbaab5ef unfuck all that watch shit 2015-08-12 20:01:15 -07:00
Mark Otto 2e98fd872c compile latest 2015-08-10 23:43:32 -07:00
Mark Otto 28bcf047c8 container illustrations 2015-08-10 23:07:50 -07:00
Mark Otto 121615ceba dropdown fixes and dropdown docs tweaks 2015-08-10 16:31:28 -07:00
Mark Otto 6191e5e696 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-10 00:15:31 -07:00
Mark Otto 743717fbce really fix those outline buttons 2015-08-09 23:45:36 -07:00
Mark Otto eaeee93fa3 docs rearrange 2015-08-09 23:38:16 -07:00
Thomas McDonald b84bb4e218 Merge branch 'v4' into force-expanded 2015-08-09 23:33:52 -07:00
Thomas McDonald 0ef0825d01 specify expanded output style for generated css with libsass 
(also fix license banner generator bug)
 2015-08-09 23:16:43 -07:00
Mark Otto 491cc512ad build 2015-08-09 22:50:04 -07:00
Mark Otto f651338a88 disable the custom builds generation for now: 2015-08-09 21:45:08 -07:00
Mark Otto 08d6dc5b71 add basic figure support 2015-08-09 21:42:47 -07:00
Mark Otto 7a50a2cbe8 introduce display heading classes 2015-08-09 21:17:27 -07:00
Mark Otto 7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto be299c1b8b switch to primary button there 2015-08-05 23:14:53 -07:00
Mark Otto 97bcfb9e7f rip badges 2015-08-05 00:48:42 -07:00
Mark Otto 9330c4a947 Run just as fast as I can 
To the middle of nowhere
To the middle of my frustrated fears
And I swear you're just like a pill
Instead of makin' me better,
You keep makin' me ill
You keep makin' me ill

adds .label-pill to replace .badge
 2015-08-05 00:45:41 -07:00
Mark Otto d80f26fe49 unaffix sidebar and simplify styles of docs side nav to be more like v3 2015-08-05 00:38:36 -07:00
Mark Otto d318d64c08 grunt 2015-08-04 22:31:18 -07:00
Mark Otto 1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto ab412b2404 grunt 2015-08-04 21:36:11 -07:00
XhmikosR f4a44208f4 Run grunt. 2015-07-26 00:16:58 +03:00
Chris Rebert 69d489eee4 add source maps for minified CSS; refs #16589 2015-06-23 09:27:40 -07:00
Chris Rebert 7dee0c33b1 grunt dist 2015-06-23 09:26:33 -07:00
Mark Otto 847470ca09 grunt 2015-06-22 23:25:18 -07:00
Mark Otto 278804fa31 grunt 2015-06-22 16:33:23 -07:00
Mark Otto 96e7ceed90 grunt 2015-06-22 16:30:56 -07:00
Mark Otto bc29c016b7 Merge branch 'v4' into v4_builds 2015-06-19 16:26:33 -07:00
Mark Otto e4d72c914d fix vars, grunt that shit 2015-06-19 00:01:57 -07:00
Mark Otto b39ce7d6c0 grunt 2015-06-18 15:48:54 -07:00
Mark Otto 8410afe0e1 Create new stylesheets for optional builds and add them to Gruntfile tasks 2015-06-18 10:19:50 -07:00
Mark Otto 83bfff7f07 bump version 2015-06-16 09:10:22 -07:00
Mark Otto 29ff44d311 grunt 2015-06-16 09:06:51 -07:00
Mark Otto 840938f09d tweak code styles 2015-06-09 16:28:17 -07:00
Mark Otto 2d094f9d0f grunt 2015-06-08 21:14:54 -07:00
XhmikosR b5ed74d43d Run grunt. 
[ci skip]
 2015-06-01 10:29:18 +03:00
Mark Otto c1a84e38c7 grunt 2015-05-31 23:53:14 -07:00
Mark Otto 38c7813c72 grunt 2015-05-29 13:09:57 -07:00
Mark Otto 43b083effb grunt 2015-05-29 02:09:44 -07:00
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