0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

1594 Commits

Author SHA1 Message Date
Mark Otto
4211f21e39 #1571: remove fixed width on file inputs 2012-02-01 22:27:11 -08:00
Mark Otto
c1f0da7cce Merge branch 'master' of github.com:twitter/bootstrap 2012-02-01 22:13:26 -08:00
Mark Otto
cc8a8df125 Merge pull request #1576 from ejain/patch-1
Import the responsive css *after* setting the body padding to fix...
2012-02-01 22:13:07 -08:00
ejain
1b8863f925 Import the responsive css *after* setting the body padding to fix the issue described in #1570. 2012-02-01 21:17:04 -08:00
Mark Otto
f34ddb5c3f nuke all curly ticks 2012-02-01 18:27:38 -08:00
Mark Otto
94c2c70e6e fix spelling in examples page 2012-02-01 18:25:34 -08:00
Mark Otto
54bfdf1183 fix the makefile 2012-02-01 18:24:41 -08:00
Mark Otto
8a1769c9e2 fix missing ; in buttons.less 2012-02-01 18:18:39 -08:00
Mark Otto
f2d3026de8 update scaffolding responsive section to reflect proper media query ranges 2012-02-01 18:12:14 -08:00
Mark Otto
1ebe51c834 fix mis-labeled label 2012-02-01 18:11:19 -08:00
Mark Otto
4d918beb26 fix js links in components 2012-02-01 18:06:52 -08:00
Mark Otto
2e1649410c remove twitter widgets js from examples 2012-02-01 18:00:40 -08:00
Mark Otto
e36496fd84 Merge pull request #1490 from amenonsen/master
Typo fix: Sprited => Striped
2012-02-01 17:59:19 -08:00
Mark Otto
3ea3950225 fix icon-bar class in exampless 2012-02-01 17:57:39 -08:00
Mark Otto
2fd6a2e9f6 remove excess td in less docs 2012-02-01 17:55:32 -08:00
Mark Otto
3a2f0765bf fix hover state on .nav-list for active links 2012-02-01 17:54:21 -08:00
Mark Otto
73238701bd fixing jquery links in examples 2012-02-01 17:41:24 -08:00
Mark Otto
5c1527abc5 remove unused css files and add scaffolding and hero-unit to the builder 2012-02-01 17:06:40 -08:00
Mark Otto
f166c5a35b Merge branch 'master' of github.com:twitter/bootstrap
Conflicts:
	docs/assets/bootstrap.zip
2012-02-01 16:45:25 -08:00
Mark Otto
9b9e1d309b fix that jank hack 2012-02-01 16:44:07 -08:00
Jacob Thornton
87df230408 rebuild 2012-02-01 16:39:15 -08:00
Jacob Thornton
59016d2198 only add the anyalytics to production 2012-02-01 16:38:58 -08:00
Abhijit Menon-Sen
140d90db63 Typo fix 2012-02-01 13:21:37 +05:30
Mark Otto
7f32d15fbb fix links and rebuild 2012-01-31 19:32:42 -08:00
Jacob Thornton
fd49d4a44f move examples into docs... 2012-01-31 17:35:23 -08:00
Jacob Thornton
bdfb05dbac Merge branch '2.0-wip'
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 17:27:01 -08:00
Mark Otto
c8fad25902 update upgrade page 2012-01-31 17:24:20 -08:00
Jacob Thornton
cabba91c7c Merge branch '2.0-wip'
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 14:38:06 -08:00
Mark Otto
c84b5cf5f5 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 14:30:07 -08:00
Mark Otto
6cf79a5b8e remove unused examples, update examples docs page, add starter template to examples, remove warning alert banner, add screenshots 2012-01-31 14:29:44 -08:00
Jacob Thornton
334e5f25c4 Merge branch '2.0-wip' 2012-01-31 14:11:45 -08:00
Jacob Thornton
80a752f525 add makefile to make it easier to publish to gh-pages... 2012-01-31 14:05:30 -08:00
Mark Otto
013de18e6b remove warning alert on less docs 2012-01-31 14:00:26 -08:00
Jacob Thornton
fd700e358d Merge branch '2.0-wip'
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 13:59:40 -08:00
Jacob Thornton
e75bc5eb5f Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 13:59:08 -08:00
Jacob Thornton
390a9af936 move js stuff into assets 2012-01-31 13:58:28 -08:00
Mark Otto
aec0cb3303 fix broken nav on less page 2012-01-31 13:57:43 -08:00
Jacob Thornton
b9de88890e Merge branch '2.0-wip'
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 13:23:29 -08:00
Jacob Thornton
0bfbe5058d Merge branch '2.0-wip'
Conflicts:
	.gitignore
	LICENSE
	Makefile
	bootstrap.css
	bootstrap.min.css
	docs/assets/js/application.js
	docs/assets/js/google-code-prettify/prettify.css
	docs/index.html
	docs/javascript.html
	examples/container-app.html
	examples/fluid.html
	examples/hero.html
	js/bootstrap-alerts.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tabs.js
	js/bootstrap-twipsy.js
	js/tests/index.html
	js/tests/unit/bootstrap-modal.js
	js/tests/unit/bootstrap-popover.js
	js/tests/unit/bootstrap-tabs.js
	lib/forms.less
	lib/mixins.less
	lib/patterns.less
	lib/scaffolding.less
	lib/tables.less
2012-01-31 13:18:34 -08:00
Mark Otto
cfc1c8a8cd clean up responsive media queries and docs css 2012-01-31 13:16:11 -08:00
Mark Otto
09b9b8a586 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-31 09:40:11 -08:00
Mark Otto
4bd1ba4e0d Merge pull request #1459 from nkryptic/add-help-text
[2.0-wip] Add form help text information to docs
2012-01-31 09:39:59 -08:00
Mark Otto
9cfae03fd4 fix typo in base css docs 2012-01-31 09:37:44 -08:00
Mark Otto
cc5415b889 fix js docs typo 2012-01-31 09:37:14 -08:00
nkryptic
d70ba6c5e6 add form help-* documentation 2012-01-31 03:54:07 -05:00
Mark Otto
a6253f0937 fix disabled button docs 2012-01-31 00:15:43 -08:00
Mark Otto
bd9221ddc0 Merge pull request #1457 from nkryptic/2.0-wip
[2.0-wip] added missing nav- prefixes to docs
2012-01-31 00:12:34 -08:00
Mark Otto
b7713b83fa chance icon class 2012-01-31 00:11:19 -08:00
nkryptic
d633dbb44e add nav- prefix to rest of docs 2012-01-31 02:54:10 -05:00
Mark Otto
4d93b63916 disable cursor on disabled and active pagination links 2012-01-30 23:27:58 -08:00