0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

100 Commits

Author SHA1 Message Date
Jacob Thornton
2d092dfeea start playing with carousel stuff 2012-01-02 16:04:01 -08:00
Jacob Thornton
076370f3f9 fix for linux 2011-12-24 22:31:39 -08:00
Jacob Thornton
35fdbad24b Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html
2011-12-22 19:15:09 -08:00
Jacob Thornton
87ac818253 change above below to top bottom and add "inside" placement option 2011-12-22 19:10:32 -08:00
Jacob Thornton
efacac0d6c clean up all the js across all the doc pages 2011-12-21 18:42:43 -08:00
Mark Otto
9fb380151d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/javascript.html
2011-12-21 18:39:02 -06:00
Mark Otto
00cbadf994 update thumbnails to keep images from going past edges of thumbnails 2011-12-21 18:21:55 -06:00
Mark Otto
c854ed167c rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones 2011-12-21 16:26:21 -06:00
Mark Otto
20aecb9838 updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file 2011-12-21 16:22:20 -06:00
Jacob Thornton
a5a98a8a98 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-21 14:03:18 -08:00
Mark Otto
8a7abc7493 docs updates, forms updated to include error states and more examples, remove text-shadow from gradientbar mixin to fix bug 2011-12-21 16:00:50 -06:00
Jacob Thornton
c4364285e4 add default margin for popover and twipsy 2011-12-20 22:12:23 -08:00
Jacob Thornton
0980a33b47 update all to new on api + add animation support to tabs 2011-12-20 19:37:41 -08:00
Mark Otto
72a536393c mostly docs updates, but also some bug fixes per github issues 2011-12-19 22:58:56 -08:00
Mark Otto
d681ae9f51 updated docs to include other less apps 2011-12-12 09:51:41 -08:00
Mark Otto
4e8c26d409 updated buttons docs 2011-12-11 02:38:58 -08:00
Mark Otto
401f84a7ec center example sites in docs on mobile 2011-12-11 01:58:06 -08:00
Mark Otto
95048c271e fix specificity on pills 2011-12-11 01:03:57 -08:00
Mark Otto
6de3ed5322 Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider
Conflicts:
	bootstrap.css
2011-12-11 00:58:10 -08:00
Mark Otto
d2e56ad53d unstyle image inputs 2011-12-10 22:29:49 -08:00
Mark Otto
d587845149 tweaks and increase specificity of pills and active classes 2011-12-10 22:21:08 -08:00
Mark Otto
4d55356e9b remove uber large responsive stuff 2011-12-09 14:39:23 -08:00
Mark Otto
5c8df1d285 updated index page to add featured sites, more docs tweaks 2011-12-09 14:34:38 -08:00
Mark Otto
97b285896f help tables not look like shit on mobile maybe? also fix bordered table example 2011-12-09 12:51:54 -08:00
Mark Otto
7b810bf9a6 update js in footer, add max-width to img 2011-12-09 12:10:01 -08:00
Mark Otto
312ee6cdfb Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-09 11:33:02 -08:00
Mark Otto
b12b71bf7c updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings 2011-12-09 11:32:07 -08:00
Evan Meagher
6e70d490e1 Add vertical nav divider example in components doc page. 2011-12-02 11:37:39 -08:00
Jacob Thornton
b1cba98aab Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-11-30 22:05:49 -08:00
Jacob Thornton
dc628c9115 start of carousel 2011-11-30 22:05:09 -08:00
Mark Otto
bc51c15709 adding temp idea for subnav to docs 2011-11-30 01:00:55 -08:00
Mark Otto
f2c40ee24d adding step nav to components 2011-11-30 00:39:38 -08:00
Mark Otto
90c190d4ef updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks 2011-11-29 23:48:27 -08:00
Mark Otto
8f3150cf71 Merge branch 'form-feedback-fix' of https://github.com/tinyfly/bootstrap into tinyfly-form-feedback-fix
Conflicts:
	bootstrap.css
2011-11-29 22:53:12 -08:00
Mark Otto
cbb291b8ab Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
2011-11-29 22:35:58 -08:00
Mark Otto
b36df46310 misc docs updates, revamped tables CSS save for grid columns and tablesorter options 2011-11-29 22:35:03 -08:00
Jeff Adams
1da19bf65f scope form feedback states to .control-group instead of unused .clearfix 2011-11-29 14:06:31 -06:00
Jeff Adams
d48027d495 add input width calculation fix from #408 to the 2.0 branch 2011-11-29 11:12:32 -06:00
Jacob Thornton
3157de8d1d clean up comments for better built files 2011-11-25 21:34:55 -08:00
Jacob Thornton
98fddaa355 new plugin "collapse" for collapsible lists and "accordion" like support 2011-11-25 17:23:14 -08:00
Jacob Thornton
b2650859d6 update buttons js for button groups 2011-11-24 14:43:26 -08:00
Jacob Thornton
bc65b58551 merge in js from 1.4... start working through js docs 2011-11-20 20:58:04 -08:00
Jacob Thornton
0b1d5d9189 revert all js stuff back to 1.4 :/ 2011-11-20 18:19:50 -08:00
Mark Otto
159c7a7fda remove code styling if it's in a pre tag 2011-11-17 00:52:11 -08:00
Mark Otto
ba9fcd8b57 make uneditable inputs work with span* classes 2011-11-17 00:49:51 -08:00
Mark Otto
160970560b updated font mixins courtesy of @apancutt 2011-11-17 00:37:14 -08:00
Mark Otto
a8e88d14a4 make form classes match table classes (readable left to right), update docs associated with it 2011-11-17 00:06:16 -08:00
Mark Otto
a017932285 start breaking down patterns.less into more distinct files, update docs for forms to use correct classes 2011-11-16 23:58:36 -08:00
Mark Otto
1fb98bed91 updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage 2011-11-12 00:46:02 -08:00
Mark Otto
f459f826af recompiling and pushing just to be sure 2011-10-31 21:46:45 -07:00