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

Update dependencies.

This commit is contained in:
XhmikosR 2014-06-30 18:35:17 +03:00
parent a13f645d20
commit 225351431e
9 changed files with 66 additions and 122 deletions

View File

@ -3859,7 +3859,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
left: 0;
z-index: 1030;
-webkit-transform: translate3d(0, 0, 0);
-o-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
@media (min-width: 768px) {
@ -5393,12 +5392,10 @@ button.close {
-o-transition: -o-transform .3s ease-out;
transition: transform .3s ease-out;
-webkit-transform: translate3d(0, -25%, 0);
-o-transform: translate3d(0, -25%, 0);
transform: translate3d(0, -25%, 0);
}
.modal.in .modal-dialog {
-webkit-transform: translate3d(0, 0, 0);
-o-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
.modal-open .modal {
@ -5988,7 +5985,6 @@ button.close {
.affix {
position: fixed;
-webkit-transform: translate3d(0, 0, 0);
-o-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
@-ms-viewport {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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:".bs-docs-sidebar"}),b.on("load",function(){c.scrollspy("refresh")}),a(".bs-docs-container [href=#]").click(function(a){a.preventDefault()}),setTimeout(function(){var b=a(".bs-docs-sidebar");b.affix({offset:{top:function(){var c=b.offset().top,d=parseInt(b.children(0).css("margin-top"),10),e=a(".bs-docs-nav").height();return this.top=c-e-d},bottom:function(){return this.bottom=a(".bs-docs-footer").outerHeight(!0)}}})},100),setTimeout(function(){a(".bs-top").affix()},100),function(){var b=a("#bs-theme-stylesheet"),c=a(".bs-docs-theme-toggle");c.click(function(){var a=b.attr("href");a&&0!==a.indexOf("data")?(b.attr("href",""),c.text("Preview theme")):(b.attr("href",b.attr("data-href")),c.text("Disable theme preview"))})}(),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);
!function(a){"use strict";a(function(){var b=a(window),c=a(document.body);c.scrollspy({target:".bs-docs-sidebar"}),b.on("load",function(){c.scrollspy("refresh")}),a(".bs-docs-container [href=#]").click(function(a){a.preventDefault()}),setTimeout(function(){var b=a(".bs-docs-sidebar");b.affix({offset:{top:function(){var c=b.offset().top,d=parseInt(b.children(0).css("margin-top"),10),e=a(".bs-docs-nav").height();return this.top=c-e-d},bottom:function(){return this.bottom=a(".bs-docs-footer").outerHeight(!0)}}})},100),setTimeout(function(){a(".bs-top").affix()},100),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);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -31,7 +31,7 @@
},
"devDependencies": {
"btoa": "~1.1.2",
"glob": "~4.0.2",
"glob": "~4.0.3",
"grunt": "~0.4.5",
"grunt-autoprefixer": "~0.8.0",
"grunt-banner": "~0.2.3",

View File

@ -8,9 +8,13 @@
"resolved": "https://registry.npmjs.org/btoa/-/btoa-1.1.2.tgz"
},
"glob": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.0.2.tgz",
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.0.3.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
@ -226,20 +230,20 @@
"resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-0.8.0.tgz",
"dependencies": {
"autoprefixer": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-2.0.0.tgz",
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-2.0.2.tgz",
"dependencies": {
"caniuse-db": {
"version": "1.0.20140623",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140623.tgz"
"version": "1.0.20140628",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140628.tgz"
},
"fs-extra": {
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.9.1.tgz",
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.10.0.tgz",
"dependencies": {
"jsonfile": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz"
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.2.0.tgz"
},
"mkdirp": {
"version": "0.5.0",
@ -700,8 +704,8 @@
}
},
"clean-css": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.3.tgz",
"version": "2.2.5",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.5.tgz",
"dependencies": {
"commander": {
"version": "2.2.0",
@ -1372,8 +1376,8 @@
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
},
"phantomjs": {
"version": "1.9.7-10",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-10.tgz",
"version": "1.9.7-12",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-12.tgz",
"dependencies": {
"adm-zip": {
"version": "0.2.1",
@ -1437,6 +1441,10 @@
}
}
},
"progress": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.6.tgz"
},
"request": {
"version": "2.36.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
@ -1545,6 +1553,16 @@
}
}
},
"request-progress": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
"dependencies": {
"throttleit": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
}
}
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
@ -3116,8 +3134,8 @@
}
},
"npm": {
"version": "1.4.16",
"resolved": "https://registry.npmjs.org/npm/-/npm-1.4.16.tgz",
"version": "1.4.18",
"resolved": "https://registry.npmjs.org/npm/-/npm-1.4.18.tgz",
"dependencies": {
"abbrev": {
"version": "1.0.5",
@ -3201,7 +3219,13 @@
},
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz"
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz",
"dependencies": {
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
}
}
},
"fstream-npm": {
"version": "0.1.7",
@ -3209,31 +3233,7 @@
"dependencies": {
"fstream-ignore": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz",
"dependencies": {
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
}
}
"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz"
}
}
},
@ -3246,8 +3246,8 @@
"resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.2.0.tgz"
},
"glob": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.0.2.tgz"
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.0.3.tgz"
},
"graceful-fs": {
"version": "3.0.2",
@ -3278,8 +3278,8 @@
"resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.2.3.tgz",
"dependencies": {
"glob": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.0.2.tgz",
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.0.3.tgz",
"dependencies": {
"inherits": {
"version": "2.0.1",
@ -3361,28 +3361,6 @@
"version": "0.13.1",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz",
"dependencies": {
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
},
"mkdirp": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
@ -3504,38 +3482,6 @@
"semver": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-2.3.1.tgz"
},
"tar": {
"version": "0.1.20",
"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
"dependencies": {
"block-stream": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
},
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
},
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
}
}
},
@ -3688,8 +3634,8 @@
"resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.0.tgz"
},
"npmconf": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/npmconf/-/npmconf-1.0.6.tgz",
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/npmconf/-/npmconf-1.1.2.tgz",
"dependencies": {
"config-chain": {
"version": "1.1.8",
@ -3700,6 +3646,14 @@
"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
}
}
},
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"semver": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-2.3.1.tgz"
}
}
},
@ -3742,8 +3696,8 @@
"resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.2.3.tgz",
"dependencies": {
"glob": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.0.2.tgz",
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.0.3.tgz",
"dependencies": {
"inherits": {
"version": "2.0.1",
@ -3967,13 +3921,7 @@
},
"tar": {
"version": "0.1.20",
"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
"dependencies": {
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz"
}
}
"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz"
},
"text-table": {
"version": "0.2.0",