2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Commit Graph

292 Commits

Author SHA1 Message Date
Mark Otto 5ef4519ca8 move comment so less compiles 2011-09-02 00:29:54 -07:00
Mark Otto 1b06f3e84e resolve conflict 2011-09-02 00:29:27 -07:00
Mark Otto 479e0ccd6b add backwards compatability for dropdowns in topbar 2011-09-02 00:28:54 -07:00
Jacob Thornton c098225cd5 this works O_O 2011-09-02 00:26:58 -07:00
Jacob Thornton 3f1706f5f6 > seems to work O_O 2011-09-02 00:21:55 -07:00
Jacob Thornton 0ed544a82e backwards compat for old nav o_O 2011-09-02 00:17:13 -07:00
Mark Otto 02abdd6037 remove inset shadow from disabled buttons 2011-09-02 00:02:44 -07:00
Jacob Thornton 0159524413 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-01 22:54:59 -07:00
Jacob Thornton 72da5dd54d for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit 2011-09-01 22:53:24 -07:00
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 ed1139e838 change type of comment 2011-08-30 08:27:55 -07: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
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 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 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 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 11721f376d add boostrap-twipsy and bootstrap-alerts 2011-08-27 13:03:06 -07:00
Jacob Thornton 1cbda504a0 clean up show logic 2011-08-27 00:28:58 -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
Mark Otto 4f67e135dc adding dropdowns to tabs by refactoring the shizzzz out of them 2011-08-26 20:38:23 -07:00
Jacob Thornton df8b65445c small typo in offset generation 2011-08-26 19:31:50 -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
Weslly Honorato 9e0a526a66 fixed background-color for disabled links in pagination ('none' isn't a valid value for background-color property http://www.w3.org/TR/CSS2/colors.html#propdef-background-color) 2011-08-26 13:30:38 -03:00
Mark Otto 0fcda16209 be more specific in gradient mixin 2011-08-25 23:31:16 -07:00
Mark Otto ab77d7abd3 spacing 2011-08-25 23:19:01 -07:00
Mark Otto 8c2df3ac3a resolve conflicts in merging in other branch 2011-08-25 23:12:29 -07:00
Mark Otto 0758f64045 updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons 2011-08-25 22:52:21 -07:00
Igor Bozato 9a00619d6e .sidebar and .content in fluid layouts don't need to be divs 2011-08-26 03:17:38 -03:00