Mark Otto
9a4ee790e1
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2012-06-02 22:14:12 -07:00
Mark Otto
9a3a297a47
update version # on homepage, crush assets
2012-06-02 22:12:45 -07:00
Jacob Thornton
2d3a0babd2
make active selector more specific #2043 and rebuild
2012-06-02 22:10:35 -07:00
Jacob Thornton
4a276b1620
Merge pull request #3682 from mlmorg/2.1.0-wip
...
Alter typeahead to accept synchronous/asynchronous data source
2012-06-02 21:57:18 -07:00
Matt Morgan
af14f6db5d
Merge branch 'async' into 2.1.0-wip
2012-06-03 00:33:06 -04:00
Jacob Thornton
91a7274a43
only set height explicitly for collapse when animation is supported #2131
2012-06-02 21:26:34 -07:00
Jacob Thornton
a38bc90b48
change note to point out that boostrap.js bundles all plugins #3174
2012-06-02 21:19:56 -07:00
Jacob Thornton
ebc1fe907d
only trigger $.support.transition.end when it exists
2012-06-02 21:09:13 -07:00
Jacob Thornton
3a751a63d4
fix multi carousel bug #3194
2012-06-02 21:01:45 -07:00
Jacob Thornton
555a3b0478
fix carousel when hiding a reshowing - make sure it always triggers transition end #3248
2012-06-02 20:28:08 -07:00
Jacob Thornton
0b827965d3
fix regression in typeahead #3313
2012-06-02 19:31:30 -07:00
Jacob Thornton
354f99f0bd
add length to parent dropdown check #3316
2012-06-02 19:02:30 -07:00
Jacob Thornton
b8a8927b0c
add link to phantomjs in docs #3347
2012-06-02 18:36:45 -07:00
Jacob Thornton
4ca1cba3f8
upgrade jquery to 1.7.2 #3379
2012-06-02 18:25:07 -07:00
Jacob Thornton
b07b869b26
rebuild assets
2012-06-02 18:15:23 -07:00
Jacob Thornton
806a82ef83
add relatedTarget to carousel slide event
2012-06-02 18:06:00 -07:00
Jacob Thornton
037107480d
remove isHTML support
2012-06-02 17:57:36 -07:00
Jacob Thornton
f836473129
add html option back to tooltip and popover to explicitly prevent XSS #3421
2012-06-02 17:55:10 -07:00
Jacob Thornton
fc96bc8bba
rebuild doi
2012-06-02 17:30:00 -07:00
Jacob Thornton
5b401a8c16
add collapsed class to collapse invoker when it's target is collapsed #3525
2012-06-02 17:28:38 -07:00
Jacob Thornton
5e5965ca6f
Merge branch 'accessibility' into 2.1.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Jacob Thornton
ebc6935663
2.0.3 -> 2.0.4
2012-06-01 11:04:27 -07:00
Jacob Thornton
5657ab46c5
Merge branch '2.0.4-wip'
2012-06-01 10:53:47 -07:00
Jacob Thornton
4eaeea81fd
rebuild and fix test
2012-05-31 10:24:23 -07:00
Jacob Thornton
bcd5097c02
Merge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30
...
Updated unit test for tooltips. Now using is() instead of hasClass()
2012-05-31 09:03:53 -07:00
Mark Otto
7875e4833c
fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing
2012-05-28 17:32:24 -07:00
Mark Otto
f53a038088
remake after merging IE7/8 bugfix for animations
2012-05-28 17:17:55 -07:00
Mark Otto
6fc5674466
Merge branch 'raymccoy-no-filters' into 2.0.4-wip
2012-05-28 17:17:36 -07:00
Mark Otto
9699e1d707
scope float right dropdown menus to immediate children
2012-05-28 01:13:24 -07:00
Mark Otto
241cbd478d
Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
...
2.0.4 wip fix placeholder
2012-05-28 01:00:23 -07:00
Jacob Thornton
a85c8fe74e
add note about contributing
2012-05-27 20:07:58 -07:00
Corey Innis
8a06339501
fixes .placeholder to work as a "grouped selector"
...
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`
the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
2012-05-27 18:12:08 -07:00
Mark Otto
287086758b
add tracking but for production only
2012-05-26 23:17:23 -07:00
Mark Otto
cc8b260ed8
adding google analytics tracking to docs
2012-05-26 16:35:28 -07:00
Mark Otto
a7529e158b
remove color from labels
2012-05-25 09:19:10 -07:00
Mark Otto
7dbcd0be9a
fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page
2012-05-24 21:30:43 -07:00
Mark Otto
aaf1825b49
fix example code for carousel
2012-05-24 20:26:08 -07:00
Mark Otto
fe30bd6055
make bootstrap like google maps a bit more
2012-05-24 20:18:52 -07:00
Mark Otto
76ee212343
make nested cols code match given example
2012-05-24 20:16:25 -07:00
Mark Otto
c1c679b644
#3592 : clarify grid sizing in grid docs
2012-05-24 20:13:59 -07:00
Mark Otto
7fa9f605d6
recompile after adding ms-placeholder
2012-05-24 19:18:06 -07:00
Mark Otto
72e3b3beb3
Merge branch 'ademaro-patch-1' into 2.0.4-wip
2012-05-24 19:17:49 -07:00
Ademaro
34e5bc5f1d
ie support placeholder color ( http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx )
2012-05-24 13:57:02 +04:00
Mark Otto
19489496c1
remove redeclared font styles from <p> and rebuild
2012-05-23 00:05:30 -07:00
Mark Otto
5d27fbb32d
Merge branch 'pvorb-patch-1' into 2.0.4-wip
2012-05-23 00:05:13 -07:00
Mark Otto
3b6b6eb242
fix field state mixin
2012-05-23 00:04:54 -07:00
Tomás Arribas
642f75141d
Do not use filters in fade animations
2012-05-21 02:56:57 +02:00
Jørgen Borgesen
8dda83906d
Swapped out .hasClass() with .is() when checking for multiple classes
2012-05-20 20:10:21 +02:00
Jørgen Borgesen
e388a5e475
Added unit test to check that tooltips is not showed when leave event is triggered before show delay has expired AND the hide delay is set to 0
2012-05-20 19:59:53 +02:00
Paul Vorbach
faf2866f96
Remove re-declaration of font-fam, font-size, and line-height in p
2012-05-20 11:54:21 +03:00
