0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

44 Commits

Author SHA1 Message Date
Jacob Thornton
9a30b8c05d Merge branch 'master' of github.com:twitter/bootstrap into dev
Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/forms.less
2011-10-29 17:08:35 -07:00
Steve Faulkner
7002a01978 Use proper classes for three column layout 2011-10-21 14:00:39 -05:00
Mark Otto
3c31d8a258 more small changes to compiled css to try things out 2011-10-03 23:50:14 -07:00
Mark Otto
0caa484aeb fix the popover bug in the app example by making the custom css more specific for .content 2011-10-03 21:36:51 -07:00
Mark Otto
e8d9eb264c update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing 2011-09-16 10:51:44 -07:00
Mark Otto
8ff18a9ffc fixing conflict and recompiling 2011-09-16 09:47:36 -07:00
Mark Otto
b188c0da8b updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having 2011-09-16 09:41:58 -07:00
Jacob Thornton
472632ba51 mv 1.3.0 file names to plane bootstrap.css for submodulers 2011-09-15 23:09:56 -07:00
Mark Otto
99ede580cf adding code and .label sections to type section 2011-09-10 15:29:38 -07:00
Mark Otto
1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
Mark Otto
1af96b9a58 what up breadcrumbs, we added you 2011-09-08 09:43:37 -07:00
Mark Otto
daf903f847 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-06 23:30:45 -07:00
Mark Otto
d640c3b14b update diagrams to use smaller border radius, add new container-app example 2011-09-06 23:30:21 -07:00
Jacob Thornton
fb8987148a move javascript from examples into docs 2011-09-06 23:20:56 -07:00
Jacob Thornton
cf23dc4f24 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:16:06 -07:00
Jacob Thornton
2883888a57 adds small js section to docs index 2011-09-02 23:15:38 -07:00
Mark Otto
168551cd4f adding link support to regular text in the topbar 2011-09-02 23:09:59 -07:00
Mark Otto
4dbd2334bd updated hero example, added fluid example, resolved issue with tabs and fluid nav 2011-09-02 23:01:38 -07:00
Jacob Thornton
41242b5ce6 more js chagnes 2011-09-02 21:06:20 -07:00
Jacob Thornton
0e13f8dca1 Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Jacob Thornton
4fb1c5bd4b rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
Jacob Thornton
b4a84e1e7d window -> body for ie 2011-08-28 17:52:55 -07:00
Jacob Thornton
7b041f8419 move removeClass up 2011-08-28 17:52:00 -07:00
Jacob Thornton
9059a72bf8 try using tricker opacity thingy 2011-08-28 17:40:25 -07:00
Jacob Thornton
d8d6e40097 listen to delegation for ie 2011-08-28 17:32:31 -07:00
Jacob Thornton
f1d17223b8 wrap for domready 2011-08-28 16:47:38 -07:00
Jacob Thornton
a0cb72f9ae change window to 'body' 2011-08-28 16:36:44 -07:00
Jacob Thornton
c263504709 add google code prettify 2011-08-28 13:30:04 -07:00
Jacob Thornton
ed96f181c8 add topbar dropdown js 2011-08-27 21:46:50 -07:00
Jacob Thornton
e91353f362 blahsdfasldflaskdfj 2011-08-27 18:09:03 -07:00
Jacob Thornton
a00b849a51 rebuild and change data-attr to have priority over options 2011-08-27 18:05:10 -07:00
Jacob Thornton
e05d39d4cc make generic fade animation css class 2011-08-27 18:03:01 -07:00
Jacob Thornton
2ee7c20692 adds popover js 2011-08-27 17:22:49 -07:00
Jacob Thornton
038a9809c4 remake 2011-08-27 13:06:01 -07:00
Jacob Thornton
11721f376d add boostrap-twipsy and bootstrap-alerts 2011-08-27 13:03:06 -07:00
Jacob Thornton
b68b53dca2 rename escape method 2011-08-27 00:42:20 -07:00
Jacob Thornton
1cbda504a0 clean up show logic 2011-08-27 00:28:58 -07:00
Jacob Thornton
db706a2596 white space junk 2011-08-27 00:19:05 -07:00
Jacob Thornton
52c624079e sometimes i get emotional about semicolons 2011-08-27 00:07:42 -07:00
Jacob Thornton
c26eb016fb starting up bootstrap-js... 2011-08-26 23:57:35 -07:00
Jacob Thornton
a63fb4d234 Merge branch '1.1.1-wip' 2011-08-26 15:21:20 -07:00
Jacob Thornton
273659c8e7 update everything to 1.1.1 2011-08-26 11:13:47 -07:00
Karthik Viswanathan
0a34a6d4b2 Made JavaScript unobtrusive by factoring out prettyPrint() to application.js. Also removed unused class from hero demo. 2011-08-26 00:00:05 -07:00
Jacob Thornton
2575547b15 rename examples dir 2011-08-22 13:12:37 -07:00