Chris Rebert
0d7b85ece7
Merge pull request #15822 from vsn4ik/upd_npmjs_link
...
Use https://www.npmjs.com (new site).
2015-02-17 00:19:47 -08:00
vsn4ik
1bb3ef3e0b
Use https://www.npmjs.com (new site).
2015-02-17 10:01:58 +03:00
Chris Rebert
40961659ac
.gitattributes: treat source maps as binary files
2015-02-16 22:27:31 -08:00
Chris Rebert
75b311552e
Merge pull request #15778 from twbs/node-012
...
Travis: test against node.js 0.12.
2015-02-16 21:29:50 -08:00
XhmikosR
b9aad573f9
Travis: test against node.js 0.12.
2015-02-16 21:09:32 -08:00
Chris Rebert
fd7c69b30f
Merge pull request #15765 from twbs/docs.min.js
...
Cleanup usage of & add notes about docs.min.js in examples
2015-02-16 19:29:58 -08:00
Chris Rebert
a2c7233ac0
Use just holder.js instead of docs.min.js in examples when possible
...
And add explanatory comments to the Carousel & Dashboard examples regarding holder.js
[skip sauce]
2015-02-16 19:17:01 -08:00
Chris Rebert
d13e879042
Remove docs.min.js from Blog & Cover examples since it's unnecessary.
2015-02-16 11:40:42 +02:00
XhmikosR
7a4fadb7b8
Fix carousel example images after c08bf4ba8b
.
...
The revert was incomplete.
2015-02-16 11:39:14 +02:00
XhmikosR
4131af8a67
Travis CI: Bump Rouge gem to 1.8.0.
2015-02-16 11:10:28 +02:00
XhmikosR
f60067f859
Merge pull request #15809 from twbs/packages.json-files
...
Specify the files to include in the npm package.
2015-02-16 10:58:48 +02:00
XhmikosR
101cf6b1c0
Specify the files to include in the npm package.
2015-02-15 11:43:36 +02:00
XhmikosR
3b783bd0b5
package.json: change the engine version to >= 0.10.1.
2015-02-14 14:32:16 +02:00
Mark Otto
d4ff583428
Merge pull request #15805 from aroben/patch-1
...
Include dist/ files in language stats on GitHub
2015-02-13 13:36:37 -08:00
Adam Roben
4fc6317b40
Include dist/ files in language stats on GitHub
...
GitHub considers Bootstrap files to be vendored files, and excludes them from
repository language statistics. This makes sense for most repositories, where
Bootstrap is indeed third-party code. This repository is the exception; it's
first-party code here, so should count toward the language statistics.
2015-02-13 16:30:07 -05:00
Chris Rebert
763f8293da
.text-hide docs: trivial indentation fix
2015-02-12 10:41:16 -08:00
Chris Rebert
0fe6ff9fca
browser-device-support.html: tweak indentation
2015-02-12 10:40:00 -08:00
Chris Rebert
19a6406ec4
fix indentation of highlighted code in Modal docs
2015-02-12 10:36:15 -08:00
Bootstrap's Grunt bot
6379674f35
automatic grunt dist
2015-02-12 06:41:05 +00:00
Chris Rebert
5f5b148e49
Fix oneskyapp translation links
...
Closes #15754
[skip sauce]
2015-02-11 16:25:51 -08:00
Chris Rebert
51b00ce737
Merge pull request #15788 from gianpaj/patch-1
...
Fix link to French translation
2015-02-11 16:24:02 -08:00
Gianfranco Palumbo
5af5d6fa7b
Fix link to French translation
2015-02-11 00:23:54 +00:00
Chris Rebert
c8b0f59fbd
Merge pull request #15784 from twbs/bump-grunt-html
...
Bump grunt-html to ~3.0.0
2015-02-10 13:05:43 -08:00
Chris Rebert
de90cd7a80
update shrinkwrap
2015-02-10 12:57:39 -08:00
Chris Rebert
0013483d94
bump grunt-html to ~3.0.0
2015-02-10 12:57:00 -08:00
Kevin Kirsche
d78d9dc5d9
Remove separate area for dropup's
...
Condense the dropup example
2015-02-10 08:57:56 -05:00
XhmikosR
81115cd089
Run grunt
.
2015-02-10 10:50:57 +02:00
XhmikosR
c388870cef
Downgrade grunt-contrib-cssmin.
...
v0.12.0-v0.12.1 breaks paths in URL.
2015-02-10 10:49:59 +02:00
Bootstrap's Grunt bot
47c3c6a59f
automatic grunt dist
2015-02-10 07:21:10 +00:00
Chris Rebert
d0895faa0a
Merge pull request #15779 from twbs/deps
...
Bump devDependencies.
2015-02-09 23:17:46 -08:00
XhmikosR
a3419df829
Bump devDependencies.
2015-02-10 08:30:51 +02:00
Mark Otto
e0f2db23d7
Merge pull request #15772 from kkirsche/patch-15
...
Fixes #15653 — Add comment which explains that how a responsive im...
2015-02-09 16:28:18 -08:00
Kevin Kirsche
894ec6f714
Fixes #15653 — Add comment which explains that how a responsive image should be centered
...
Fixes #15653 — Add comment which explains that how a responsive image should be centered
Redo of #15657 which I couldn't get to rebase properly after all the merges were done last night.
2015-02-09 13:55:37 -05:00
Bootstrap's Grunt bot
3efa9c46a4
automatic grunt dist
2015-02-09 01:41:04 +00:00
Mark Otto
0cf14b3768
Merge pull request #15697 from kkirsche/patch-6
...
[Fix Issue #15682 ] .caret is smaller in Firefox than other browsers
2015-02-08 17:33:19 -08:00
Mark Otto
2fad6e8dd2
Merge pull request #15648 from Nikita240/master
...
Improve image layout in the carousel example.
2015-02-08 17:25:13 -08:00
Bootstrap's Grunt bot
7d4ce8104a
automatic grunt dist
2015-02-09 00:31:19 +00:00
Mark Otto
8ef21c73aa
Merge pull request #15728 from kkirsche/patch-11
...
[Fix Issue #15719 ] Add a variable for .form-group's margin-bottom
2015-02-08 16:27:52 -08:00
Chris Rebert
9e1e73f9dc
Merge pull request #15762 from twbs/twitter-handle
...
Update Twitter handle: @twbootstrap => @getbootstrap
2015-02-06 14:53:51 -08:00
Chris Rebert
e7de01eeed
Update Twitter handle: @twbootstrap => @getbootstrap
...
Refs 1c94b7791f
CC: @mdo
2015-02-06 11:54:07 -08:00
Patrick H. Lauke
27677fab5b
Merge pull request #15714 from patrickhlauke/skip-link-fixes
...
Skip link workarounds for Chrome and IE
2015-02-04 15:38:17 +00:00
Chris Rebert
0e40c818d9
Merge pull request #15742 from kkirsche/patch-13
...
[Fix Issue #15701 ] [Docs] Tooltip/popover destroy docs and delegation
2015-02-03 13:12:24 -08:00
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
Kevin Kirsche
2dfc58fa5c
[Fix Issue #15683 ] readonly
input should not have a not-allowed cursor
...
[Fix Issue #15683 ] `readonly` input should not have a `not-allowed` cursor. Instead, this pull request displays a standard cursor and only displays the not-allowed cursor on disabled items.
Revise docs wording to clarify cursor display
2015-02-03 08:58:11 -05: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