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

3678 Commits

Author SHA1 Message Date
Mark Otto
c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Mark Otto
632c6d22a2 add bs-docs-examples styles from other branch 2012-06-04 20:57:58 -07:00
Mark Otto
eef87c96af #3684: reset width to auto for input type='image' 2012-06-04 20:27:42 -07:00
Mark Otto
348668ec13 add misc helper classes to components css docs 2012-06-04 20:25:57 -07:00
Mark Otto
589242604f document large and small well classes 2012-06-04 18:56:50 -07:00
Mark Otto
b79c100967 add placeholder to input-prepend to confirm FF placeholder looks good 2012-06-04 18:44:50 -07:00
Mark Otto
c56eb0962a fix double @@ on less pages 2012-06-04 18:39:02 -07:00
Mark Otto
8df906e641 Merge branch 'wachunga-2.0.4-wip' into 2.1.0-wip 2012-06-04 08:47:48 -07:00
Mark Otto
9cceb0bba7 Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip 2012-06-04 08:47:41 -07:00
Mark Otto
5563b8448e fix #3693: rounded corners on search form 2012-06-04 08:45:51 -07:00
Mark Otto
8eb1488861 wrap download page in form 2012-06-04 08:44:50 -07:00
Mark Otto
37ba0eba02 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-04 08:33:48 -07:00
Mark Otto
eb3a4b8f75 fix placeholder for FF by attaching input and textarea when we call the mixin 2012-06-04 08:33:42 -07:00
Jacob Thornton
82ea5847a7 adds remote source to modal. Remote source can be specified in href or by providing a remote option #936 2012-06-03 21:26:54 -07:00
Jacob Thornton
041b8bdfd3 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-03 11:24:51 -07:00
Jacob Thornton
31e8a358c3 check length so that pause, actually pauses 2012-06-03 11:24:19 -07:00
Mark Otto
ad9bfeef7a fix cut off icons 2012-06-02 22:34:20 -07:00
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