mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-20 17:54:23 +01:00
Merge branch 'master' into sr_friendly_hidden_content
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css
This commit is contained in:
commit
f4eefd28d1
@ -18,8 +18,8 @@ after_script:
|
||||
- if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
|
||||
env:
|
||||
global:
|
||||
- JEKYLL_VERSION: 2.1.1
|
||||
- ROUGE_VERSION: 1.6.1
|
||||
- JEKYLL_VERSION: 2.3.0
|
||||
- ROUGE_VERSION: 1.6.2
|
||||
- SAUCE_USERNAME: bootstrap
|
||||
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
|
||||
- secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
|
||||
|
38
README.md
38
README.md
@ -1,24 +1,24 @@
|
||||
# [Bootstrap](http://getbootstrap.com)
|
||||
[](http://badge.fury.io/bo/bootstrap)
|
||||
[](http://badge.fury.io/js/bootstrap)
|
||||
[](http://travis-ci.org/twbs/bootstrap)
|
||||
[](https://travis-ci.org/twbs/bootstrap)
|
||||
[](https://david-dm.org/twbs/bootstrap#info=devDependencies)
|
||||
[](https://saucelabs.com/u/bootstrap)
|
||||
|
||||
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community.
|
||||
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community.
|
||||
|
||||
To get started, check out <http://getbootstrap.com>!
|
||||
|
||||
## Table of contents
|
||||
|
||||
- [Quick start](#quick-start)
|
||||
- [Bugs and feature requests](#bugs-and-feature-requests)
|
||||
- [Documentation](#documentation)
|
||||
- [Contributing](#contributing)
|
||||
- [Community](#community)
|
||||
- [Versioning](#versioning)
|
||||
- [Creators](#creators)
|
||||
- [Copyright and license](#copyright-and-license)
|
||||
- [Quick start](#quick-start)
|
||||
- [Bugs and feature requests](#bugs-and-feature-requests)
|
||||
- [Documentation](#documentation)
|
||||
- [Contributing](#contributing)
|
||||
- [Community](#community)
|
||||
- [Versioning](#versioning)
|
||||
- [Creators](#creators)
|
||||
- [Copyright and license](#copyright-and-license)
|
||||
|
||||
## Quick start
|
||||
|
||||
@ -66,8 +66,8 @@ Bootstrap's documentation, included in this repo in the root directory, is built
|
||||
|
||||
### Running documentation locally
|
||||
|
||||
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.1.x).
|
||||
- **Windows users:** Read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems.
|
||||
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.3.x).
|
||||
- **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
|
||||
2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
|
||||
3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
|
||||
4. Open <http://localhost:9001> in your browser, and voilà.
|
||||
@ -86,7 +86,7 @@ Documentation for v2.3.2 has been made available for the time being at <http://g
|
||||
|
||||
Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
|
||||
|
||||
Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
|
||||
Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
|
||||
|
||||
Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
|
||||
|
||||
@ -96,9 +96,9 @@ Editor preferences are available in the [editor config](https://github.com/twbs/
|
||||
|
||||
Keep track of development and community news.
|
||||
|
||||
- Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
|
||||
- Follow [@twbootstrap on Twitter](https://twitter.com/twbootstrap).
|
||||
- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
|
||||
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.
|
||||
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
|
||||
- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)).
|
||||
|
||||
|
||||
@ -113,13 +113,13 @@ For transparency into our release cycle and in striving to maintain backward com
|
||||
|
||||
**Mark Otto**
|
||||
|
||||
- <http://twitter.com/mdo>
|
||||
- <http://github.com/mdo>
|
||||
- <https://twitter.com/mdo>
|
||||
- <https://github.com/mdo>
|
||||
|
||||
**Jacob Thornton**
|
||||
|
||||
- <http://twitter.com/fat>
|
||||
- <http://github.com/fat>
|
||||
- <https://twitter.com/fat>
|
||||
- <https://github.com/fat>
|
||||
|
||||
|
||||
|
||||
|
29
dist/css/bootstrap.css
vendored
29
dist/css/bootstrap.css
vendored
@ -205,8 +205,8 @@ th {
|
||||
abbr[title]:after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
a[href^="javascript:"]:after,
|
||||
a[href^="#"]:after {
|
||||
a[href^="#"]:after,
|
||||
a[href^="javascript:"]:after {
|
||||
content: "";
|
||||
}
|
||||
pre,
|
||||
@ -241,10 +241,6 @@ th {
|
||||
.navbar {
|
||||
display: none;
|
||||
}
|
||||
.table td,
|
||||
.table th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
.btn > .caret,
|
||||
.dropup > .btn > .caret {
|
||||
border-top-color: #000 !important;
|
||||
@ -255,6 +251,10 @@ th {
|
||||
.table {
|
||||
border-collapse: collapse !important;
|
||||
}
|
||||
.table td,
|
||||
.table th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
.table-bordered th,
|
||||
.table-bordered td {
|
||||
border: 1px solid #ddd !important;
|
||||
@ -4285,7 +4285,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
border-color: #080808;
|
||||
}
|
||||
.navbar-inverse .navbar-brand {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-brand:hover,
|
||||
.navbar-inverse .navbar-brand:focus {
|
||||
@ -4293,10 +4293,10 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
background-color: transparent;
|
||||
}
|
||||
.navbar-inverse .navbar-text {
|
||||
color: #969696;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav > li > a {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav > li > a:hover,
|
||||
.navbar-inverse .navbar-nav > li > a:focus {
|
||||
@ -4343,7 +4343,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
background-color: #080808;
|
||||
}
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
|
||||
@ -4364,13 +4364,13 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
}
|
||||
}
|
||||
.navbar-inverse .navbar-link {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-link:hover {
|
||||
color: #fff;
|
||||
}
|
||||
.navbar-inverse .btn-link {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .btn-link:hover,
|
||||
.navbar-inverse .btn-link:focus {
|
||||
@ -5696,6 +5696,9 @@ button.close {
|
||||
display: none;
|
||||
max-width: 276px;
|
||||
padding: 1px;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
line-height: 1.42857143;
|
||||
text-align: left;
|
||||
white-space: normal;
|
||||
background-color: #fff;
|
||||
@ -5723,8 +5726,6 @@ button.close {
|
||||
padding: 8px 14px;
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
line-height: 18px;
|
||||
background-color: #f7f7f7;
|
||||
border-bottom: 1px solid #ebebeb;
|
||||
border-radius: 5px 5px 0 0;
|
||||
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
2
dist/js/bootstrap.js
vendored
2
dist/js/bootstrap.js
vendored
@ -635,7 +635,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
|
||||
var data = $this.data('bs.collapse')
|
||||
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
|
||||
|
||||
if (!data && options.toggle && option == 'show') option = !option
|
||||
if (!data && options.toggle && option == 'show') options.toggle = false
|
||||
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
|
||||
if (typeof option == 'string') data[option]()
|
||||
})
|
||||
|
2
dist/js/bootstrap.min.js
vendored
2
dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
@ -730,7 +730,7 @@
|
||||
</div>
|
||||
<div class="bs-customizer-input">
|
||||
<label for="input-@navbar-inverse-color">@navbar-inverse-color</label>
|
||||
<input id="input-@navbar-inverse-color" type="text" value="lighten(@gray-light, 12%)" data-var="@navbar-inverse-color" class="form-control"/>
|
||||
<input id="input-@navbar-inverse-color" type="text" value="lighten(@gray-light, 15%)" data-var="@navbar-inverse-color" class="form-control"/>
|
||||
</div>
|
||||
<div class="bs-customizer-input">
|
||||
<label for="input-@navbar-inverse-bg">@navbar-inverse-bg</label>
|
||||
@ -742,7 +742,7 @@
|
||||
</div>
|
||||
<div class="bs-customizer-input">
|
||||
<label for="input-@navbar-inverse-link-color">@navbar-inverse-link-color</label>
|
||||
<input id="input-@navbar-inverse-link-color" type="text" value="@gray-light" data-var="@navbar-inverse-link-color" class="form-control"/>
|
||||
<input id="input-@navbar-inverse-link-color" type="text" value="lighten(@gray-light, 15%)" data-var="@navbar-inverse-link-color" class="form-control"/>
|
||||
</div>
|
||||
<div class="bs-customizer-input">
|
||||
<label for="input-@navbar-inverse-link-hover-color">@navbar-inverse-link-hover-color</label>
|
||||
@ -813,10 +813,6 @@
|
||||
<label for="input-@nav-disabled-link-hover-color">@nav-disabled-link-hover-color</label>
|
||||
<input id="input-@nav-disabled-link-hover-color" type="text" value="@gray-light" data-var="@nav-disabled-link-hover-color" class="form-control"/>
|
||||
</div>
|
||||
<div class="bs-customizer-input">
|
||||
<label for="input-@nav-open-link-hover-color">@nav-open-link-hover-color</label>
|
||||
<input id="input-@nav-open-link-hover-color" type="text" value="#fff" data-var="@nav-open-link-hover-color" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
<h2 id="tabs">Tabs</h2>
|
||||
<div class="row">
|
||||
@ -1092,7 +1088,7 @@
|
||||
</div>
|
||||
<div class="bs-customizer-input">
|
||||
<label for="input-@popover-arrow-color">@popover-arrow-color</label>
|
||||
<input id="input-@popover-arrow-color" type="text" value="#fff" data-var="@popover-arrow-color" class="form-control"/>
|
||||
<input id="input-@popover-arrow-color" type="text" value="@popover-bg" data-var="@popover-arrow-color" class="form-control"/>
|
||||
<p class="help-block">Popover arrow color</p>
|
||||
</div>
|
||||
<div class="bs-customizer-input">
|
||||
|
@ -1,8 +1,9 @@
|
||||
<div class="bs-docs-section">
|
||||
<h1 id="carousel" class="page-header">Carousel <small>carousel.js</small></h1>
|
||||
|
||||
<p>A slideshow component for cycling through elemnts, like a carousel. <strong>Nested carousels are not supported.</strong></p>
|
||||
|
||||
<h2 id="carousel-examples">Examples</h2>
|
||||
<p>The slideshow below shows a generic plugin and component for cycling through elements like a carousel.</p>
|
||||
<div class="bs-example">
|
||||
<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
|
||||
<ol class="carousel-indicators">
|
||||
|
2
docs/assets/css/docs.min.css
vendored
2
docs/assets/css/docs.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1143,7 +1143,6 @@ h1[id] {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
word-break: normal;
|
||||
word-wrap: nowrap;
|
||||
white-space: nowrap;
|
||||
background-color: transparent;
|
||||
border: 0;
|
||||
@ -1391,13 +1390,16 @@ h1[id] {
|
||||
margin-top: 0;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.bs-dropzone hr {
|
||||
width: 100px;
|
||||
}
|
||||
.bs-dropzone .lead {
|
||||
margin-bottom: 10px;
|
||||
font-weight: normal;
|
||||
color: #333;
|
||||
}
|
||||
.bs-dropzone hr {
|
||||
width: 100px;
|
||||
/*.bs-dropzone*/ #import-manual-trigger {
|
||||
cursor: pointer;
|
||||
}
|
||||
.bs-dropzone p:last-child {
|
||||
margin-bottom: 0;
|
||||
|
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
4
docs/assets/js/raw-files.min.js
vendored
4
docs/assets/js/raw-files.min.js
vendored
File diff suppressed because one or more lines are too long
33
docs/dist/css/bootstrap.css
vendored
33
docs/dist/css/bootstrap.css
vendored
@ -205,8 +205,8 @@ th {
|
||||
abbr[title]:after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
a[href^="javascript:"]:after,
|
||||
a[href^="#"]:after {
|
||||
a[href^="#"]:after,
|
||||
a[href^="javascript:"]:after {
|
||||
content: "";
|
||||
}
|
||||
pre,
|
||||
@ -241,10 +241,6 @@ th {
|
||||
.navbar {
|
||||
display: none;
|
||||
}
|
||||
.table td,
|
||||
.table th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
.btn > .caret,
|
||||
.dropup > .btn > .caret {
|
||||
border-top-color: #000 !important;
|
||||
@ -255,6 +251,10 @@ th {
|
||||
.table {
|
||||
border-collapse: collapse !important;
|
||||
}
|
||||
.table td,
|
||||
.table th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
.table-bordered th,
|
||||
.table-bordered td {
|
||||
border: 1px solid #ddd !important;
|
||||
@ -3178,9 +3178,11 @@ input[type="button"].btn-block {
|
||||
}
|
||||
.collapse {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
.collapse.in {
|
||||
display: block;
|
||||
visibility: visibile;
|
||||
}
|
||||
tr.collapse.in {
|
||||
display: table-row;
|
||||
@ -3846,9 +3848,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
}
|
||||
.tab-content > .tab-pane {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
.tab-content > .active {
|
||||
display: block;
|
||||
visibility: visible;
|
||||
}
|
||||
.nav-tabs .dropdown-menu {
|
||||
margin-top: -1px;
|
||||
@ -4281,7 +4285,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
border-color: #080808;
|
||||
}
|
||||
.navbar-inverse .navbar-brand {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-brand:hover,
|
||||
.navbar-inverse .navbar-brand:focus {
|
||||
@ -4289,10 +4293,10 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
background-color: transparent;
|
||||
}
|
||||
.navbar-inverse .navbar-text {
|
||||
color: #969696;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav > li > a {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav > li > a:hover,
|
||||
.navbar-inverse .navbar-nav > li > a:focus {
|
||||
@ -4339,7 +4343,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
background-color: #080808;
|
||||
}
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
|
||||
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
|
||||
@ -4360,13 +4364,13 @@ fieldset[disabled] .navbar-default .btn-link:focus {
|
||||
}
|
||||
}
|
||||
.navbar-inverse .navbar-link {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .navbar-link:hover {
|
||||
color: #fff;
|
||||
}
|
||||
.navbar-inverse .btn-link {
|
||||
color: #777;
|
||||
color: #9d9d9d;
|
||||
}
|
||||
.navbar-inverse .btn-link:hover,
|
||||
.navbar-inverse .btn-link:focus {
|
||||
@ -5692,6 +5696,9 @@ button.close {
|
||||
display: none;
|
||||
max-width: 276px;
|
||||
padding: 1px;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
line-height: 1.42857143;
|
||||
text-align: left;
|
||||
white-space: normal;
|
||||
background-color: #fff;
|
||||
@ -5719,8 +5726,6 @@ button.close {
|
||||
padding: 8px 14px;
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
line-height: 18px;
|
||||
background-color: #f7f7f7;
|
||||
border-bottom: 1px solid #ebebeb;
|
||||
border-radius: 5px 5px 0 0;
|
||||
|
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/js/bootstrap.js
vendored
2
docs/dist/js/bootstrap.js
vendored
@ -635,7 +635,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
|
||||
var data = $this.data('bs.collapse')
|
||||
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
|
||||
|
||||
if (!data && options.toggle && option == 'show') option = !option
|
||||
if (!data && options.toggle && option == 'show') options.toggle = false
|
||||
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
|
||||
if (typeof option == 'string') data[option]()
|
||||
})
|
||||
|
2
docs/dist/js/bootstrap.min.js
vendored
2
docs/dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
@ -124,7 +124,7 @@
|
||||
var data = $this.data('bs.collapse')
|
||||
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
|
||||
|
||||
if (!data && options.toggle && option == 'show') option = !option
|
||||
if (!data && options.toggle && option == 'show') options.toggle = false
|
||||
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
|
||||
if (typeof option == 'string') data[option]()
|
||||
})
|
||||
|
@ -102,6 +102,38 @@ $(function () {
|
||||
$target.click()
|
||||
})
|
||||
|
||||
test('should not close a collapse when initialized with "show" if already shown', function () {
|
||||
stop()
|
||||
|
||||
expect(0)
|
||||
|
||||
var $test = $('<div id="test1" class="in"/>')
|
||||
.appendTo('#qunit-fixture')
|
||||
.on('hide.bs.collapse', function () {
|
||||
ok(false)
|
||||
})
|
||||
|
||||
$test.bootstrapCollapse('show')
|
||||
|
||||
setTimeout(start, 0)
|
||||
})
|
||||
|
||||
test('should open a collapse when initialized with "show" if not already shown', function () {
|
||||
stop()
|
||||
|
||||
expect(1)
|
||||
|
||||
var $test = $('<div id="test1" />')
|
||||
.appendTo('#qunit-fixture')
|
||||
.on('show.bs.collapse', function () {
|
||||
ok(true)
|
||||
})
|
||||
|
||||
$test.bootstrapCollapse('show')
|
||||
|
||||
setTimeout(start, 0)
|
||||
})
|
||||
|
||||
test('should remove "collapsed" class from active accordion target', function () {
|
||||
stop()
|
||||
|
||||
|
@ -103,9 +103,8 @@
|
||||
&:focus {
|
||||
color: @dropdown-link-disabled-color;
|
||||
}
|
||||
}
|
||||
// Nuke hover/focus effects
|
||||
.dropdown-menu > .disabled > a {
|
||||
|
||||
// Nuke hover/focus effects
|
||||
&:hover,
|
||||
&:focus {
|
||||
text-decoration: none;
|
||||
@ -212,4 +211,3 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -75,7 +75,7 @@ a.list-group-item {
|
||||
background-color: @list-group-disabled-bg;
|
||||
color: @list-group-disabled-color;
|
||||
cursor: not-allowed;
|
||||
|
||||
|
||||
// Force color to inherit for custom content
|
||||
.list-group-item-heading {
|
||||
color: inherit;
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
.label-variant(@color) {
|
||||
background-color: @color;
|
||||
|
||||
|
||||
&[href] {
|
||||
&:hover,
|
||||
&:focus {
|
||||
|
@ -51,5 +51,4 @@
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -11,7 +11,11 @@
|
||||
display: none;
|
||||
max-width: @popover-max-width;
|
||||
padding: 1px;
|
||||
text-align: left; // Reset given new insertion method
|
||||
// Reset font and text propertes given new insertion method
|
||||
font-size: @font-size-base;
|
||||
font-weight: normal;
|
||||
line-height: @line-height-base;
|
||||
text-align: left;
|
||||
background-color: @popover-bg;
|
||||
background-clip: padding-box;
|
||||
border: 1px solid @popover-fallback-border-color;
|
||||
@ -33,8 +37,6 @@
|
||||
margin: 0; // reset heading margin
|
||||
padding: 8px 14px;
|
||||
font-size: @font-size-base;
|
||||
font-weight: normal;
|
||||
line-height: 18px;
|
||||
background-color: @popover-title-bg;
|
||||
border-bottom: 1px solid darken(@popover-title-bg, 5%);
|
||||
border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;
|
||||
@ -129,5 +131,4 @@
|
||||
bottom: -@popover-arrow-width;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,15 +1,14 @@
|
||||
//
|
||||
// Basic print styles
|
||||
// --------------------------------------------------
|
||||
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
|
||||
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
|
||||
|
||||
@media print {
|
||||
|
||||
* {
|
||||
text-shadow: none !important;
|
||||
color: #000 !important; // Black prints faster: h5bp.com/s
|
||||
background: transparent !important;
|
||||
color: #000 !important; // Black prints faster: h5bp.com/s
|
||||
box-shadow: none !important;
|
||||
text-shadow: none !important;
|
||||
}
|
||||
|
||||
a,
|
||||
@ -25,9 +24,10 @@
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
|
||||
// Don't show links for images, or javascript/internal links
|
||||
a[href^="javascript:"]:after,
|
||||
a[href^="#"]:after {
|
||||
// Don't show links that are fragment identifiers,
|
||||
// or use the `javascript:` pseudo protocol
|
||||
a[href^="#"]:after,
|
||||
a[href^="javascript:"]:after {
|
||||
content: "";
|
||||
}
|
||||
|
||||
@ -72,12 +72,6 @@
|
||||
.navbar {
|
||||
display: none;
|
||||
}
|
||||
.table {
|
||||
td,
|
||||
th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
}
|
||||
.btn,
|
||||
.dropup > .btn {
|
||||
> .caret {
|
||||
@ -90,6 +84,11 @@
|
||||
|
||||
.table {
|
||||
border-collapse: collapse !important;
|
||||
|
||||
td,
|
||||
th {
|
||||
background-color: #fff !important;
|
||||
}
|
||||
}
|
||||
.table-bordered {
|
||||
th,
|
||||
@ -97,5 +96,4 @@
|
||||
border: 1px solid #ddd !important;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -369,12 +369,12 @@
|
||||
|
||||
// Inverted navbar
|
||||
// Reset inverted navbar basics
|
||||
@navbar-inverse-color: lighten(@gray-light, 12%);
|
||||
@navbar-inverse-color: lighten(@gray-light, 15%);
|
||||
@navbar-inverse-bg: #222;
|
||||
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
|
||||
|
||||
// Inverted navbar links
|
||||
@navbar-inverse-link-color: @gray-light;
|
||||
@navbar-inverse-link-color: lighten(@gray-light, 15%);
|
||||
@navbar-inverse-link-hover-color: #fff;
|
||||
@navbar-inverse-link-hover-bg: transparent;
|
||||
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
|
||||
@ -528,7 +528,7 @@
|
||||
//** Popover arrow width
|
||||
@popover-arrow-width: 10px;
|
||||
//** Popover arrow color
|
||||
@popover-arrow-color: #fff;
|
||||
@popover-arrow-color: @popover-bg;
|
||||
|
||||
//** Popover outer arrow width
|
||||
@popover-arrow-outer-width: (@popover-arrow-width + 1);
|
||||
@ -841,5 +841,3 @@
|
||||
@dl-horizontal-offset: @component-offset-horizontal;
|
||||
//** Horizontal line color.
|
||||
@hr-border: @gray-lighter;
|
||||
|
||||
|
||||
|
16
package.json
16
package.json
@ -31,9 +31,9 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"btoa": "~1.1.2",
|
||||
"glob": "~4.0.4",
|
||||
"glob": "~4.0.5",
|
||||
"grunt": "~0.4.5",
|
||||
"grunt-autoprefixer": "~1.0.0",
|
||||
"grunt-autoprefixer": "~1.0.1",
|
||||
"grunt-banner": "~0.2.3",
|
||||
"grunt-contrib-clean": "~0.6.0",
|
||||
"grunt-contrib-concat": "~0.5.0",
|
||||
@ -43,21 +43,21 @@
|
||||
"grunt-contrib-cssmin": "~0.10.0",
|
||||
"grunt-contrib-jade": "~0.12.0",
|
||||
"grunt-contrib-jshint": "~0.10.0",
|
||||
"grunt-contrib-less": "~0.11.3",
|
||||
"grunt-contrib-less": "~0.11.4",
|
||||
"grunt-contrib-qunit": "~0.5.2",
|
||||
"grunt-contrib-uglify": "~0.5.0",
|
||||
"grunt-contrib-uglify": "~0.5.1",
|
||||
"grunt-contrib-watch": "~0.6.1",
|
||||
"grunt-csscomb": "~3.0.0",
|
||||
"grunt-exec": "~0.4.6",
|
||||
"grunt-html-validation": "~0.1.18",
|
||||
"grunt-jekyll": "~0.4.2",
|
||||
"grunt-jscs": "~0.6.1",
|
||||
"grunt-saucelabs": "~8.2.0",
|
||||
"grunt-jscs": "~0.6.2",
|
||||
"grunt-saucelabs": "~8.3.1",
|
||||
"grunt-sed": "~0.1.1",
|
||||
"load-grunt-tasks": "~0.6.0",
|
||||
"markdown": "~0.5.0",
|
||||
"npm-shrinkwrap": "~3.1.6",
|
||||
"time-grunt": "~0.4.0"
|
||||
"npm-shrinkwrap": "~3.1.8",
|
||||
"time-grunt": "~1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "~0.10.1"
|
||||
|
168
test-infra/npm-shrinkwrap.json
generated
168
test-infra/npm-shrinkwrap.json
generated
@ -226,52 +226,24 @@
|
||||
}
|
||||
},
|
||||
"grunt-autoprefixer": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-1.0.0.tgz",
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-1.0.1.tgz",
|
||||
"dependencies": {
|
||||
"autoprefixer": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-2.2.0.tgz",
|
||||
"autoprefixer-core": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-3.0.0.tgz",
|
||||
"dependencies": {
|
||||
"caniuse-db": {
|
||||
"version": "1.0.20140804",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140804.tgz"
|
||||
},
|
||||
"fs-extra": {
|
||||
"version": "0.10.0",
|
||||
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.10.0.tgz",
|
||||
"dependencies": {
|
||||
"jsonfile": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.2.0.tgz"
|
||||
},
|
||||
"mkdirp": {
|
||||
"version": "0.5.0",
|
||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
|
||||
"dependencies": {
|
||||
"minimist": {
|
||||
"version": "0.0.8",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ncp": {
|
||||
"version": "0.5.1",
|
||||
"resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz"
|
||||
},
|
||||
"rimraf": {
|
||||
"version": "2.2.8",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
|
||||
}
|
||||
}
|
||||
"version": "1.0.20140821",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140821.tgz"
|
||||
},
|
||||
"postcss": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-2.1.0.tgz",
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-2.2.1.tgz",
|
||||
"dependencies": {
|
||||
"base64-js": {
|
||||
"version": "0.0.7",
|
||||
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"
|
||||
"js-base64": {
|
||||
"version": "2.1.5",
|
||||
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.5.tgz"
|
||||
},
|
||||
"source-map": {
|
||||
"version": "0.1.38",
|
||||
@ -570,8 +542,8 @@
|
||||
"resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.2.8.tgz",
|
||||
"dependencies": {
|
||||
"readable-stream": {
|
||||
"version": "1.1.13-1",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
|
||||
"version": "1.1.13",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
|
||||
"dependencies": {
|
||||
"core-util-is": {
|
||||
"version": "1.0.1",
|
||||
@ -586,8 +558,8 @@
|
||||
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "0.10.25-1",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
|
||||
"version": "0.10.31",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -754,8 +726,8 @@
|
||||
}
|
||||
},
|
||||
"clean-css": {
|
||||
"version": "2.2.12",
|
||||
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.12.tgz",
|
||||
"version": "2.2.14",
|
||||
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.14.tgz",
|
||||
"dependencies": {
|
||||
"commander": {
|
||||
"version": "2.2.0",
|
||||
@ -806,8 +778,8 @@
|
||||
}
|
||||
},
|
||||
"figures": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/figures/-/figures-1.1.0.tgz"
|
||||
"version": "1.3.2",
|
||||
"resolved": "https://registry.npmjs.org/figures/-/figures-1.3.2.tgz"
|
||||
},
|
||||
"gzip-size": {
|
||||
"version": "0.2.0",
|
||||
@ -832,8 +804,8 @@
|
||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
|
||||
},
|
||||
"readable-stream": {
|
||||
"version": "1.1.13-1",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
|
||||
"version": "1.1.13",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
|
||||
"dependencies": {
|
||||
"core-util-is": {
|
||||
"version": "1.0.1",
|
||||
@ -844,8 +816,8 @@
|
||||
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "0.10.25-1",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
|
||||
"version": "0.10.31",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1036,8 +1008,8 @@
|
||||
}
|
||||
},
|
||||
"with": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/with/-/with-3.0.0.tgz",
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/with/-/with-3.0.1.tgz",
|
||||
"dependencies": {
|
||||
"uglify-js": {
|
||||
"version": "2.4.15",
|
||||
@ -1088,8 +1060,8 @@
|
||||
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
|
||||
},
|
||||
"jshint": {
|
||||
"version": "2.5.2",
|
||||
"resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.2.tgz",
|
||||
"version": "2.5.5",
|
||||
"resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.5.tgz",
|
||||
"dependencies": {
|
||||
"cli": {
|
||||
"version": "0.6.3",
|
||||
@ -1156,8 +1128,8 @@
|
||||
"resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
|
||||
},
|
||||
"readable-stream": {
|
||||
"version": "1.1.13-1",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
|
||||
"version": "1.1.13",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
|
||||
"dependencies": {
|
||||
"core-util-is": {
|
||||
"version": "1.0.1",
|
||||
@ -1172,8 +1144,8 @@
|
||||
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "0.10.25-1",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
|
||||
"version": "0.10.31",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1374,8 +1346,8 @@
|
||||
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
|
||||
"dependencies": {
|
||||
"punycode": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1436,8 +1408,8 @@
|
||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
|
||||
},
|
||||
"readable-stream": {
|
||||
"version": "1.1.13-1",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
|
||||
"version": "1.1.13",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
|
||||
"dependencies": {
|
||||
"core-util-is": {
|
||||
"version": "1.0.1",
|
||||
@ -1448,8 +1420,8 @@
|
||||
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "0.10.25-1",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
|
||||
"version": "0.10.31",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1572,8 +1544,8 @@
|
||||
}
|
||||
},
|
||||
"progress": {
|
||||
"version": "1.1.7",
|
||||
"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
|
||||
"version": "1.1.8",
|
||||
"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"
|
||||
},
|
||||
"request": {
|
||||
"version": "2.36.0",
|
||||
@ -1672,8 +1644,8 @@
|
||||
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
|
||||
"dependencies": {
|
||||
"punycode": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1772,8 +1744,8 @@
|
||||
"resolved": "https://registry.npmjs.org/maxmin/-/maxmin-0.2.2.tgz",
|
||||
"dependencies": {
|
||||
"figures": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/figures/-/figures-1.1.0.tgz"
|
||||
"version": "1.3.2",
|
||||
"resolved": "https://registry.npmjs.org/figures/-/figures-1.3.2.tgz"
|
||||
},
|
||||
"gzip-size": {
|
||||
"version": "0.2.0",
|
||||
@ -1798,8 +1770,8 @@
|
||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
|
||||
},
|
||||
"readable-stream": {
|
||||
"version": "1.1.13-1",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
|
||||
"version": "1.1.13",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
|
||||
"dependencies": {
|
||||
"core-util-is": {
|
||||
"version": "1.0.1",
|
||||
@ -1810,8 +1782,8 @@
|
||||
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "0.10.25-1",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
|
||||
"version": "0.10.31",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1962,8 +1934,8 @@
|
||||
"resolved": "https://registry.npmjs.org/grunt-csscomb/-/grunt-csscomb-3.0.0.tgz",
|
||||
"dependencies": {
|
||||
"csscomb": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/csscomb/-/csscomb-3.0.0.tgz",
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/csscomb/-/csscomb-3.0.1.tgz",
|
||||
"dependencies": {
|
||||
"commander": {
|
||||
"version": "2.0.0",
|
||||
@ -2162,8 +2134,8 @@
|
||||
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
|
||||
"dependencies": {
|
||||
"punycode": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -2718,8 +2690,8 @@
|
||||
}
|
||||
},
|
||||
"grunt-saucelabs": {
|
||||
"version": "8.2.0",
|
||||
"resolved": "https://registry.npmjs.org/grunt-saucelabs/-/grunt-saucelabs-8.2.0.tgz",
|
||||
"version": "8.3.1",
|
||||
"resolved": "https://registry.npmjs.org/grunt-saucelabs/-/grunt-saucelabs-8.3.1.tgz",
|
||||
"dependencies": {
|
||||
"colors": {
|
||||
"version": "0.6.2",
|
||||
@ -3038,8 +3010,8 @@
|
||||
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
|
||||
"dependencies": {
|
||||
"punycode": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -3366,8 +3338,8 @@
|
||||
"resolved": "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz",
|
||||
"dependencies": {
|
||||
"heap": {
|
||||
"version": "0.2.3",
|
||||
"resolved": "https://registry.npmjs.org/heap/-/heap-0.2.3.tgz"
|
||||
"version": "0.2.4",
|
||||
"resolved": "https://registry.npmjs.org/heap/-/heap-0.2.4.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -3902,8 +3874,8 @@
|
||||
}
|
||||
},
|
||||
"time-grunt": {
|
||||
"version": "0.4.0",
|
||||
"resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-0.4.0.tgz",
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-1.0.0.tgz",
|
||||
"dependencies": {
|
||||
"chalk": {
|
||||
"version": "0.5.1",
|
||||
@ -3944,24 +3916,28 @@
|
||||
}
|
||||
},
|
||||
"date-time": {
|
||||
"version": "0.1.1",
|
||||
"resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz"
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/date-time/-/date-time-1.0.0.tgz"
|
||||
},
|
||||
"figures": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/figures/-/figures-1.1.0.tgz"
|
||||
"version": "1.3.2",
|
||||
"resolved": "https://registry.npmjs.org/figures/-/figures-1.3.2.tgz"
|
||||
},
|
||||
"hooker": {
|
||||
"version": "0.2.3",
|
||||
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
|
||||
},
|
||||
"pretty-ms": {
|
||||
"version": "0.2.2",
|
||||
"resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz",
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-1.0.0.tgz",
|
||||
"dependencies": {
|
||||
"get-stdin": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.0.tgz"
|
||||
},
|
||||
"parse-ms": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz"
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.0.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user