Commit Graph

308 Commits

Author SHA1 Message Date
Arnold Daniels
2c8951d30f Fixed catincan badge 2013-05-04 01:08:12 +02:00
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
3cc65cb86c clear up show-grid stuff 2013-01-30 18:16:14 -08:00
Arnold Daniels
f0d95a4573 Added download button in javascript docs 2012-12-26 09:35:27 +01:00
Arnold Daniels
76c8338f48 Fixed customize
Rebuild docs
2012-12-26 06:31:11 +01:00
Mark Otto
a24e47b5b8 Update the examples index:
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Arnold Daniels
b883581511 Added links to jasny.net 2012-12-14 16:35:19 +01:00
Arnold Daniels
eaad32b34f Added responsive tables 2012-12-14 16:27:33 +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
12916b06aa Fix up display of dropdown submenu examples on responsive views 2012-12-04 18:25:16 -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
942f9c5df4 Fixes #6012: Updated docs sidenav media queries and reset width for exactly 980px 2012-11-28 00:37:55 -08:00
Mark Otto
e0d0190803 fix image sizes on homepage 2012-11-22 12:26:54 -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
21957a3d9e set background size for docs jumbotron for retina 2012-11-04 13:24:06 -08:00
Mark Otto
c9dbd2d601 Fixes #5458: Clarify fluid nesting 2012-11-03 13:28:48 -07:00
Arnold Daniels
372382dd22 Modified customization to work with Jasny extensions 2012-10-11 19:46:49 +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
a90334eebb fix docs sidenav width for ie8-9 2012-10-01 11:11:33 -07:00
Mark Otto
a6206c98d5 increase padding on homepage button 2012-09-19 15:18:14 -07:00
Arnold Daniels
787d4cf487 Documented .row-desktop
Added row desktop to jasny/responsive.less
2012-09-05 11:46:16 +02:00
Arnold Daniels
d3b9c0f329 Documented semifluid layouts
Added semifluid layouts to jasny/bootstrap.less and jasny/responsive.less
2012-09-05 11:46:16 +02:00
Arnold Daniels
e51b5aea19 Documented .page-alert
Added page alert to jasny/bootstrap.less and jasny/responsive.less
2012-09-05 11:46:16 +02:00
Arnold Daniels
1b686bbe0f Modified docs with 'Extended by Jasny' 2012-09-05 11:46:06 +02:00
Mark Otto
bc4ecd9984 regrettably remove the animated button for download on homepage to improve page performance in some browsers 2012-09-04 20:13:27 -07:00
Mark Otto
69d4c3f9a1 fixes #4925: ensure docs examples don't use fixed font-size and line-height for .lead 2012-09-02 20:54:41 -07:00
Mark Otto
010a5dd84d Merge pull request #4816 from desimone/master
Fixed a typo in docs/assets/css/docs.css
2012-08-29 10:48:04 -07:00
Bobby DeSimone
8878facc67 Fixed a typo in docs/assets/css/docs.css 2012-08-29 11:13:55 -03:00
Mark Otto
17d8c78e52 fix docs horizontal scroll on tablet viewports 2012-08-27 20:32:42 -07:00
Mark Otto
8610fd9b2b remove min-height from .span3 in docs since we no longer need it 2012-08-27 15:12:55 -07:00
Jacob Thornton
9e0d87a4dd fix afffix 2012-08-20 16:43:49 -07:00
Mark Otto
6cf3752b9b fix ie7 dropdowns examples in docs 2012-08-20 12:16:15 -07:00
Mark Otto
e59642838f remove relative and top positioning from docs sidenav at narrow layout 2012-08-20 11:28:30 -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
Mark Otto
47cf3cc62f copy edits to base css page 2012-08-19 12:07:23 -07:00
Mark Otto
bb85bbc657 compy edits to docs 2012-08-19 12:04:41 -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
b14d946afb add animation to docs download btn for firefox 2012-08-14 15:12:22 -07:00
Mark Otto
03eee23952 speed up animation and brightness on docs download 2012-08-07 23:02:01 -07:00
Mark Otto
33c6ab9b20 decrease docs nav padding 2012-08-01 23:21:06 -07:00
Mark Otto
86a577d76b decrease box-shadow 2012-08-01 20:34:19 -07:00
Mark Otto
3c742fc08b add test for textarea at .span12, really fix docs footer 2012-08-01 19:25:50 -07:00
Mark Otto
72323051c3 increase padding on navbar responsive nav links, fix footer margins 2012-08-01 19:18:42 -07:00
Mark Otto
c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto
e8fd7e6c96 fix jank button on docs homepage 2012-08-01 16:15:21 -07:00
Mark Otto
5637c6fb70 pulsing download button on homepage 2012-08-01 11:52:48 -07:00