Commit Graph

45 Commits

Author SHA1 Message Date
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
Arnold Daniels
65f8a89ebe Build 2.2.2-j4 2013-01-27 23:05:40 -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
Arnold Daniels
ef7599fd94 Fixed comments in bootstrap-fileupload.js 2012-12-26 10:44:48 +01:00
Arnold Daniels
76c8338f48 Fixed customize
Rebuild docs
2012-12-26 06:31:11 +01:00
Arnold Daniels
8727176325 Fix Submit issues link in site footer. Fixes #36 2012-12-25 05:40:15 +01:00
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
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
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
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
cf7d7a7b5d remove ; from customizer 2012-11-08 23:46:40 -08:00
Mark Otto
fc42ac6a56 fixes #5756: duplicate media CSS in compiled builds 2012-11-02 09:47:42 -07:00
Mark Otto
d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
Mark Otto
9352fe1750 add a ton of the new vars to the customizer 2012-10-29 21:30:39 -07:00
Mark Otto
81c3c1c68c add media.less to customizer page 2012-10-29 21:02:05 -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
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
Arnold Daniels
9e82eba470 Build 2.1.0-j2-wip 2012-09-27 15:19:58 +02:00
Mark Otto
783f4885ab add the media css to customizer 2012-09-17 18:17:22 -07:00
Martin Bean
2ead9a5bc3 Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
Mark Otto
595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -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
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
Mark Otto
e1659b2c4e add affix plugin to downloads page 2012-08-14 18:57:27 -07:00
kylase
d96047f45f Changed placeholders value of @baseFontSize and @baseLineHeight to the values specified in variables.less 2012-08-14 11:57:13 +08:00
Mark Otto
08e4475f00 reorg vars fields on customize page to ensure they are all in three columns for time being 2012-08-07 23:11:23 -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
a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -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
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
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