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

3225 Commits

Author SHA1 Message Date
Jacob Thornton
0b9d4e78ad Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 23:06:58 -07:00
Jacob Thornton
7f3b94c453 Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
	js/bootstrap-carousel.js
2012-10-17 23:05:16 -07:00
billy gates
d6ac499ca8 Merge pull request #5309 from erlendfh/dropdown-bugfix
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17 23:00:41 -07:00
Jacob Thornton
280d4aeb30 rebuild 2012-10-17 22:51:39 -07:00
billy gates
7426ced0fb Merge pull request #5323 from artiz/master
Please check my fix for #4550
2012-10-17 22:50:52 -07:00
billy gates
24b5e6cb14 Merge pull request #5366 from Sinetheta/2.1.2-wip
Fix for #5362
2012-10-17 22:30:40 -07:00
Jacob Thornton
a2fc01444e Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 22:27:00 -07:00
Jacob Thornton
edc3eee5ea fix carousel event 2012-10-17 22:26:44 -07:00
billy gates
21f29a7682 Merge pull request #5389 from frntz/2.1.2-wip
Update js/bootstrap-tooltip.js
2012-10-17 22:15:48 -07:00
Jacob Thornton
8e6697f2b2 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 21:38:01 -07:00
Jacob Thornton
ac6625de5f add updater function and rebuild 2012-10-17 21:37:34 -07:00
billy gates
0a3e034891 Merge pull request #5524 from martinstein/fix-tooltip-delegate-click
Fix tooltip not working in delegate events on click-trigger
2012-10-17 21:34:01 -07:00
billy gates
97bf02d787 Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix
Fixed copy/paste caused typo
2012-10-17 21:25:21 -07:00
billy gates
3074737d90 Merge pull request #5549 from mfansler/2.1.2-wip
fixes #5336: reorder focus() call to avoid scrolling
2012-10-17 21:21:31 -07:00
Mark Otto
e0a007b929 Merge pull request #5507 from bradly/2.1.2-wip
Fixing typo in docs.
2012-10-16 20:36:26 -07:00
Mark Otto
b06724a1a4 Merge pull request #5508 from bradly/fix-readme-link
Updating README link about Less compilation.
2012-10-16 20:36:12 -07:00
Mark Otto
709870aa3e fixes #5496: use correct var for dropdown active link text 2012-10-16 20:34:42 -07:00
Mark Otto
57eb2a8018 more hellip on modals 2012-10-16 20:28:07 -07:00
Mark Otto
0ac50d28b5 fixes #5519: hellip in modal code 2012-10-16 20:18:50 -07:00
Mark Otto
78f7ad95f4 fixes #5542: move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component. 2012-10-16 19:56:34 -07:00
Mark Otto
bf78333531 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
Mark Otto
463eae25b0 clarify js docs individual or compiled section 2012-10-16 12:37:36 -05:00
mfansler
e24b46b7f3 fixes #5336: reorder focus() call to avoid scrolling 2012-10-16 12:27:43 -04:00
Dmitriy Budnik
ae0ba0686e set spesific assertions count for test 2012-10-16 11:16:38 +03:00
Dmitriy Budnik
cd55963930 fixed test 2012-10-16 09:49:26 +03:00
dmitriybudnik
432eaff29c Fixed copy/paste caused typo 2012-10-15 22:35:32 +03:00
Mark Otto
0048446db9 improve spacing in carousel example 2012-10-15 13:57:09 -05:00
Martin Stein
6b017b9bea fixed reference to this.tip() so it works in delegate events 2012-10-15 15:17:59 +02:00
Bradly Feeley
fda641fb6c Updating README link about Less compilation. 2012-10-13 18:38:34 -07:00
Bradly Feeley
ed5c5994a7 Fixing typo in docs. 2012-10-13 18:31:41 -07:00
Mark Otto
fa778792c5 compress images and add new carousel example for .net magazine article 2012-10-10 17:58:22 -07:00
Mark Otto
df9a1c29f4 Merge branch '2.1.2-wip' of https://github.com/twitter/bootstrap into 2.1.2-wip 2012-10-10 10:29:55 -07:00
Mark Otto
31007c01d8 fixes #5478: remove double background color on dropdown links 2012-10-10 10:29:22 -07:00
Mark Otto
5af5c2ed36 fixes #: remove double background color on dropdown links 2012-10-10 09:51:13 -07:00
Mark Otto
b18c009051 fixes #5473: use baselineheight var for input bottom margin 2012-10-10 09:47:08 -07:00
Kevin Attfield
48a8dd2a23 Added test to fix for #5362 2012-10-08 22:29:44 -07:00
Mark Otto
4702e75410 comments in template 2012-10-08 18:59:44 -07:00
Mark Otto
ec8394cb6e adding another template for same-width nav links using 'display: table-cell;' 2012-10-08 18:58:35 -07:00
Mark Otto
7e534ce98a fixes #5443: reset background gradient on disabled dropdown links 2012-10-07 21:45:16 -07:00
Mark Otto
e4f522990e fixes #5416: use correct variable for inverse navbar responsive links 2012-10-07 21:43:37 -07:00
Mark Otto
6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto
d76c305cbb remove 'at twitter' part of readme 2012-10-06 14:42:07 -07:00
Mark Otto
7d649c9d4a fixes #5430: scope link styles in .dropdown-menu to .dropdown-menu li > a 2012-10-05 11:13:21 -07:00
Mark Otto
3726ce24bb finish off scoping of grid sizing to table elements 2012-10-03 09:43:14 -07:00
Mark Otto
11ee1633b4 fixes #5257: add data-original-title attribute selector to abbr element 2012-10-03 09:36:45 -07:00
Mark Otto
dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto
e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto
630a88d3ce Merge pull request #5281 from GotenXiao/pagination-active-background
Use paginationActiveBackground var to finish fixing #4295
2012-10-02 15:23:59 -07:00
Mark Otto
a2369021ce fixes #5352: update docs messaging for disable nav links 2012-10-02 15:10:22 -07:00
Mark Otto
1bd4723038 fixes #5392: hover on submenu should maintain white icons for active parent a tag 2012-10-02 13:19:11 -07:00