Commit Graph

22976 Commits

Author SHA1 Message Date
Mark Otto 0cb6804b69 merging in remote and recompiling 2011-08-31 16:27:28 -07:00
Mark Otto 6258832776 spelling mistakes and undo of one comment 2011-08-31 16:26:47 -07:00
Jacob Thornton f6a4dd95b6 try daves background thing again... 2011-08-31 10:55:53 -07:00
Jacob Thornton 90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	README.md
	bootstrap-1.2.0.css
2011-08-30 23:37:46 -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 588cb1c06d revert dhg mdo suggestion for fixing ie 2011-08-30 23:25:37 -07:00
Jacob Thornton 49e343c464 ie7 background toggle open 2011-08-30 23:08:34 -07:00
Jacob Thornton 2ed869c2ee remove * hack for ie7 + remove -1 margin bug for ie7 2011-08-30 23:03:01 -07:00
Mark Otto 44b18f4911 Merge pull request #126 from DHS/fix-select-labels
Fixed duplicate element ids in documentation
2011-08-30 18:26:11 -07:00
Mark Otto 89b5fd949b Merge pull request #125 from DHS/readme-spelling
Fixed readme spelling mistake, closes #123
2011-08-30 18:25:32 -07:00
Mark Otto ed1139e838 change type of comment 2011-08-30 08:27:55 -07:00
David Haywood Smith 55022228bc Fixed duplicate element ids
Also updated labels where required
2011-08-30 11:47:40 +01:00
David Haywood Smith a16dfb735a Fixed readme spelling mistake, closes #123 2011-08-30 11:19:46 +01:00
Jacob Thornton afec7859cc fix background color for ie7 -- negative margin bug still there though ;_; 2011-08-29 22:43:40 -07:00
Jacob Thornton efd6fd609c fix open ui for ie 7 2011-08-29 22:36:05 -07:00
Jacob Thornton fc0471a450 lulz nbsp 2011-08-29 22:34:13 -07:00
Jacob Thornton e8f1ae0073 btn's need &nbps; seperating them for ie7 2011-08-29 21:52:45 -07:00
Mark Otto d42a00c19d remove repeated table reset 2011-08-29 21:42:44 -07:00
Mark Otto 7070d44aed adding more grid docs 2011-08-29 21:41:32 -07:00
Jacob Thornton 589204803b remove duplicate defined btn class O_O 2011-08-29 21:41:12 -07:00
Mark Otto f17fc367f7 le merging conflicts 2011-08-29 21:26:53 -07:00
Mark Otto 654cc5ad3f resolving deltas between that epic css selector specifity pull request and latest changes here 2011-08-29 21:24:00 -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 58cc70531a drop top position a bit 2011-08-28 17:50:14 -07:00
Jacob Thornton 484ed088fc blah 2011-08-28 17:45:57 -07:00
Jacob Thornton ebff554430 remake with opacity thin 2011-08-28 17:42:09 -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 1a5f8205ff alpha for ie 2011-08-28 16:23:57 -07:00
Jacob Thornton 0b1d2cc03c change backdrop for ie 2011-08-28 14:06:37 -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
Mark Otto 650251228b redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere 2011-08-27 15:30:18 -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
Mark Otto 315af8e18b Edited readme to include the versioning approach we'll be striving to use 2011-08-27 00:49:48 -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 24c4ca0391 display none for inactive modals 2011-08-27 00:03:11 -07:00
Jacob Thornton c26eb016fb starting up bootstrap-js... 2011-08-26 23:57:35 -07:00
Mark Otto b552281558 make dropdowns in the topbar black again 2011-08-26 23:18:39 -07:00