0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-28 10:24:19 +01:00
Commit Graph

412 Commits

Author SHA1 Message Date
Zlatan Vasović
1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
fat
d18ba50837 add note about ios dropdown compat 2013-12-29 19:40:31 -08:00
fat
8a62f21113 fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active') 2013-12-29 19:01:32 -08:00
fat
76f0d0ff32 fixes #11373 - adds related target to dropdown events 2013-12-29 18:57:22 -08:00
fat
162d9e1776 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
Conflicts:
	dist/js/bootstrap.min.js
2013-12-29 18:04:43 -08:00
fat
ce4a2e4352 fixes #11288 - Vertical scroll position of modal saves between openings 2013-12-29 17:53:59 -08:00
fat
5bf13914e4 fixes #10658 jQuery Popover content loses bound events on second setContent call. 2013-12-28 20:59:45 -08:00
fat
c595db19ff fixes #10911 - add loading event for use with remote option :| 2013-12-26 20:26:27 -08:00
fat
d21369c1ed fixes #10890 2013-12-26 19:40:18 -08:00
fat
cd0ad94aae rebuild 2013-12-26 18:30:16 -08:00
fat
34fb5767cb fixes #10798 2013-12-26 17:53:31 -08:00
fat
fc7049b18f fixes #10675 2013-12-25 20:33:05 -08:00
fat
3161acd710 build js 2013-12-25 20:04:49 -08:00
fat
394e0fa611 fixes #11788 - focusin focusout instead of focus/blur 2013-12-24 17:00:34 -08:00
fat
c77740bd3a fixes #11720 - Add events trigger to affix 2013-12-24 16:29:51 -08:00
fat
a93a753c7d fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering 2013-12-24 13:07:42 -08:00
fat
fe7fffe034 Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
Conflicts:
	js/tests/unit/carousel.js
2013-12-24 12:50:55 -08:00
fat
558b6a478d Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
2013-12-24 12:35:24 -08:00
fat
50bd4edb8c fixes #10236
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
2013-12-24 12:32:06 -08:00
Mark Otto
5c2dfbf33b Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto
679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
fat
fe839e6e78 change where modal loads content -– fixes #10105, #9318, #9459 2013-12-23 23:30:06 -08:00
fat
1fc08c1973 fixes #10568 - kill hoverstate info once command has been executed 2013-12-23 22:57:39 -08:00
fat
a87b150bc7 fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class 2013-12-23 22:08:43 -08:00
Mark Otto
2854c5c3fb Fixes #11952: Refactor blockquote styles
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
2013-12-19 19:40:08 -08:00
fat
22f9767714 check that href id's are followed by valid char – fixes #10044 2013-12-18 21:14:01 -08:00
Chris Rebert
df3716647d update licensing header in JS files & run grunt 2013-12-18 15:29:19 -08:00
Mark Otto
922cd046ef grunt after that carousel merge 2013-12-18 15:13:50 -08:00
Mark Otto
40651cf1ea more license mentions 2013-12-18 15:08:16 -08:00
Mark Otto
e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Mark Otto
961687e4db run grunt dist 2013-12-18 14:26:37 -08:00
XhmikosR
5749039f8d Remove unused variables. 2013-12-10 10:11:10 +02:00
XhmikosR
eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Mark Otto
2b4fa90902 grunt dist 2013-12-07 11:44:32 -08:00
Chris Rebert
4be126e014 Merge pull request #11745 from XhmikosR/function-spaces
Be consistent with function () spaces
2013-12-06 16:43:09 -08:00
Chris Rebert
2e9cde6fd9 grunt 2013-12-06 11:33:18 -08:00
XhmikosR
4aad52797c Use a space after function consistently. 2013-12-06 12:43:48 +02:00
Mark Otto
a45d839874 Fixes #11712: Better support for .table-responsive within .panel's 2013-12-04 21:13:33 -08:00
Mark Otto
a42e9163cb Merge branch 'master' into responsive-visibility-table
Conflicts:
	dist/css/bootstrap.min.css
