Arnold Daniels
b883581511
Added links to jasny.net
2012-12-14 16:35:19 +01: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
Mark Otto
595e1a189c
fixes #5119 : javascript in navbar typo
2012-09-13 10:07:57 -07:00
Mark Otto
1f0043a7f5
fixes #4959 : docs example
2012-09-04 09:13:09 -07:00
Mark Otto
9d5f9eca85
fixes #4909 : add color utility classes .text-warning, etc and document them
2012-09-03 00:47:48 -07:00
Mark Otto
b1bdca0fdb
fixes #4901 : attribute typo and reran make
2012-08-31 23:25:58 -07:00
Mark Otto
4674945fa8
fixes #4556 : add mention of disable state and required js to buttons docs
2012-08-27 15:27:58 -07:00
Mark Otto
bdc3ff99f3
fixes #4749 : correct initialism example
2012-08-27 09:18:32 -07:00
Mark Otto
5cbb826961
Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
...
.warning for table tr and .info for .control-group
2012-08-23 09:47:44 -07:00
Mark Otto
115c7b82c4
fixes #4586 : typo in docs
2012-08-22 09:45:57 -07:00
Andreas Cederström
a9764c34a7
Add info state to form validation
2012-08-22 11:24:02 +02:00
Andreas Cederström
361889def9
Add .warning to table rows
2012-08-22 11:20:31 +02:00
Mark Otto
b52d29095a
fixes #4520 : manually fix example html for icon
2012-08-21 13:09:01 -07:00
Mark Otto
4f918ce52c
fixes #4517 manually in mustache file as well, typo in docs
2012-08-21 13:08:09 -07:00
Mark Otto
6477ad1acf
fixes #4472 : manually change mustache file as well for typo
2012-08-21 12:57:41 -07:00
Mark Otto
a667fd93ab
pre font-size increase; revert static top navbar, undo contents section for now
2012-08-19 23:01:24 -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
