Jacob Thornton
|
ba202d77ba
|
Merge pull request #3104 from iamnirav/2.0.3-wip
Allow updater function in bootstrap-typeahead.js (updates the value of the input field) to be overridden
|
2012-04-16 17:35:32 -07:00 |
|
Nirav Sanghani
|
031fa47f68
|
Update new typeahead method docs to be a bit clearer.
|
2012-04-16 17:27:34 -07:00 |
|
Nirav Sanghani
|
d5a95315eb
|
Update typeahead docs to reflect new option.
|
2012-04-16 17:24:51 -07:00 |
|
Nirav Sanghani
|
8e8b1ad03d
|
Allow updater function (updates the value of the input field) to be overridden.
|
2012-04-16 17:05:35 -07:00 |
|
Jacob Thornton
|
2881269e16
|
lots of property ordering
|
2012-04-16 16:34:08 -07:00 |
|
Jacob Thornton
|
a3ec868ac2
|
few more property orders
|
2012-04-16 15:37:17 -07:00 |
|
Jacob Thornton
|
457859feba
|
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
|
2012-04-16 15:09:26 -07:00 |
|
Jacob Thornton
|
498b7d984a
|
a few property reordering things
|
2012-04-16 15:09:05 -07:00 |
|
Mark Otto
|
5fa0fcc888
|
fix modal per #3086
|
2012-04-16 14:38:22 -07:00 |
|
Mark Otto
|
41b695b8cd
|
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
|
2012-04-15 17:25:38 -07:00 |
|
Mark Otto
|
a184806538
|
nuke line
|
2012-04-15 17:25:32 -07:00 |
|
Jacob Thornton
|
6cf9906a60
|
build bootstrap.js and bootstrap.min.js into docs
|
2012-04-15 17:03:33 -07:00 |
|
Mark Otto
|
5c5310dc87
|
remove @gridRowWidth var since we don't use it anywhere
|
2012-04-15 16:57:11 -07:00 |
|
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
|
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 |
|