Commit Graph

77 Commits

Author SHA1 Message Date
Mark Otto f169c99f72 more tweaks to resolve some missed conflicts 2011-08-21 20:56:06 -07:00
Mark Otto 23ec21d049 resolve conflicts 2011-08-21 20:51:13 -07:00
Mark Otto a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Mark Otto b59b82b032 updated to resolve conflicts 2011-08-21 20:38:57 -07:00
Mark Otto 34a19915f4 resolve conflicts 2011-08-21 20:33:54 -07:00
Mark Otto 80e0e9c413 updated list html, tweaks to patterns 2011-08-21 20:03:12 -07:00
Jacob Thornton f17b2633ad fix btn borders ie7/ie8 2011-08-21 19:56:43 -07:00
Jacob Thornton 48c3c6f1b6 make topbar .fill wrap 2011-08-21 18:14:53 -07:00
Jacob Thornton e1e4ceee3f fix disabled button for ie 8 and below 2011-08-21 18:07:47 -07:00
Mark Otto 2aeed35f24 pull filter gradients out completely because IE can't render them correctly in half of all instances and they are performance problems with them; tweak alert message styles, particularly close button; 2011-08-21 17:30:45 -07:00
Jacob Thornton 22dbf9d8e4 fix up the modals for ie8 2011-08-21 13:36:06 -07:00
Jacob Thornton b18e76f990 introduce .fill class to top-nav for overflow bug 2011-08-21 12:19:01 -07:00
Mark Otto 6db39d0ec3 fix error styles a bit on stacked form fields 2011-08-20 23:56:32 -07:00
Mark Otto e179f0acb3 more spacing and commenting 2011-08-20 23:38:00 -07:00
Mark Otto c7c3356101 more spacing tweaks 2011-08-20 23:32:37 -07:00
Mark Otto aaf9f752c4 docs spacing, spare divs in a few places, updating css spacing 2011-08-20 23:25:22 -07:00
Mark Otto 14b77f3a21 remove rogue ul 2011-08-20 21:25:21 -07:00
Mark Otto ffd851d93a fixing conflict to merge in copy changes 2011-08-20 21:14:57 -07:00
Mark Otto 72899a4ee8 updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values 2011-08-20 18:58:12 -07:00
Matthew Pennell 7852619e32 Fix broken quotes and bizarre update of HTML5 to 6. 2011-08-20 23:16:15 +02:00
Matthew Pennell 52e9f7eb6e Corrected semantic definitions of strong, em and b in Typography section. 2011-08-20 23:08:58 +02:00
Mark Otto 261a473a72 adding more details on browser support, adding snippet of about text, changed p tags to have half the bottom margin 2011-08-20 01:51:06 -07:00
Mark Otto 4a567fcb10 updated docs and docs css to not use rgba colors on the layout modules so IE can see that shiz 2011-08-20 01:11:48 -07:00
Mark Otto 4f2b0d8aa4 fix topbar in docs as well 2011-08-19 22:32:14 -07:00
Mark Otto fc3324f88b fix spacing and confusion in example h1 heading with small tag 2011-08-19 22:31:03 -07:00
Mark Otto 66fea662e4 fix typo 2011-08-19 22:29:10 -07:00
Mark Otto 3f388ef07a updates to the topbar markup and css to remove the logo classname and simplify the selectors for it 2011-08-19 22:28:22 -07:00
Rafaël Blais Masson d2515876f1 Lovely ellipses and apostrophes. 2011-08-19 21:01:23 -04:00
Jacob Thornton 4d0a80bdef Merge branch 'master' of github.com:twitter/bootstrap 2011-08-19 14:24:26 -07:00
Jacob Thornton 581f2563b0 remove type attr from docs 2011-08-19 14:23:41 -07:00
Mark Otto 0af179fdf6 Oops, adding rel=stylesheet back to docs page 2011-08-19 13:20:07 -07:00
Mark Otto e8c3b4e5c7 update docs for correct usage of address, emphasis, and more 2011-08-19 13:19:07 -07:00
Jacob Thornton 19bbc01f2e add rel="stylesheet" to doc text 2011-08-19 12:14:43 -07:00
Mark Otto bd1d389751 tweaks around names and such 2011-08-18 11:37:47 -07:00
Mark Otto 799a14d1cb capitalize Less instead of using all caps 2011-08-17 22:40:50 -07:00
Mark Otto 8ba5a29456 capitalize github properly, fix url for compiled css 2011-08-17 22:38:14 -07:00
Jacob Thornton 07837a1c47 update docs with gh-pages 2011-08-17 11:31:20 -07:00
Jacob Thornton 7f99892b86 change popover stufff 2011-07-28 17:50:38 -07:00
Mark Otto a7d65d7d8f remove the twitter logo and change some wording 2011-07-06 19:43:41 -07:00
Mark Otto 5a1a01869a new popover ideas 2011-07-05 14:24:53 -07:00
Mark Otto 3117fc979d getting popovers in 2011-07-01 23:10:39 -07:00
Mark Otto 189d11593f rename modals to popovers 2011-07-01 22:21:05 -07:00
Jacob Thornton 26f9e8c4e8 add text to p tag doi 2011-07-01 21:38:33 -07:00
Jacob Thornton 8245a7087e add twipsies... 2011-07-01 21:30:12 -07:00
Mark Otto be3a57a692 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-07-01 10:41:20 -07:00
Mark Otto 460a84a926 Updated offset columns, fix app.js bug, misc tweaks to copy 2011-06-30 15:56:25 -07:00
Jacob Thornton 291c1acd38 Add new Tweet -> modal heading 2011-06-30 14:18:48 -07:00
Jacob Thornton b088458089 Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-06-30 13:57:41 -07:00
Jacob Thornton 6687acc8ec read application.js 2011-06-30 13:57:29 -07:00
Mark Otto 3c965e2981 fix sentence case on buttons 2011-06-30 13:56:50 -07:00