2013-12-03 22:58:25 -08:00
Chris Rebert
bac153127c grunt 2013-12-03 13:54:56 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
a52e528d27 Fix up new margins on modals by not setting auto until screen-sm-min 2013-11-30 11:56:06 -08:00
Zlatan Vasović
ab87085625 Use pkg.homepage 2013-11-30 16:11:41 +01:00
Mark Otto
a7a9dcaeb2 Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it 2013-11-30 00:42:36 -08:00
Mark Otto
bb4a39d51c Merge branch 'master' into pr/11388
Conflicts:
	dist/css/bootstrap.min.css
2013-11-30 00:26:53 -08:00
Mark Otto
594d0c700d grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing 2013-11-28 11:33:00 -08:00
Tobias Lindig
3d5e598e5c add builded files from dist/ 2013-11-28 18:40:15 +01:00
Mark Otto
9829c86f7c run grunt 2013-11-26 15:21:27 -08:00
Mark Otto
a2c6daafd0 fixes #10744: back to solid borders on carets 2013-11-16 17:48:31 -08:00
fat
7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08:00
Chris Rebert
7a3f41b11b <3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt 2013-11-10 17:25:17 -08:00
Chris Ziogas
ed5dbf1b2b Update affix properly on scrollspy speedy scroll to top of page #11310
Fix scrollspy.js so as affix is updated properly when user scrolls fast
to top of page.

