From 48d929d69edf06fd0b02e05522e0c8efe6b5b77f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Aug 2013 22:38:51 -0700 Subject: [PATCH] Use jekyll var for current version in docs; update banner in gruntfile to match .less banner --- Gruntfile.js | 6 ++++-- _config.yml | 1 + _layouts/default.html | 2 +- _layouts/home.html | 2 +- dist/js/bootstrap.js | 6 ++++-- dist/js/bootstrap.min.js | 6 ++++-- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index cfefae2cddd4..6b861113e470 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -9,9 +9,11 @@ module.exports = function(grunt) { // Metadata. pkg: grunt.file.readJSON('package.json'), 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' + - '* <%= _.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', jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n', diff --git a/_config.yml b/_config.yml index 332f252fd79c..b93496ae09a2 100644 --- a/_config.yml +++ b/_config.yml @@ -11,6 +11,7 @@ exclude: [".editorconfig", ".gitignore", ".ruby-version", "bower.json", port: 9001 # Custom vars +current_version: 3.0.0 repo: https://github.com/twbs/bootstrap 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 diff --git a/_layouts/default.html b/_layouts/default.html index de3368d52e6b..3f1276e4e6ed 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -58,7 +58,7 @@

{{ page.title }}

Designed and built with all the love in the world by @mdo and @fat.

Code licensed under Apache License v2.0, documentation under CC BY 3.0.