Skip to content
GitLab
Commit cabb86d1 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'master' into derp 

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/_includes/components/progress-bars.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
parents f6482aad c3ae289f
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 105 additions and 67 deletions
+105 -67
Gruntfile.js
+ 1
- 1
View file @ cabb86d1
......@@ -474,7 +474,7 @@ module.exports = function (grunt) {
var done = this.async();
npmShrinkwrap({ dev: true, dirname: __dirname }, function (err) {
if (err) {
grunt.fail.warn(err)
grunt.fail.warn(err);
}
var dest = 'test-infra/npm-shrinkwrap.json';
fs.renameSync('npm-shrinkwrap.json', dest);
......
docs/_includes/js/dropdowns.html
+ 1
- 2
View file @ cabb86d1
......@@ -104,7 +104,7 @@
<p>Add <code>data-toggle="dropdown"</code> to a link or button to toggle a dropdown.</p>
{% highlight html %}
<div class="dropdown">
<a data-toggle="dropdown" href="#">Dropdown trigger</a>
<a id="dLabel" role="button" data-toggle="dropdown" href="#">Dropdown trigger</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
...
</ul>
......@@ -117,7 +117,6 @@
Dropdown
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
...
</ul>
......
docs/assets/css/docs.min.css
+ 1
- 1
View file @ cabb86d1
This diff is collapsed.
docs/assets/js/customize.min.js
+ 3
- 3
View file @ cabb86d1
This diff is collapsed.
docs/assets/js/docs.min.js
+ 1
- 1
View file @ cabb86d1
......@@ -21,4 +21,4 @@ var Holder=Holder||{};!function(a,b){function c(a,b,c){b=parseInt(b,10),a=parseI
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
!function(a){"use strict";a(function(){var b=a(window),c=a(document.body);c.scrollspy({target:".active .bs-docs-sidenav"}),b.on("load",function(){c.scrollspy("refresh")})(function(){var b=a("#bs-theme-stylesheet"),c=a(".bs-docs-theme-toggle"),d=function(){b.attr("href",b.attr("data-href")),c.text("Disable theme preview"),localStorage.setItem("previewTheme",!0)};localStorage.getItem("previewTheme")&&d(),c.click(function(){var a=b.attr("href");a&&0!==a.indexOf("data")?(b.attr("href",""),c.text("Preview theme"),localStorage.removeItem("previewTheme")):d()})}),a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a(".bs-docs-popover-dismiss").popover({trigger:"focus"}),a("#loading-example-btn").click(function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b=a(this),c=b.prev(),d='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';c.hasClass("bs-example")?c.before(d.replace(/btn-clipboard/,"btn-clipboard with-example")):b.before(d)});var d=new ZeroClipboard(a(".btn-clipboard")),e=a("#global-zeroclipboard-html-bridge");d.on("load",function(){e.data("placement","top").attr("title","Copy to clipboard").tooltip()}),d.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),d.on("complete",function(){e.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),d.on("noflash wrongflash",function(){e.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery);
\ No newline at end of file
!function(a){"use strict";a(function(){a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a(".bs-docs-popover-dismiss").popover({trigger:"focus"}),a("#loading-example-btn").click(function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b=a(this),c=b.prev(),d='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';c.hasClass("bs-example")?c.before(d.replace(/btn-clipboard/,"btn-clipboard with-example")):b.before(d)});var b=new ZeroClipboard(a(".btn-clipboard")),c=a("#global-zeroclipboard-html-bridge");b.on("load",function(){c.data("placement","top").attr("title","Copy to clipboard").tooltip()}),b.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),b.on("complete",function(){c.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),b.on("noflash wrongflash",function(){c.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery);
\ No newline at end of file
docs/assets/js/raw-files.min.js
+ 2
- 2
View file @ cabb86d1
This diff is collapsed.
docs/assets/js/vendor/uglify.min.js
+ 3
- 3
View file @ cabb86d1
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/examples/theme/index.html
+ 1
- 1
View file @ cabb86d1
......@@ -476,7 +476,7 @@
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">100% Complete</span></div>
<div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete</span></div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-success" style="width: 35%"><span class="sr-only">35% Complete (success)</span></div>
......
grunt/.jshintrc
+ 1
- 0
View file @ cabb86d1
{
"extends" : "../js/.jshintrc",
"asi" : false,
"browser" : false,
"es3" : false,
"node" : true
......
package.json
+ 2
- 2
View file @ cabb86d1
......@@ -44,7 +44,7 @@
"grunt-contrib-jade": "~0.12.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.11.3",
"grunt-contrib-qunit": "~0.5.1",
"grunt-contrib-qunit": "~0.5.2",
"grunt-contrib-uglify": "~0.5.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~2.0.1",
......@@ -57,7 +57,7 @@
"load-grunt-tasks": "~0.6.0",
"markdown": "~0.5.0",
"npm-shrinkwrap": "~3.1.6",
"time-grunt": "~0.3.2"
"time-grunt": "~0.4.0"
},
"engines": {
"node": "~0.10.1"
......
test-infra/npm-shrinkwrap.json
+ 89
- 51
View file @ cabb86d1
......@@ -274,8 +274,8 @@
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"
},
"source-map": {
"version": "0.1.34",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
"version": "0.1.36",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.36.tgz",
"dependencies": {
"amdefine": {
"version": "0.1.0",
......@@ -714,12 +714,12 @@
}
},
"maxmin": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/maxmin/-/maxmin-0.2.1.tgz",
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/maxmin/-/maxmin-0.2.2.tgz",
"dependencies": {
"chalk": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz",
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
"dependencies": {
"ansi-styles": {
"version": "1.1.0",
......@@ -755,6 +755,10 @@
}
}
},
"figures": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/figures/-/figures-1.0.1.tgz"
},
"gzip-size": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-0.2.0.tgz",
......@@ -764,8 +768,8 @@
"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
"dependencies": {
"pako": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.3.tgz"
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.4.tgz"
}
}
},
......@@ -856,12 +860,12 @@
"resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"
},
"constantinople": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.0.tgz",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz",
"dependencies": {
"uglify-js": {
"version": "2.4.14",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz",
"version": "2.4.15",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz",
"dependencies": {
"async": {
"version": "0.2.10",
......@@ -968,8 +972,8 @@
}
},
"source-map": {
"version": "0.1.34",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
"version": "0.1.36",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.36.tgz",
"dependencies": {
"amdefine": {
"version": "0.1.0",
......@@ -986,8 +990,8 @@
"resolved": "https://registry.npmjs.org/with/-/with-3.0.0.tgz",
"dependencies": {
"uglify-js": {
"version": "2.4.14",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz",
"version": "2.4.15",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz",
"dependencies": {
"async": {
"version": "0.2.10",
......@@ -1082,8 +1086,8 @@
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
},
"htmlparser2": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.2.tgz",
"version": "3.7.3",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz",
"dependencies": {
"domelementtype": {
"version": "1.1.1",
......@@ -1312,8 +1316,8 @@
}
},
"source-map": {
"version": "0.1.34",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
"version": "0.1.36",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.36.tgz",
"dependencies": {
"amdefine": {
"version": "0.1.0",
......@@ -1402,8 +1406,8 @@
}
},
"grunt-contrib-qunit": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.5.1.tgz",
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.5.2.tgz",
"dependencies": {
"grunt-lib-phantomjs": {
"version": "0.6.0",
......@@ -1414,8 +1418,8 @@
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
},
"phantomjs": {
"version": "1.9.7-12",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-12.tgz",
"version": "1.9.7-14",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-14.tgz",
"dependencies": {
"adm-zip": {
"version": "0.2.1",
......@@ -1728,8 +1732,8 @@
}
},
"uglify-js": {
"version": "2.4.14",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz",
"version": "2.4.15",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz",
"dependencies": {
"async": {
"version": "0.2.10",
......@@ -2100,8 +2104,8 @@
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.1.tgz"
},
"debug": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
"dependencies": {
"ms": {
"version": "0.6.2",
......@@ -2124,8 +2128,8 @@
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.1.tgz"
},
"debug": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
"dependencies": {
"ms": {
"version": "0.6.2",
......@@ -2160,8 +2164,8 @@
"resolved": "https://registry.npmjs.org/rainbowsocks/-/rainbowsocks-0.1.2.tgz",
"dependencies": {
"debug": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz",
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
"dependencies": {
"ms": {
"version": "0.6.2",
......@@ -3410,8 +3414,8 @@
}
},
"request": {
"version": "2.36.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
"version": "2.37.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.37.0.tgz",
"dependencies": {
"aws-sign2": {
"version": "0.5.0",
......@@ -3438,12 +3442,16 @@
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
}
}
},
"mime": {
"version": "1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
}
}
},
"hawk": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
"dependencies": {
"boom": {
"version": "0.4.2",
......@@ -3485,9 +3493,9 @@
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
},
"mime": {
"version": "1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
"mime-types": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.1.tgz"
},
"node-uuid": {
"version": "1.4.1",
......@@ -3886,24 +3894,44 @@
}
},
"time-grunt": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-0.3.2.tgz",
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-0.4.0.tgz",
"dependencies": {
"chalk": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
"dependencies": {
"ansi-styles": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
},
"escape-string-regexp": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.0.tgz"
},
"has-color": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"
"has-ansi": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
"dependencies": {
"ansi-regex": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
}
}
},
"strip-ansi": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
"dependencies": {
"ansi-regex": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
}
}
},
"supports-color": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
}
}
},
......@@ -3911,13 +3939,23 @@
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz"
},
"figures": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/figures/-/figures-1.0.1.tgz"
},
"hooker": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
},
"pretty-ms": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.1.0.tgz"
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz",
"dependencies": {
"parse-ms": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz"
}
}
},
"text-table": {
"version": "0.2.0",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment