Commit Graph

10821 Commits

Author SHA1 Message Date
Kevin Kirsche
be2206edfc [Fix Issue #15701] Tooltip/popover destroy docs don't explain the delegation case
[Fix Issue #15701] Tooltip/popover destroy docs don't explain the delegation case.

Add to popovers
2015-02-03 15:49:03 -05:00
Chris Rebert
012af29efc Merge pull request #15740 from twbs/carousel-events-target
Clarify target of carousel events
2015-02-03 10:58:33 -08:00
Chris Rebert
377b220e69 Merge pull request #15739 from twbs/modal-events-target
Clarify target of modal events
2015-02-03 10:54:08 -08:00
Chris Rebert
ab99374a9c Clarify target of carousel events
[skip sauce]
2015-02-03 10:53:33 -08:00
Chris Rebert
89ef0a5d34 Clarify target of modal events 2015-02-03 10:48:56 -08:00
XhmikosR
391054fa2d Merge pull request #15658 from kkirsche/patch-3
Fix issue #15601 — Position of Charset, X-UA-Compatible, and Viewport Meta Tags
2015-02-03 07:22:45 +02:00
Bootstrap's Grunt bot
fa27dc13b6 automatic grunt dist 2015-02-03 02:11:42 +00:00
Chris Rebert
54bae8f021 Merge pull request #15726 from hkdobrev/fix-embed-responsive-code
Extract responsive embed nested classes
2015-02-02 18:09:53 -08:00
Kevin Kirsche
a380e30f7e Fix issue #15601 — Position of X-UA-Compatible
Fix issue #15601 — Position of X-UA-Compatible, charset and viewport

Add comment to all examples

The non-responsive is correctly saying 2 instead of 3
2015-02-02 15:45:57 -05:00
Chris Rebert
ccd859f3b1 Merge pull request #15611 from twbs/switch_html_validators
Use local HTML validator to improve performance
2015-02-02 12:13:51 -08:00
Haralan Dobrev
b46dbef326 Extract responsive embed nested classes
I think this is the more common coding convention across Bootstrap.

Extract nested classes as first-class citizens and assume HTML would use both.
2015-02-02 19:26:30 +02:00
Mark Otto
65a723b602 Update shrinkwrap. 2015-02-02 04:36:13 +02:00
Mark Otto
73b50769d8 Switch to grunt-html over grunt-html-validation. 2015-02-02 04:36:13 +02:00
XhmikosR
33d8fde67c Merge pull request #15708 from twbs/customizer-libs
Update customizer libs
2015-02-02 03:52:19 +02:00
Patrick H. Lauke
a0a00b25ee Merge pull request #15710 from patrickhlauke/master
License FAQ clarification
2015-01-30 16:07:53 +00:00
Patrick H. Lauke
4d4c7c4051 License FAQ clarification 2015-01-30 16:03:07 +00:00
XhmikosR
f674f8786b Run grunt. 2015-01-30 15:26:31 +02:00
XhmikosR
2139f01a76 Update uglify.js to v2.4.16. 2015-01-30 15:25:55 +02:00
XhmikosR
8e18eb8c18 Update autoprefixer to v5.1.0. 2015-01-30 15:24:39 +02:00
XhmikosR
c918289b46 Bump FileSaver.js to v2015-01-04. 2015-01-30 15:22:56 +02:00
XhmikosR
feb0da4c2f Bump Ruby gems. 2015-01-30 15:14:57 +02:00
XhmikosR
8fd5718e71 Run grunt. 2015-01-30 15:13:24 +02:00
XhmikosR
420088d316 Bump load-grunt-tasks. 2015-01-30 15:13:24 +02:00
Chris Rebert
97e5ac1c92 Fix #15688
Stability > Precision
2015-01-29 18:00:49 -08:00
Bootstrap's Grunt bot
a7747dedf2 automatic grunt dist 2015-01-28 19:10:59 +00:00
Chris Rebert
cd4467b194 Merge pull request #15496 from twbs/15484-alternative
Make $(document).tooltip({...}) without a `selector` throw an error
2015-01-28 11:05:40 -08:00
Bootstrap's Grunt bot
4ebfbad9c7 automatic grunt dist 2015-01-28 19:02:08 +00:00
Chris Rebert
af8fa54fcd Merge pull request #15630 from twbs/tabs-cond-fix
Fix error in condition in Tab plugin
2015-01-28 10:59:51 -08:00
Bootstrap's Grunt bot
cb939e2efe automatic grunt dist 2015-01-28 01:02:34 +00:00
Chris Rebert
b258a1f5b0 Merge pull request #15681 from twbs/fix-replaceArrow
Fix name of Tooltip.replaceArrow() parameter
2015-01-27 16:59:24 -08:00
Chris Rebert
ebedeaf2fe Fix name of Tooltip.replaceArrow() parameter
isHorizontal => isVertical
2015-01-27 11:15:55 -08:00
Chris Rebert
592950cc22 Merge pull request #15678 from coliff/patch-1
Update non-responsive.css
2015-01-27 08:33:26 -08:00
Christian
37fbe1cf62 Update non-responsive.css
Fix typo on Utilize
2015-01-27 20:51:55 +09:00
XhmikosR
03e41b355c Gruntfile.js: Remove now unneeded validator relaxError option. 2015-01-26 18:02:58 +02:00
XhmikosR
9f25895015 Fix validation errors.
Surprisingly those weren't reported by the validator; only in the grunt-contrib-htmlmin branch they were reported, so after digging into it, I saw they were indeed errors...
2015-01-26 17:58:09 +02:00
Chris Rebert
c015fec325 Merge pull request #15660 from twbs/bump-dev-deps
update devDependencies
2015-01-23 16:14:11 -08:00
Chris Rebert
6a84b5a090 update shrinkwrap 2015-01-23 16:03:23 -08:00
Chris Rebert
50a3e579ae update devDependencies
upgrade grunt-contrib-jshint to ~0.11.0
upgrade load-grunt-tasks to ~3.0.0
2015-01-23 15:59:37 -08:00
Chris Rebert
972a361e98 Merge pull request #15651 from sebnow/bower-woff2
Add woff2 font file to bower main files
2015-01-23 08:06:55 -08:00
Sebastian Nowicki
767f3c87bc Add woff2 font file to bower main files
If Bootstrap is installed through bower, the woff2 font file may not be
copied over as it's not in the "main" files. The LESS files still
reference the font file which results in errors.
2015-01-23 14:24:27 +01:00
Mark Otto
efd7792488 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-21 21:06:28 -08:00
Mark Otto
c08bf4ba8b keep the base64 2015-01-21 21:06:11 -08:00
Mark Otto
a3890a72cf Merge branch 'master' into move-inline-css
Conflicts:
	docs/assets/css/docs.min.css
2015-01-21 20:16:08 -08:00
Mark Otto
8ec708870c Merge pull request #15299 from SpectrumPixel/patch-2
Remove "Separated link" in example where it's not
2015-01-21 19:58:03 -08:00
Mark Otto
c64c863637 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-21 19:20:59 -08:00
Mark Otto
af9c7151b3 Merge branch 'docs-anchors' 2015-01-21 19:20:21 -08:00
Mark Otto
84e41378e6 style changes 2015-01-21 19:20:16 -08:00
Bootstrap's Grunt bot
5e26ad4921 automatic grunt dist 2015-01-22 03:01:38 +00:00
Mark Otto
2641ba6f0f Merge pull request #15628 from kkirsche/patch-1
[Fix Issue #15561] Fix badges not being resized inside .btn-group-xs if .btn-xs is not applied
2015-01-21 18:50:33 -08:00
Chris Rebert
426e8e12cd Fix error in condition in Tab plugin
Refs #15186
2015-01-21 14:13:26 -08:00