mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-23 09:41:11 +00:00
Use jekyll var for current version in docs; update banner in gruntfile to match .less banner
This commit is contained in:
parent
7a7149d2ee
commit
48d929d69e
@ -9,9 +9,11 @@ module.exports = function(grunt) {
|
|||||||
// Metadata.
|
// Metadata.
|
||||||
pkg: grunt.file.readJSON('package.json'),
|
pkg: grunt.file.readJSON('package.json'),
|
||||||
banner: '/**\n' +
|
banner: '/**\n' +
|
||||||
'* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' +
|
'* Bootstrap v<%= pkg.version %> by @fat and @mdo\n' +
|
||||||
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
|
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
|
||||||
'* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
|
'* Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>.\n' +
|
||||||
|
'*\n' +
|
||||||
|
'* Designed and built with all the love in the world by @mdo and @fat.\n' +
|
||||||
'*/\n',
|
'*/\n',
|
||||||
jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
|
jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@ exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json",
|
|||||||
port: 9001
|
port: 9001
|
||||||
|
|
||||||
# Custom vars
|
# Custom vars
|
||||||
|
current_version: 3.0.0
|
||||||
repo: https://github.com/twbs/bootstrap
|
repo: https://github.com/twbs/bootstrap
|
||||||
download: https://github.com/twbs/bootstrap/archive/v3.0.0.zip
|
download: https://github.com/twbs/bootstrap/archive/v3.0.0.zip
|
||||||
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip
|
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
|
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
|
||||||
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
|
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
|
||||||
<ul class="footer-links">
|
<ul class="footer-links">
|
||||||
<li>Currently v3.0.0</li>
|
<li>Currently v{{ site.current_version }}</li>
|
||||||
<li class="muted">·</li>
|
<li class="muted">·</li>
|
||||||
<li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
|
<li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
|
||||||
<li class="muted">·</li>
|
<li class="muted">·</li>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
<ul class="bs-masthead-links">
|
<ul class="bs-masthead-links">
|
||||||
<li class="current-version">
|
<li class="current-version">
|
||||||
Currently v3.0.0
|
Currently v{{ site.current_version }}
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a>
|
<a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a>
|
||||||
|
6
dist/js/bootstrap.js
vendored
6
dist/js/bootstrap.js
vendored
@ -1,7 +1,9 @@
|
|||||||
/**
|
/**
|
||||||
* bootstrap.js v3.0.0 by @fat and @mdo
|
* Bootstrap v3.0.0 by @fat and @mdo
|
||||||
* Copyright 2013 Twitter Inc.
|
* Copyright 2013 Twitter Inc.
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* Licensed under http://www.apache.org/licenses/LICENSE-2.0.
|
||||||
|
*
|
||||||
|
* Designed and built with all the love in the world by @mdo and @fat.
|
||||||
*/
|
*/
|
||||||
if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
|
||||||
|
|
||||||
|
6
dist/js/bootstrap.min.js
vendored
6
dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user