Mark Otto
|
4c237e688b
|
Merge branch 'zhongwei99-master' into 2.0.1-wip
|
2012-02-02 09:34:37 -08:00 |
|
Mark Otto
|
cf488c2800
|
fix incorrect uses of it's in the docs
|
2012-02-02 09:33:18 -08:00 |
|
Mark Otto
|
dfdc63e872
|
fix incorrect use of 'caret'
|
2012-02-02 09:31:07 -08:00 |
|
zhongwei99
|
4158701894
|
Minor typo fix.
|
2012-02-02 18:01:16 +08:00 |
|
Mark Otto
|
77871a4205
|
Merge branch 'eirikb-master' into 2.0.1-wip
|
2012-02-01 23:13:16 -08:00 |
|
Mark Otto
|
7da9b16307
|
Merge branch 'master' of https://github.com/eirikb/bootstrap into eirikb-master
|
2012-02-01 23:12:55 -08:00 |
|
Mark Otto
|
9c3218c89b
|
Merge branch 'mshafrir-master' into 2.0.1-wip
|
2012-02-01 23:12:17 -08:00 |
|
Mark Otto
|
d86e77a256
|
Merge branch 'master' of https://github.com/mshafrir/bootstrap into mshafrir-master
|
2012-02-01 23:12:06 -08:00 |
|
Mark Otto
|
8dd2b3d3f8
|
follow up to #1501 to update notes in sprites.less
|
2012-02-01 23:10:37 -08:00 |
|
Mark Otto
|
1ec6628e80
|
add note for icon class usage per #1501
|
2012-02-01 23:10:00 -08:00 |
|
Mark Otto
|
25ffe14c1b
|
add line item to docs on upgrading per #1488
|
2012-02-01 23:02:31 -08:00 |
|
Mark Otto
|
aa8a7668cb
|
Merge branch 'master' into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
|
2012-02-01 22:52:07 -08:00 |
|
Mark Otto
|
58fd0dea36
|
fixing some docs pages for i18n
|
2012-02-01 22:51:01 -08:00 |
|
Jacob Thornton
|
98d1659ef8
|
Merge pull request #1549 from TannerNMO/patch-1
Fixed simple grammatical errors.
|
2012-02-01 22:37:42 -08:00 |
|
Jacob Thornton
|
e26da36b9a
|
remove 2.0-wip ref
|
2012-02-01 22:30:51 -08:00 |
|
Mark Otto
|
43d797dfff
|
#1566: add note about removal of secondary-nav in 2.0
|
2012-02-01 22:29:15 -08:00 |
|
Jacob Thornton
|
e1deb4e767
|
fix makefile to reset zips
|
2012-02-01 22:27:46 -08:00 |
|
Mark Otto
|
4211f21e39
|
#1571: remove fixed width on file inputs
|
2012-02-01 22:27:11 -08:00 |
|
Jacob Thornton
|
6738042c61
|
rebuild with correct zip
|
2012-02-01 22:21:29 -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 |
|
TannerNMO
|
11319f6da9
|
Fixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus-backwards.aspx
|
2012-02-01 14:14:49 -07:00 |
|
eirikb
|
12ed7a2b33
|
Removed / from 'Get the javascript' in components.mustache
|
2012-02-01 19:44:33 +01:00 |
|
eirikb
|
981cbfb4fa
|
Removed extra / from 'Get the javascript'-link in components.html
|
2012-02-01 19:40:10 +01:00 |
|
Michael Shafrir
|
b96e80cf39
|
Fix broken named anchor link for LESS compiling instructions.
|
2012-02-01 09:58:08 -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 |
|