Commit Graph

175 Commits

Author SHA1 Message Date
Arnold Daniels
176ab8f778 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip
Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
2012-11-29 23:58:46 +01:00
Jacob Thornton
ac6625de5f add updater function and rebuild 2012-10-17 21:37:34 -07:00
Mark Otto
57eb2a8018 more hellip on modals 2012-10-16 20:28:07 -07:00
Mark Otto
0ac50d28b5 fixes #5519: hellip in modal code 2012-10-16 20:18:50 -07:00
Mark Otto
463eae25b0 clarify js docs individual or compiled section 2012-10-16 12:37:36 -05:00
Arnold Daniels
741b613a86 Fixed docs: incorrect menu position rowlink 2012-10-16 14:44:38 +02:00
Arnold Daniels
f0711626bd Fix rowlink position in menu docs
Fix base css docs (not correctly merged)
2012-10-11 03:20:22 +02:00
Arnold Daniels
ee0c1b4c62 Merge remote-tracking branch 'twitter/master' into 2.1.0-j2-wip 2012-10-09 13:37:41 +02:00
Mark Otto
e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto
fd1e9b1498 fix copy on modal popover button doodad 2012-10-01 13:28:54 -07:00
Mark Otto
8ecffcb32f fixes #5334: html snippet comments 2012-09-28 10:39:15 -07:00
Jacob Thornton
aec8b08930 update docs for tooltip html + the dropdown methods api 2012-09-24 23:32:55 -07:00
Mark Otto
cedb3c7c56 fixes #5173: proper popover offsets; added docs examples to enable tests in the future 2012-09-17 23:03:32 -07:00
Mark Otto
e1deba30aa fixes #5097: js docs typos 2012-09-12 16:22:52 -07:00
Geoff Young
76e42edb29 Updated sample markup to reflect live demo. 2012-09-09 18:58:23 -04:00
Arnold Daniels
04c7c677f4 Documented file upload + upload button
Added bootstrap-fileupload.js to Makefile
Added jasny/fileupload.less to jasny/bootstrap.less
2012-09-05 11:46:17 +02:00
Arnold Daniels
c8f966f290 Documented Row link js
Added bootstrap-rowlink.js to Makefile
Added jasny/rowlink.less to jasny/bootstrap.less
2012-09-05 11:46:17 +02:00
Arnold Daniels
4529e0928c Documented inputmask javascript plugin
Added bootstrap-inputmask.js to Makefile
2012-09-05 11:46:17 +02:00
Arnold Daniels
1b686bbe0f Modified docs with 'Extended by Jasny' 2012-09-05 11:46:06 +02:00
Mark Otto
209852c805 fixes #4902: proper accordion html example 2012-09-01 12:03:55 -07:00
Mark Otto
303a33f15c fixes #4664: spelling mistake in alerts docs 2012-08-27 15:48:54 -07:00
Mark Otto
b444582ccd fixes #4671: mention collapsing parents in docs for affix plugin 2012-08-27 15:20:50 -07:00
Mark Otto
5da217b96e fixed #4598, typo, manually 2012-08-22 20:23:58 -07:00
Mark Otto
55facf1f2e fixes #4473: docs example typo for js affix plugin 2012-08-21 12:58:48 -07:00
Mark Otto
4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto
8e271d664b Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-19 11:54:05 -07:00
Mark Otto
c531a75ff0 fixes #4451 manually: add .fade to modal example in both mustache and html 2012-08-19 11:53:55 -07:00
Jacob Thornton
45dddc59a1 add click option for tooltip, popover - make click default for popover 2012-08-18 19:54:30 -07:00
Jacob Thornton
44e35e9dfa fix component 2012-08-18 19:33:46 -07:00
Jacob Thornton
937cfa6a88 add note about .nav 2012-08-18 19:32:50 -07:00
Jacob Thornton
ae9a2bd93a Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-14 21:06:39 -07:00
Jacob Thornton
dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Andreas Cederström
2df0a0fdeb now with 13 custom jquery plugins 2012-08-14 13:58:12 +02:00
Mark Otto
3c89f7bb5f fix chevron on js docs and run make after table changes 2012-08-07 23:07:53 -07:00
Christian
25c6175311 Update docs/templates/pages/javascript.mustache
Amended all mentions of 'Javascript' and 'javascript' in the body text to the correct 'JavaScript'.
2012-08-05 12:39:17 +09:00
Jacob Thornton
48546c2735 aria-labelledby="myModalLabel" aria-hidden="true" 2012-08-01 20:26:44 -07:00
Dirk Ginader
6977d35eed close #3531 added focus handling and removed the badly announced "times" close button from screenreaders 2012-08-01 20:11:16 -07:00
Mark Otto
c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto
9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto
79067721b1 fix js docs formatting 2012-07-26 23:21:06 -07:00
Mark Otto
f75277e62d indenting and such 2012-07-26 21:45:19 -07:00
Mark Otto
b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
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
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