Commit Graph

155 Commits

Author SHA1 Message Date
Arnold Daniels
7337f2961a Version 2.3.1-j6
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j5-wip

Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
2013-03-11 01:54:03 +01:00
fat
3469339068 2.3.1 2013-02-28 20:55:14 -08: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
0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
Patrick H. Lauke
77c68e4bc2 Cleaned up dirty CSS
Used recess rather than less
2013-01-12 11:02:13 +00:00
Patrick H. Lauke
848ca6e315 Basic keyboard accessibility CSS tweaks
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto
f74990d898 Version bump 2012-12-22 16:10:06 -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
Mark Otto
529ecc5a77 Version bump 2012-12-10 18:31:04 -08:00
Mark Otto
847b632577 IE10 fix in responsive utilities, not regular utilities 2012-12-10 10:29:16 -08:00
Mark Otto
83a6a55d2c Move IE10 responsive fix to responsive utilities so Customizer gets it 2012-12-10 10:25:18 -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
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
Arnold Daniels
ccf9dd944f Preparing for Boostrap-server 2.0 2012-12-06 20:21:02 +01:00
Mark Otto
f514c87d6b Enable responsive features in IE10 when snapped 2012-12-02 20:57:34 -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
79b7017227 version bump 2012-11-05 09:32:48 -08:00
fat
3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
fat
404e4d9e9a fix carousel and rebuild js 2012-10-30 21:32:15 -07:00
Mark Otto
41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07: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
e4f522990e fixes #5416: use correct variable for inverse navbar responsive links 2012-10-07 21:43:37 -07:00
Arnold Daniels
9e82eba470 Build 2.1.0-j2-wip 2012-09-27 15:19:58 +02:00
Andreas Cederström
ecbb0ed4df Making modal work with max width 767px - fixes #4860 2012-09-27 11:46:54 +02:00
Mark Otto
f4d3d7da2e ensure 100% width for .uneditable-inputs in <767px viewports 2012-09-23 16:06:28 -07:00
Mark Otto
26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -07:00
Mark Otto
143fef9f95 overhaul the docs and css to merge into 2.1.2 since this was against master 2012-09-17 18:15:39 -07:00
Mark Otto
917b46a343 resolve conflicts and remake 2012-09-17 16:43:18 -07:00
Mark Otto
6881c193ca fixes #5039: properly set .row-fluid margins for .controls-row 2012-09-17 16:09:36 -07:00
Mark Otto
f29f98501c run make after merging #5028, which removes the left margin of responsive fluid grid offsets 2012-09-07 11:42:21 -07:00
Mark Otto
08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Mark Otto
2da2169a56 fixes #4828: make fluid grid inputs size the same as fixed grid inputs 2012-08-29 13:06:47 -07:00
Mark Otto
2137cd65fb fixes #4819: manual fix of missing .control-label in responsive767 file, coupled with a remake 2012-08-29 13:05:43 -07:00
Mark Otto
85dcbd0b34 add min-height: 1px; to .span* classes to prevent grid columns from collapsing 2012-08-27 15:12:22 -07:00
Mark Otto
15317419f4 fixes #4577: no margin on .control-row .span* in responsive 2012-08-27 11:46:47 -07:00
Mark Otto
8a5dde556b fixes #4644: ensure new static navbar negative indents on responsive layouts like fixed navbars 2012-08-27 11:05:01 -07:00
Mark Otto
5d41742f17 fixes #4505: lighten navbar text and link color so hover looks darker 2012-08-21 14:53:34 -07:00
Mark Otto
311c00a29b fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form 2012-08-21 14:07:20 -07:00
Mark Otto
1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto
78cb09b440 run make and add comment 2012-08-20 11:31:24 -07:00
Mark Otto
e510306196 bump versions to 2.1.0 2012-08-19 23:07:18 -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
1ae194597c nuke subnav styles from responsive navbar 2012-08-17 16:32:34 -07:00
Mark Otto
9c72246d49 navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 2012-08-14 16:24:58 -07:00
Mark Otto
1bb7c0e669 fixes #4254: make .span12 expand full width of a parent when responsive 2012-08-01 19:33:37 -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
735001cb26 increase horizontal padding on inputs given new font-size 2012-08-01 11:53:00 -07:00
Mark Otto
060e216712 fixes #4253: hover on responsive navbar 2012-08-01 09:18:00 -07:00