Commit Graph

629 Commits

Author SHA1 Message Date
Jacob Thornton
e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Jacob Thornton
5b2f2ed821 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-07-24 00:24:25 -07:00
Jacob Thornton
4ea7c47235 slightly fix side bar 2012-07-24 00:21:40 -07:00
Mark Otto
f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
2012-07-23 23:01:38 -07:00
Mark Otto
0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Mark Otto
5b8838aeac more alignment fixes for customize page 2012-07-23 12:51:48 -07:00
Jacob Thornton
dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Jacob Thornton
fa1e1e34df Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 14:52:13 -07:00
Jacob Thornton
fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
♒∆✝
48fc0ad569 Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy
namespace the events for popover/tooltip
2012-07-22 14:40:09 -07:00
Jon Stevens
d76c899142 remove the ns option 2012-07-22 14:36:23 -07:00
Mark Otto
b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Jon Stevens
117f65d431 on destroy, also hide. issue #3880, pull #4104 2012-07-20 09:47:12 -07:00
Mark Otto
6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto
c8fa2600f2 copy change 2012-07-17 23:38:29 -07:00
Mark Otto
aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto
cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
2012-07-17 23:14:58 -07:00
Purwandi
51c9fa1697 Moved JS to bottom on extends page 2012-07-18 12:19:02 +07:00
Mark Otto
6a663081a7 remove separate examples page, add to getting started page 2012-07-17 21:45:57 -07:00
Mark Otto
a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip
Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
2012-07-17 20:57:20 -07:00
Jon Stevens
2ee9b2717b namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880 2012-07-16 16:01:11 -07:00
Ben Oakes
9581cbfe32 Two of the three apps are for Linux/Windows; adjust accordingly 2012-07-16 09:29:49 -04:00
Mark Otto
40ab928315 Merge pull request #4083 from martinbean/2.1.0-wip
Moved JS to bottom as per best practices
2012-07-15 16:26:42 -07:00
Mark Otto
e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00
Mark Otto
750badabf7 copy edits and tweaks to utility classes to ensure they always are specific enough 2012-07-13 14:43:51 -07:00
Martin Bean
74b167b86d Moved JS to bottom as per best practices 2012-07-13 22:25:47 +01:00
Mark Otto
463de252a9 update static assets section of extend page, copy changes elsewhere 2012-07-13 14:20:25 -07:00
Mark Otto
6e622ee763 more content edits to Extend 2012-07-13 11:18:35 -07:00
Mark Otto
93b1519017 content edits to Extend page 2012-07-13 11:17:22 -07:00
Mark Otto
5cb116beb8 cleanup subnav example 2012-07-13 10:58:20 -07:00
Mark Otto
2d4f5eb5a4 fix indenting on getting started page 2012-07-13 00:56:18 -07:00
Mark Otto
fae691c3d9 some analytics tracking on getting started 2012-07-12 21:41:51 -07:00
Mark Otto
f36060dab5 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:40:25 -07:00
Mark Otto
9343e1e933 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:38:18 -07:00
Mark Otto
a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -07:00
Mark Otto
549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto
3c775f2432 add chevrons to other docs navs 2012-07-12 16:23:21 -07:00
Mark Otto
c884d6eaa6 clean up docs for subnav 2012-07-12 13:50:27 -07:00
Mark Otto
338c7ef2b6 tweak code snippet on pager and clean up type and font-sizes on docs Home 2012-07-12 13:45:07 -07:00
Mark Otto
5b5352c92d fix grid alignment on scaffolding 2012-07-11 11:15:04 -07:00
Mark Otto
5d8e78e0fa fixes #3605: add support for input-prepend/-append to .form-search 2012-07-10 00:32:30 -07:00
Mark Otto
75d952ffd8 fix indenting and remove hidden subnav on Components 2012-07-09 22:40:58 -07:00
Mark Otto
0ca210395c fix indenting and remove hidden subnav on Scaffolding 2012-07-09 22:36:12 -07:00
Mark Otto
3ea309568f fix indenting and remove hidden subnav on Base CSS docs 2012-07-09 22:34:33 -07:00
Mark Otto
c74dddd02e fix indenting on extend and js docs pages, remove hidden subnavs 2012-07-09 22:29:53 -07:00
Mark Otto
6f8226a393 update Extend docs page to include side nav and spec out next section for extending with static assets 2012-07-09 22:25:00 -07:00
Mark Otto
64e87a85f5 remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 2012-07-09 22:14:30 -07:00
Mark Otto
f4877c2369 fix up docs popover examples and copy 2012-07-09 21:13:33 -07:00
Mark Otto
413c05a09d fixes #3381: update docs to show correct media query range on responsive utilities 2012-07-09 20:55:11 -07:00
Mark Otto
93be608bf0 fixes #3384: add support for multiple inputs per line when using grid sizing 2012-07-09 20:49:17 -07:00