0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

2445 Commits

Author SHA1 Message Date
Mark Otto
b67a2d8a59 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-15 16:48:26 -07:00
Mark Otto
d374fe92e5 simplify the left margin for offset grid columns 2012-04-15 16:48:17 -07:00
Jacob Thornton
6506ede632 add bootstrap + bootstrap.min.js to gh-pages for @remy 2012-04-15 16:45:13 -07:00
Jacob Thornton
0b8042656f fixes #2941 + whitespace in collapse 2012-04-15 16:15:32 -07:00
Mark Otto
13e4d1d5ac fix #2990: text wrapping in .uneditable-input 2012-04-15 00:35:30 -07:00
Jacob Thornton
cad8f2b43a Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-15 00:20:50 -07:00
Jacob Thornton
e985681758 add zip to git ignore, and fix gh-pages make 2012-04-15 00:19:25 -07:00
Jacob Thornton
2a6894d834 simplify make - move zipping to gh-pages only 2012-04-15 00:16:09 -07:00
Mark Otto
6c221d65e3 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-15 00:06:35 -07:00
Mark Otto
a4c2332eb1 move js tooltip link 2012-04-15 00:06:11 -07:00
Jacob Thornton
c262ead6ed change comments to preserve for yui 2012-04-14 23:51:08 -07:00
Jacob Thornton
be0efcfcfc whitespace 2012-04-14 23:38:11 -07:00
Jacob Thornton
1ca1ef94ee fix opera bug \o/ !!!! #1776 2012-04-14 23:24:19 -07:00
Mark Otto
9e9be2dc0d fix #2989: clear .checkbox/.radio floats 2012-04-14 23:19:42 -07:00
Jacob Thornton
cf4924764c rebuild with tooltip formatting change 2012-04-14 23:11:19 -07:00
Jacob Thornton
19469aa52c Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-14 23:10:41 -07:00
Jacob Thornton
b14455b03a add tests for mouseout delay in tooltip 2012-04-14 23:10:03 -07:00
Mark Otto
2dbce887df Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-14 23:07:51 -07:00
Mark Otto
a6f27ebed4 ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous 2012-04-14 23:06:00 -07:00
Jacob Thornton
c7dc4cc573 change position of var in dropdown + cleanup makefile vars 2012-04-14 22:43:36 -07:00
Mark Otto
8dc1a0eade Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse
Conflicts:
	docs/assets/bootstrap.zip
2012-04-14 22:43:26 -07:00
Jacob Thornton
ce94442104 Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-14 21:45:23 -07:00
Jacob Thornton
d65f7f204a don't open dropdown if target is disabled 2012-04-14 21:44:57 -07:00
Mark Otto
490eb1bd16 fix #3068: compile after changing comment 2012-04-14 20:56:50 -07:00
Mark Otto
3bc7553f66 Merge branch 'au-phiware-patch-1' into 2.0.3-wip 2012-04-14 20:56:13 -07:00
au-phiware
16855b920e Silence comment (just like the others) 2012-04-15 12:31:07 +10:00
Mark Otto
fc7ae48c95 fix #1823: styles of tabs within other tabs resolved 2012-04-14 18:47:27 -07:00
Mark Otto
def7ae7798 bump version on docs homepage to 2.0.3 2012-04-14 18:30:43 -07:00
Mark Otto
4bcb89946b merge in #2684, offset on the .makeColumn mixin 2012-04-14 18:18:11 -07:00
Mark Otto
d8acc062c1 Merge branch 'gruvii-patch-2' into 2.0.3-wip 2012-04-14 18:11:40 -07:00
Mark Otto
2486033754 Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2 2012-04-14 18:11:31 -07:00
Jacob Thornton
82267d48ff calling pause on a slide should actually pause it - even when hovering 2012-04-14 17:49:51 -07:00
Jacob Thornton
34132f0e89 rebuild 2012-04-14 17:19:00 -07:00
Mark Otto
ce30d19c15 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-14 17:16:37 -07:00
Mark Otto
dbde2dc9e4 adding icon classes to finish off glyphicons 1.6 update 2012-04-14 17:15:16 -07:00
Jacob Thornton
3408064d00 hack for subnav 2012-04-14 17:15:03 -07:00
Mark Otto
d5063e5dc8 fix #3032: update glyphicons sprite to 1.6 release 2012-04-14 16:59:49 -07:00
Jacob Thornton
81a296d06a whitespace 2012-04-14 16:38:44 -07:00
Jacob Thornton
c291e4d786 fix typeahead test 2012-04-14 16:32:20 -07:00
Jacob Thornton
575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
Mark Otto
8575a45294 alt fix to #3029: change to single border-radii properties 2012-04-14 13:31:48 -07:00
Mark Otto
a7d8145a32 fix #3036: add bg color to inputs 2012-04-14 13:18:37 -07:00
Mark Otto
c710f03995 Merge pull request #3042 from ctalkington/typo-fix-1
Doc Typo Fix
2012-04-13 17:14:11 -07:00
ctalkington
0e6f12af86 add 's' to 'classe' in components docs. thanks mishmosh. 2012-04-12 15:14:54 -05:00
Bryan Petty
5b85ed181a Fixed extra margin on Navbar buttons. 2012-04-10 15:22:17 -06:00
Mark Otto
48063afb3a Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-07 23:41:27 -07:00
Mark Otto
0b2d23d443 add larger .input-* to block reset for responsive <767 2012-04-07 23:41:09 -07:00
Mark Otto
28c4ed824e Merge branch 'alecrust-patch-3' into 2.0.3-wip 2012-04-07 23:38:16 -07:00
Mark Otto
5bc601d9a8 fix typo on js docs selector 2012-04-07 23:37:58 -07:00
Jacob Thornton
08fee005a8 https://github.com/twitter/bootstrap/issues/2954 2012-04-07 21:26:46 -07:00