Arnold Daniels
695c18090a
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4
...
Fixed variables when loading custom.json
Conflicts:
Makefile
README.md
component.json
composer.json
docs/assets/css/bootstrap-responsive.css
docs/assets/js/application.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/javascript.html
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-typeahead.js
package.json
2013-02-20 02:16:44 +01:00
Mark Otto
2fa77bf197
Update link to changelog
2013-02-05 22:46:45 -08:00
Mark Otto
accfdaafdb
Fixes #6808 : mention IE lame-itude in docs for invalid inputs
2013-02-05 22:28:18 -08:00
Mark Otto
db8a78fae6
Fixes #6794 : incorrect docs mention of th element
2013-02-04 11:11:04 -08:00
Fred Sauer
d6e3b6b5a4
Fix form-actions documentation
2013-01-28 10:01:59 -08:00
Quy Ton
1da1994ba4
Add text alignment classes info to docs
2013-01-15 18:16:44 -08:00
Mark Otto
f9ee99cf6f
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
2013-01-14 00:11:55 -08:00
Mark Otto
8a16746542
Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
...
update 2.3.0 docs to reflect #5786
2013-01-12 00:29:34 -08:00
Mark Otto
b242ff7851
Fixes #6553 : example fix for validation states
2013-01-11 20:51:11 -08:00
Chris Rebert
684c9d8d05
update docs to reflect #5786
2013-01-05 17:14:22 -08:00
Arnold Daniels
ef7599fd94
Fixed comments in bootstrap-fileupload.js
2012-12-26 10:44:48 +01:00
Arnold Daniels
8727176325
Fix Submit issues link in site footer. Fixes #36
2012-12-25 05:40:15 +01:00
Quy Ton
a27bf30f0d
Miscellaneous changes to docs
2012-12-20 21:38:53 -08:00
Mark Otto
b6575cc72e
fix up code snippet
2012-12-20 13:41:08 -08:00
Arnold Daniels
b883581511
Added links to jasny.net
2012-12-14 16:35:19 +01:00
Mark Otto
9d985978a3
Escape HTML of section element
2012-12-10 10:55:42 -08:00
Arnold Daniels
f997a9ada7
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/docs.css
docs/assets/img/bs-docs-bootstrap-features.png
docs/assets/img/bs-docs-responsive-illustrations.png
docs/assets/img/bs-docs-twitter-github.png
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/base-css.html
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/customize.mustache
docs/templates/pages/index.mustache
js/bootstrap-typeahead.js
package.json
2012-12-10 00:22:22 +01:00
Mark Otto
be45a821bb
Fixes #6148 : Icons in mini buttons properly aligned
2012-12-07 09:51:01 -08:00
Arnold Daniels
a226b2d889
Improving customize
...
Fixed minor issues docs (iconic-search, upload button) Fixes #24
Renamed 'fonts' dir to 'font' (for compatibility with font awesome)
Allow loading custom.json (generated by bootstrap-server 2.0)
Select all CSS for selected js with 1 option
Update customize for no jasny less dir
2012-12-07 17:48:27 +01:00
Quy Ton
81679981c5
Escape ×
2012-12-05 15:28:14 -08:00
Mark Otto
0f2a423b8d
Once more, update all the favicons to retina
2012-12-03 13:25:56 -08:00
Mark Otto
15a4399015
Align the touch icons attributes
2012-12-03 13:22:10 -08:00
Mark Otto
acc037de15
add holder and replace placehold.it
2012-11-29 20:59:14 -08:00
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
Mark Otto
fda5bb135e
Fixes #5963 : Add large button example to icons, fix vertical alignment in large buttons
2012-11-28 00:46:09 -08:00
Mark Otto
8df2811d49
Simpler footer for docs
...
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto
ddf5ceccce
typo fix
2012-11-08 23:49:04 -08:00
Mark Otto
62c78e46f8
more required input tweaks
2012-11-04 19:53:13 -08:00
Mark Otto
823b5accd3
start documenting html5 invalid form fields
2012-11-04 19:41:41 -08:00
Mark Otto
7e6cc0bf7e
Fixes #5785 : allow for segmented button groups in input groups
2012-11-04 19:08:02 -08:00
Mark Otto
28da31218f
Refine new inline list option
2012-11-04 12:36:37 -08:00
Mark Otto
68f26d959f
Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline
2012-11-04 12:27:30 -08:00
Mark Otto
e4866c4b3c
clarify unstyled lists docs
2012-11-04 12:27:18 -08:00
Mark Otto
72e2d4bb77
Merge pull request #5766 from bradly/spelling-fixes-in-docs
...
Fixing various spelling typos in the docs.
2012-11-03 13:20:06 -07:00
Bradly Feeley
381d967ec8
Change example email addresses to use RFC 2606 reserved example domain.
2012-11-03 12:15:01 -06:00
Bradly Feeley
46b5e0cbc6
Fixing various spelling typos in the docs.
2012-11-02 16:34:21 -06:00
Mark Otto
d5697fcf6b
fixes #5717 : add retina favicon, recompile docs
2012-10-31 10:41:41 -07:00
Andreas Cederström
233e050adf
Adding .inline for ul and ol
2012-10-26 09:47:55 +02:00
Mark Otto
c33169a6ba
fixes #5572 : document .input-block-level
2012-10-18 11:19:16 -07:00
Arnold Daniels
9fcb8deb18
Use correct version in docs + readme + Makefile
...
Added the use of versions for Google analytics
Changed favicon
Modified package.json
2012-10-15 13:57:51 +02:00
Arnold Daniels
f0691a6abc
Build bootstrap 2.1.1-j2
2012-10-12 05:14:13 +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
6203535d2f
Changing title of docs pages to simply say 'Bootstrap' like the docs home page
2012-10-07 21:38:28 -07: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
085d6d185d
fixes #5055 : wrap legend and form elements in fieldset so IE8 styles the legend properly
2012-10-01 10:42:45 -07:00
Mark Otto
57f8dbe25c
fixes #5360 : typo in tables docs
2012-09-30 21:26:43 -07:00
Mark Otto
f8374a754d
clean up emphasis docs text
2012-09-28 15:01:12 -07:00
Arnold Daniels
9e82eba470
Build 2.1.0-j2-wip
2012-09-27 15:19:58 +02:00
Mark Otto
532ee08213
fixes #5150 : add btn-group support to input groups
2012-09-20 11:37:34 -07:00
Mark Otto
caa79ed594
fixes #5001 : proper ids on form examples
2012-09-17 16:26:51 -07:00
