Commit 918b2a49 authored by Thomas Park's avatar Thomas Park
Browse files

3.2.0 -> 3.3.0

parent 5c12c8a9
This diff is collapsed.
This diff is collapsed.
// Amelia 3.2.0
// Bootswatch
// -----------------------------------------------------
@import url("//fonts.googleapis.com/css?family=Lobster|Cabin:400,700");
// Navbar =====================================================================
.navbar {
&-brand {
font-family: 'Lobster', cursive;
}
&-default {
.badge {
background-color: #fff;
color: @navbar-default-bg;
}
}
}
// Buttons ====================================================================
.btn {
.caret {
border-top-color: #fff;
}
}
.btn-default {
&:hover {
color: @btn-default-color;
}
.caret {
border-top-color: @btn-default-color;
}
}
// Typography =================================================================
.text-primary,
.text-primary:hover {
color: lighten(@brand-primary, 40%);
}
.text-success,
.text-success:hover {
color: lighten(@brand-success, 20%);
}
.text-danger,
.text-danger:hover {
color: lighten(@brand-danger, 20%);
}
.text-warning,
.text-warning:hover {
color: lighten(@brand-warning, 20%);
}
.text-info,
.text-info:hover {
color: lighten(@brand-info, 40%);
}
// Tables =====================================================================
.table-responsive > .table {
background-color: @table-bg;
}
table,
.table {
a:not(.btn) {
color: #fff;
text-decoration: underline;
}
.text-muted {
color: @text-muted;
}
}
// Forms ======================================================================
input,
textarea {
color: @input-color;
}
legend {
font-family: 'Lobster', cursive;
color: #fff;
}
.input-group-addon {
color: @btn-default-color;
}
.has-warning {
.help-block,
.control-label,
.form-control-feedback {
color: lighten(@brand-warning, 20%);
}
.form-control,
.form-control:focus {
border-color: lighten(@brand-warning, 20%);
}
.input-group-addon {
border: none;
}
}
.has-error {
.help-block,
.control-label,
.form-control-feedback {
color: lighten(@brand-primary, 40%);
}
.form-control,
.form-control:focus {
border-color: lighten(@brand-primary, 40%);
}
.input-group-addon {
border: none;
}
}
.has-success {
.help-block,
.control-label,
.form-control-feedback {
color: lighten(@brand-success, 20%);
}
.form-control,
.form-control:focus {
border-color: lighten(@brand-success, 20%);
}
.input-group-addon {
border: none;
}
}
// Navs =======================================================================
.pagination {
a:hover {
color: #fff;
}
}
.pager {
a:hover {
color: #fff;
}
}
// Indicators =================================================================
.close {
opacity: 0.4;
&:hover,
&:focus {
opacity: 1;
}
}
// Progress bars ==============================================================
// Containers =================================================================
a.thumbnail:hover,
a.thumbnail:focus,
a.thumbnail.active {
border-color: @thumbnail-border;
}
This diff is collapsed.
This diff is collapsed.
{ {
"version": "3.2.0", "version": "3.3.0",
"themes": [ "themes": [
{
"name": "Amelia",
"description": "Sweet and cheery",
"thumbnail": "http://bootswatch.com/amelia/thumbnail.png",
"preview": "http://bootswatch.com/amelia/",
"css": "http://bootswatch.com/amelia/bootstrap.css",
"cssMin": "http://bootswatch.com/amelia/bootstrap.min.css",
"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/amelia/bootstrap.min.css",
"less": "http://bootswatch.com/amelia/bootswatch.less",
"lessVariables": "http://bootswatch.com/amelia/variables.less"
},
{ {
"name": "Cerulean", "name": "Cerulean",
"description": "A calm blue sky", "description": "A calm blue sky",
......
{ {
"name": "bootswatch", "name": "bootswatch",
"description": "Bootswatch is a collection of themes for Bootstrap.", "description": "Bootswatch is a collection of themes for Bootstrap.",
"version": "3.2.0", "version": "3.3.0",
"author": "Thomas Park", "author": "Thomas Park",
"homepage": "http://bootswatch.com", "homepage": "http://bootswatch.com",
"repository": { "repository": {
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
"*/index.html" "*/index.html"
], ],
"dependencies": { "dependencies": {
"bootstrap": "~3.2.0" "bootstrap": "~3.3.0"
}, },
"devDependencies": { "devDependencies": {
"font-awesome": "~4.0.0", "font-awesome": "~4.0.0",
......
{ {
"name": "bootstrap", "name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.2.0", "version": "3.3.0",
"keywords": [ "keywords": [
"css", "css",
"js", "js",
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"dist/fonts/glyphicons-halflings-regular.woff" "dist/fonts/glyphicons-halflings-regular.woff"
], ],
"ignore": [ "ignore": [
".*", "/.*",
"_config.yml", "_config.yml",
"CNAME", "CNAME",
"composer.json", "composer.json",
...@@ -33,15 +33,16 @@ ...@@ -33,15 +33,16 @@
"test-infra" "test-infra"
], ],
"dependencies": { "dependencies": {
"jquery": ">= 1.9.0" "jquery": ">= 1.9.1"
}, },
"_release": "3.2.0", "_release": "3.3.0",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v3.2.0", "tag": "v3.3.0",
"commit": "c068162161154a4b85110ea1e7dd3d7897ce2b72" "commit": "16dbdbd7a2c6cfa3be4e5dcc52249e577c02c84a"
}, },
"_source": "git://github.com/twbs/bootstrap.git", "_source": "git://github.com/twbs/bootstrap.git",
"_target": "~3.2.0", "_target": "~3.3.0",
"_originalSource": "bootstrap" "_originalSource": "bootstrap",
"_direct": true
} }
\ No newline at end of file
...@@ -18,9 +18,15 @@ module.exports = function (grunt) { ...@@ -18,9 +18,15 @@ module.exports = function (grunt) {
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var npmShrinkwrap = require('npm-shrinkwrap'); var npmShrinkwrap = require('npm-shrinkwrap');
var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js');
var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js'); var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
var getLessVarsData = function () {
var filePath = path.join(__dirname, 'less/variables.less');
var fileContent = fs.readFileSync(filePath, { encoding: 'utf8' });
var parser = new BsLessdocParser(fileContent);
return { sections: parser.parseFile() };
};
var generateRawFiles = require('./grunt/bs-raw-files-generator.js'); var generateRawFiles = require('./grunt/bs-raw-files-generator.js');
var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js');
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
...@@ -32,12 +38,26 @@ module.exports = function (grunt) { ...@@ -32,12 +38,26 @@ module.exports = function (grunt) {
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + ' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' + ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
' */\n', ' */\n',
// NOTE: This jqueryCheck code is duplicated in customizer.js; if making changes here, be sure to update the other copy too. // NOTE: This jqueryCheck/jqueryVersionCheck code is duplicated in customizer.js;
jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n', // if making changes here, be sure to update the other copy too.
jqueryCheck: [
'if (typeof jQuery === \'undefined\') {',
' throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\')',
'}\n'
].join('\n'),
jqueryVersionCheck: [
'+function ($) {',
' var version = $.fn.jquery.split(\' \')[0].split(\'.\')',
' if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {',
' throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 1.9.1 or higher\')',
' }',
'}(jQuery);\n\n'
].join('\n'),
// Task configuration. // Task configuration.
clean: { clean: {
dist: ['dist', 'docs/dist'] dist: 'dist',
docs: 'docs/dist'
}, },
jshint: { jshint: {
...@@ -50,7 +70,7 @@ module.exports = function (grunt) { ...@@ -50,7 +70,7 @@ module.exports = function (grunt) {
}, },
src: ['Gruntfile.js', 'grunt/*.js'] src: ['Gruntfile.js', 'grunt/*.js']
}, },
src: { core: {
src: 'js/*.js' src: 'js/*.js'
}, },
test: { test: {
...@@ -60,7 +80,7 @@ module.exports = function (grunt) { ...@@ -60,7 +80,7 @@ module.exports = function (grunt) {
src: 'js/tests/unit/*.js' src: 'js/tests/unit/*.js'
}, },
assets: { assets: {
src: ['docs/assets/js/_src/*.js', 'docs/assets/js/*.js', '!docs/assets/js/*.min.js'] src: ['docs/assets/js/src/*.js', 'docs/assets/js/*.js', '!docs/assets/js/*.min.js']
} }
}, },
...@@ -71,8 +91,8 @@ module.exports = function (grunt) { ...@@ -71,8 +91,8 @@ module.exports = function (grunt) {
grunt: { grunt: {
src: '<%= jshint.grunt.src %>' src: '<%= jshint.grunt.src %>'
}, },
src: { core: {
src: '<%= jshint.src.src %>' src: '<%= jshint.core.src %>'
}, },
test: { test: {
src: '<%= jshint.test.src %>' src: '<%= jshint.test.src %>'
...@@ -87,7 +107,7 @@ module.exports = function (grunt) { ...@@ -87,7 +107,7 @@ module.exports = function (grunt) {
concat: { concat: {
options: { options: {
banner: '<%= banner %>\n<%= jqueryCheck %>', banner: '<%= banner %>\n<%= jqueryCheck %>\n<%= jqueryVersionCheck %>',
stripBanners: false stripBanners: false
}, },
bootstrap: { bootstrap: {
...@@ -113,27 +133,29 @@ module.exports = function (grunt) { ...@@ -113,27 +133,29 @@ module.exports = function (grunt) {
options: { options: {
preserveComments: 'some' preserveComments: 'some'
}, },
bootstrap: { core: {
src: '<%= concat.bootstrap.dest %>', src: '<%= concat.bootstrap.dest %>',
dest: 'dist/js/<%= pkg.name %>.min.js' dest: 'dist/js/<%= pkg.name %>.min.js'
}, },
customize: { customize: {
// NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
src: [ src: [
'docs/assets/js/_vendor/less.min.js', 'docs/assets/js/vendor/less.min.js',
'docs/assets/js/_vendor/jszip.min.js', 'docs/assets/js/vendor/jszip.min.js',
'docs/assets/js/_vendor/uglify.min.js', 'docs/assets/js/vendor/uglify.min.js',
'docs/assets/js/_vendor/blob.js', 'docs/assets/js/vendor/Blob.js',
'docs/assets/js/_vendor/filesaver.js', 'docs/assets/js/vendor/FileSaver.js',
'docs/assets/js/raw-files.min.js', 'docs/assets/js/raw-files.min.js',
'docs/assets/js/_src/customizer.js' 'docs/assets/js/src/customizer.js'
], ],
dest: 'docs/assets/js/customize.min.js' dest: 'docs/assets/js/customize.min.js'
}, },
docsJs: { docsJs: {
// NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
src: [ src: [
'docs/assets/js/_vendor/holder.js', 'docs/assets/js/vendor/holder.js',
'docs/assets/js/_vendor/ZeroClipboard.min.js', 'docs/assets/js/vendor/ZeroClipboard.min.js',
'docs/assets/js/_src/application.js' 'docs/assets/js/src/application.js'
], ],
dest: 'docs/assets/js/docs.min.js' dest: 'docs/assets/js/docs.min.js'
} }
...@@ -155,9 +177,8 @@ module.exports = function (grunt) { ...@@ -155,9 +177,8 @@ module.exports = function (grunt) {
sourceMapURL: '<%= pkg.name %>.css.map', sourceMapURL: '<%= pkg.name %>.css.map',
sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map' sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map'
}, },
files: { src: 'less/bootstrap.less',
'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less' dest: 'dist/css/<%= pkg.name %>.css'
}
}, },
compileTheme: { compileTheme: {
options: { options: {
...@@ -167,9 +188,8 @@ module.exports = function (grunt) { ...@@ -167,9 +188,8 @@ module.exports = function (grunt) {
sourceMapURL: '<%= pkg.name %>-theme.css.map', sourceMapURL: '<%= pkg.name %>-theme.css.map',
sourceMapFilename: 'dist/css/<%= pkg.name %>-theme.css.map' sourceMapFilename: 'dist/css/<%= pkg.name %>-theme.css.map'
}, },
files: { src: 'less/theme.less',
'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less' dest: 'dist/css/<%= pkg.name %>-theme.css'
}
} }
}, },
...@@ -199,7 +219,7 @@ module.exports = function (grunt) { ...@@ -199,7 +219,7 @@ module.exports = function (grunt) {
src: 'dist/css/<%= pkg.name %>-theme.css' src: 'dist/css/<%= pkg.name %>-theme.css'
}, },
docs: { docs: {
src: 'docs/assets/css/_src/docs.css' src: 'docs/assets/css/src/docs.css'
}, },
examples: { examples: {
expand: true, expand: true,
...@@ -213,7 +233,7 @@ module.exports = function (grunt) { ...@@ -213,7 +233,7 @@ module.exports = function (grunt) {
options: { options: {
csslintrc: 'less/.csslintrc' csslintrc: 'less/.csslintrc'
}, },
src: [ dist: [
'dist/css/bootstrap.css', 'dist/css/bootstrap.css',
'dist/css/bootstrap-theme.css' 'dist/css/bootstrap-theme.css'
], ],
...@@ -225,7 +245,7 @@ module.exports = function (grunt) { ...@@ -225,7 +245,7 @@ module.exports = function (grunt) {
ids: false, ids: false,
'overqualified-elements': false 'overqualified-elements': false
}, },
src: 'docs/assets/css/_src/docs.css' src: 'docs/assets/css/src/docs.css'
} }
}, },
...@@ -235,16 +255,18 @@ module.exports = function (grunt) { ...@@ -235,16 +255,18 @@ module.exports = function (grunt) {
keepSpecialComments: '*', keepSpecialComments: '*',
noAdvanced: true noAdvanced: true
}, },
core: { minifyCore: {
files: { src: 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css', dest: 'dist/css/<%= pkg.name %>.min.css'
'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css' },
} minifyTheme: {
src: 'dist/css/<%= pkg.name %>-theme.css',
dest: 'dist/css/<%= pkg.name %>-theme.min.css'
}, },
docs: { docs: {
src: [ src: [
'docs/assets/css/_src/docs.css', 'docs/assets/css/src/docs.css',
'docs/assets/css/_src/pygments-manni.css' 'docs/assets/css/src/pygments-manni.css'
], ],
dest: 'docs/assets/css/docs.min.css' dest: 'docs/assets/css/docs.min.css'
} }
...@@ -277,27 +299,19 @@ module.exports = function (grunt) { ...@@ -277,27 +299,19 @@ module.exports = function (grunt) {
dest: 'docs/examples/' dest: 'docs/examples/'
}, },
docs: { docs: {
files: { src: 'docs/assets/css/src/docs.css',
'docs/assets/css/_src/docs.css': 'docs/assets/css/_src/docs.css' dest: 'docs/assets/css/src/docs.css'
}
} }
}, },
copy: { copy: {
fonts: { fonts: {
expand: true,
src: 'fonts/*', src: 'fonts/*',
dest: 'dist/' dest: 'dist/'
}, },
docs: { docs: {
expand: true, src: 'dist/*/*',
cwd: './dist', dest: 'docs/'
src: [
'{css,js}/*.min.*',
'css/*.map',
'fonts/*'
],
dest: 'docs/dist'
} }
}, },
...@@ -315,20 +329,17 @@ module.exports = function (grunt) { ...@@ -315,20 +329,17 @@ module.exports = function (grunt) {
}, },
jade: { jade: {
compile: { options: {
options: { pretty: true,