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

10631 Commits

Author SHA1 Message Date
Heinrich Fenkart
a7222a531a Merge pull request #14954 from twbs/customizer-use-change-event
Customizer: listen to the right event for manual file selection in import
2014-10-31 11:04:26 +01:00
Heinrich Fenkart
12b3ba7278 Customizer: listen to the right event for manual file selection in import 2014-10-31 10:58:03 +01:00
Heinrich Fenkart
b91474e538 grunt 2014-10-31 10:31:56 +01:00
Chris Rebert
505171ef5d Revert "Use jsDelivr CDN until BootstrapCDN gets updated"
This reverts commit ea23969150.

BootstrapCDN has now uploaded Bootstrap v3.3.0
2014-10-30 17:38:40 -07:00
Chris Rebert
3711abf936 Merge pull request #14945 from twbs/media-pulls-docs
Replace deprecated uses of .pull-left & .pull-right in .media docs
2014-10-30 17:37:06 -07:00
Chris Rebert
5f3a980950 Explain issue/PR bots in CONTRIBUTING.md
[skip sauce]
[skip validator]
2014-10-30 17:06:54 -07:00
Chris Rebert
88dfd954fa Replace deprecated uses of .pull-left & .pull-right in .media docs
Refs https://github.com/twbs/bootlint/pull/153
[skip sauce]
2014-10-30 11:36:24 -07:00
hillai
1339ab7a13 Replace v3.2.1 reference with v3.3.0 since there wasn't a v3.2.1
Closes #14941
2014-10-30 10:20:54 -07:00
Julian Thilo
87edaf295c Fix #14936: Use correct left/right and margin on tooltip arrows 2014-10-30 16:33:14 +01:00
Chris Rebert
4102a67f33 fix typo in comment 2014-10-30 01:47:48 -07:00
Heinrich Fenkart
25ab1539a9 Merge pull request #14931 from twbs/fix-ios-unit-test-failures
Fix the iOS 8 unit test failures
2014-10-30 09:46:49 +01:00
Heinrich Fenkart
cf482dbb0b Fix the iOS 8 unit test failures
Resolves #14919.
2014-10-30 09:35:53 +01:00
Heinrich Fenkart
c5fdea1b51 Merge pull request #14930 from twbs/use-jsdelivr-cdn-urls
Use jsDelivr CDN until BootstrapCDN gets updated
2014-10-30 08:07:55 +01:00
Heinrich Fenkart
ea23969150 Use jsDelivr CDN until BootstrapCDN gets updated 2014-10-30 07:20:41 +01:00
XhmikosR
6b7d6565de Examples: Make use of the footer tag instead of a div. 2014-10-30 08:08:06 +02:00
Heinrich Fenkart
b8c3c5c19b grunt 2014-10-30 04:45:04 +01:00
Heinrich Fenkart
4b165332be Merge pull request #14925 from twbs/button-focus-use-regexp
Use RegExp for button plugin's focus shim
2014-10-30 04:42:18 +01:00
Heinrich Fenkart
5178d8b8ba Use RegExp for button plugin's focus shim
Fixes #14923.
2014-10-30 03:46:49 +01:00
Chris Rebert
33e78ed937 Merge pull request #14922 from twbs/ios-cursor-scroll
Add Wall of Browser Bugs entry for #14708
2014-10-29 18:03:15 -07:00
Chris Rebert
be7402f0d0 Add Wall of Browser Bugs entry for #14708
Closes #14708
2014-10-29 18:00:52 -07:00
Bass Jobsen
b8dbb545ac Update grid-framework.less
The `when (@index = 1)` guards are not needed cause the mixins already only match on arity.
2014-10-30 01:20:35 +01:00
Chris Rebert
a41827377b Merge pull request #14920 from twbs/safari-print-font-size
Add Wall of Browser Bugs entry for #14868
2014-10-29 16:12:19 -07:00
Chris Rebert
850a9a0250 Add Wall of Browser Bugs entry for #14868
Closes #14868
2014-10-29 16:11:42 -07:00
Mark Otto
16dbdbd7a2 Merge branch 'master' into v3.3.0
Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
2014-10-29 11:56:48 -07:00
Mark Otto
15d668dd15 grunt 2014-10-29 11:13:25 -07:00
XhmikosR
5a83be362a Update shrinkwrap. 2014-10-29 19:44:14 +02:00
Mark Otto
5429e71401 fixes #14913: badges in list group shouldn't have text shadow 2014-10-29 10:27:18 -07:00
Mark Otto
aa85e762ea new homepage images 2014-10-29 10:02:51 -07:00
Mark Otto
e07d741088 grunt 2014-10-29 09:54:43 -07:00
Mark Otto
34c2f46c8b Merge branch 'master' into v3.3.0 2014-10-29 09:45:09 -07:00
Mark Otto
22baa8153b fixes #14911: bump dependencies to fix customizer text from being cut shor 2014-10-29 09:42:00 -07:00
Mark Otto
22f9c8fc0a grunt 2014-10-29 08:58:51 -07:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Mark Otto
a369a0a729 grunt 2014-10-29 08:51:05 -07:00
Chris Rebert
0a56bf7bf2 Merge pull request #14907 from twbs/justified-nav-wall
Add WebKit bug for #9774 to Wall of Browser Bugs
2014-10-28 23:22:46 -07:00
Chris Rebert
3fe6a04b90 Add WebKit bug for #9774 to Wall of Browser Bugs
[skip sauce]
2014-10-28 23:20:51 -07:00
Mark Otto
a75c6d84e1 grunt 2014-10-28 23:08:42 -07:00
Mark Otto
2d20bba307 Merge pull request #14891 from twbs/cursor_var
Add variable for default cursor
2014-10-28 23:04:49 -07:00
Mark Otto
aad0f00887 indentation and comment 2014-10-28 23:04:25 -07:00
Mark Otto
c0c1588402 Merge pull request #14904 from twbs/customize-min-files
Customizer: include the minified files only on GitHub pages.
2014-10-28 23:02:48 -07:00
Mark Otto
e528daf6d0 change back to not allowed cursor 2014-10-28 22:57:56 -07:00
Mark Otto
c4b053a013 Merge branch 'master' into cursor_var 2014-10-28 22:57:26 -07:00
Mark Otto
45b59f4307 Reverts #14848, the overflow scrolling in the docs sidebar /cc @hnrch02 2014-10-28 22:57:16 -07:00
XhmikosR
a515191afd Customizer: include the minified files only on GitHub pages. 2014-10-29 07:30:57 +02:00
XhmikosR
97ed62361e Merge pull request #14903 from twbs/fix-#14750
Fix customizer download with Firefox.
2014-10-29 07:13:48 +02:00
Heinrich Fenkart
cf88a65f30 Fix customizer download with Firefox. 2014-10-29 06:48:00 +02:00
Chris Rebert
4e3ffa5629 Merge pull request #14902 from twbs/safari-justified-nav
Safari v8.0 still suffers from Justified Nav rendering bug
2014-10-28 21:26:00 -07:00
Chris Rebert
c897f9d5f0 Safari v8.0 still suffers from Justified Nav rendering bug 2014-10-28 21:24:45 -07:00
Heinrich Fenkart
bf2ad00ee0 grunt 2014-10-29 04:56:02 +01:00
Ben-Russell
68b771a057 Independently delegate data-api selectors
Fixes #14462.
Closes #14463 by merging it.
2014-10-29 04:54:53 +01:00