A fix for issue #11310.
2013-11-07 16:39:57 +02:00
Chris Rebert
798e64cebf use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387 2013-11-06 18:33:07 -08:00
Mark Otto
d1048a7837 run grunt after version bumps 2013-11-06 13:02:15 -08:00
Mark Otto
6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Chris Rebert
89d489dfc7 re-grunt 2013-11-05 16:58:18 -08:00
Chris Rebert
4e0d022de5 update version numbers in JS file comment headers to v3.0.1 & regrunt 2013-11-01 17:15:34 -07:00
Mark Otto
867e2bef8d 3.0.1 2013-10-30 10:03:56 -07:00
Mark Otto
147837efaa more grunt 2013-10-30 08:00:32 -07:00
Zlatan Vasović
20cba845c2 Add another newline to improve final code readability
This divides banner from code.
2013-10-26 10:57:09 +02:00
Chris Rebert
b05a287eb6 run grunt 2013-10-14 20:47:56 -07:00
Chris Rebert
c43462678c run grunt 2013-10-03 10:42:55 -07:00
Mark Otto
b352061d1d run grunt 2013-10-01 11:37:47 -05:00
Chris Rebert
2b5d7d23d0 generate CSS banners via Gruntfile; fixes #10101 2013-09-10 19:22:20 -07:00
Chris Rebert
76d8757b0a rm period from licensing header so it's not mistaken as part of the URL 2013-09-10 19:01:40 -07:00
Mark Otto
48d929d69e Use jekyll var for current version in docs; update banner in gruntfile to match .less banner 2013-08-23 22:38:51 -07:00
fat
734b6acf13 add small fix for tooltip consistency + fix customizer syntax issue 2013-08-17 20:28:58 -07:00
fat
2dbf02b129 rebuild 2013-08-17 16:19:09 -07:00
fat
c0eabdda9f fixes #9543 2013-08-17 16:11:05 -07:00
fat
a10ec62f63 fixes #9579 2013-08-17 15:05:59 -07:00
fat
33f448f605 rebuild 2013-08-17 14:25:04 -07:00
fat
5e89f71ab2 fix for #8768 2013-08-17 13:14:19 -07:00
Mark Otto
237640c706 Drop the accordion for the panel
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
2013-08-12 23:36:25 -07:00
Jacob Thornton
92c2ad98e7 fixes #8983 2013-08-11 15:41:06 -07:00
Jacob Thornton
89b3cb0dac fixes #9318 2013-08-11 15:17:04 -07:00
Jacob Thornton
6393a78bf0 fixes #9279 2013-08-11 14:32:32 -07:00
Jacob Thornton
1abb7947c2 fixes #9222 2013-08-10 14:09:05 -07:00
Jacob Thornton
a4f0e8d37a fixes #9111 2013-08-10 13:35:20 -07:00
Jacob Thornton
dbed9da774 fixes #6159 2013-08-09 00:16:47 -07:00
Chris Rebert
f86f6ee955 fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack
fixes typo introduced in 2b6ec38987
2013-08-08 13:31:22 -07:00
Mark Otto
06949d6a18 grunt dist on spacing change 2013-08-06 14:57:14 -07:00
Mark Otto
f266595092 Fixes #9150: Hide popover titles in IE8
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
2013-08-06 11:18:12 -07:00
Mark Otto
300a9e7b5a run grunt dist 2013-08-04 21:09:05 -07:00
fat
2b6ec38987 fixes #8880 2013-08-04 17:22:49 -07:00
fat
f6cec812a6 fixes #8957 2013-08-02 15:13:12 -07:00
Mark Otto
34e5c7542b whitespace in js file? 2013-08-02 09:33:12 -07:00
Jacob Thornton
ccd4c9d7b5 fixes #8864 2013-07-31 22:28:05 -07:00
fat
c54b8adb85 fixes #8814 2013-07-30 13:33:56 -07:00
fat
5ee2a221ca fixes #8816 2013-07-30 13:31:57 -07:00
liuyl
270316f140 fix transition end 2013-07-29 20:23:01 +08:00
Jacob Thornton
e5a7af36d5 fixes #8703 2013-07-28 22:14:43 -07:00
fat
d0cafdd3a8 rebuild + use serif arrows 2013-07-26 22:59:21 -07:00
fat
cfa4ab90f3 fix scrollspy for window *and* children 2013-07-26 22:24:51 -07:00
fat
38044e55ae rebuild + fix #2539 2013-07-26 20:44:35 -07:00
fat
e2d4cf5f68 change how collapse works - collapse, collapsing, and in 2013-07-26 20:34:39 -07:00
Chris Rebert
a317f67c1c re-integrate #8560 using @fat's code from the comment on #8614 2013-07-26 01:15:41 -07:00
Chris Rebert
292d8d6819 specify explicit ordering for grunt concat step 2013-07-26 01:07:56 -07:00
John-Philip Johansson
0d33455ef4 Replace Makefile with GruntJS
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
2013-07-26 00:39:14 -07:00
fat
91b6a43ed9 fix makefile error thing 2013-07-26 00:22:20 -07:00
fat
f5f04ae4a0 fix affix… 2013-07-25 23:30:13 -07:00
fat
124d7e6279 fixes #8560 2013-07-25 21:49:19 -07:00
fat
15d9c82fc5 fix collapse event #8596 2013-07-25 21:33:26 -07:00
Chris Rebert
90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Jacob Thornton
e9c83647af fixes #8568 -- account for margins in offset 2013-07-24 20:57:26 -07:00
Jacob Thornton
aad910465c fixes #8569 2013-07-24 20:21:23 -07:00
Jacob Thornton
eaefed517a fixes #8399 w/ tests 2013-07-24 20:10:16 -07:00
Jacob Thornton
217eb988b8 add placement auto for tooltips + tests… kinda sad about this doe 2013-07-23 23:50:23 -07:00
Jacob Thornton
6841c50968 fixes #7814 2013-07-23 22:59:09 -07:00
Jacob Thornton
faa00629c4 add additional carousel test 2013-07-23 18:56:00 -07:00
Jacob Thornton
f1009c19b3 revert collapse change + add emulateTransitionEvent to catch dead css transitions 2013-07-23 18:44:08 -07:00
Jacob Thornton
7b12a0dcbc fixes #7970 2013-07-23 17:23:02 -07:00
Mark Otto
7bb8817947 finish flattening repo structure; add dist folder of compiled css/js 2013-07-18 18:14:49 -07:00