Skip to content

Commit

Permalink
Merge pull request #6 from alademann/3.0.1_sass-wip
Browse files Browse the repository at this point in the history
Sass 3.0.1 RELEASE

Fixes #2 , Fixes #3 , Fixes #4
  • Loading branch information
alademann committed Sep 12, 2013
2 parents 9bf603d + 3d75d56 commit 02f590a
Show file tree
Hide file tree
Showing 284 changed files with 19,622 additions and 31,004 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# editorconfig.org

root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "twbs"]
path = twbs
url = [email protected]:twbs/bootstrap.git
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
language: node_js
node_js:
- 0.6
- 0.8
before_script:
- gem install jekyll
- npm install -g grunt-cli
env:
global:
- secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w=
- secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew=
- TWBS_HAVE_OWN_BROWSERSTACK_KEY: ""
5 changes: 0 additions & 5 deletions Gemfile

This file was deleted.

14 changes: 0 additions & 14 deletions Gemfile.lock

This file was deleted.

201 changes: 201 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
/* jshint node: true */

module.exports = function(grunt) {
"use strict";

// Project configuration.
grunt.initConfig({

// Metadata.
pkg: grunt.file.readJSON('package.json'),
banner: '/**\n' +
'* Sass Bootstrap v<%= pkg.version %> by <%= pkg.author %>\n' +
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
'* Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>.\n' +
'*\n' +
'* Designed and built with all the love in the world by @alademann, @mdo and @fat.\n' +
'*/\n',
jqueryCheck: 'if (!jQuery) { throw new Error(\"Sass Bootstrap requires jQuery\") }\n\n',

// Task configuration.
clean: {
dist: ['dist', '<%= pkg.name %>-dist.zip']
},

jshint: {
options: {
jshintrc: 'js/.jshintrc'
},
gruntfile: {
src: 'Gruntfile.js'
},
src: {
src: ['js/*.js']
},
test: {
src: ['js/tests/unit/*.js']
}
},

concat: {
options: {
banner: '<%= banner %><%= jqueryCheck %>',
stripBanners: false
},
bootstrap: {
src: [
'js/transition.js',
'js/alert.js',
'js/button.js',
'js/carousel.js',
'js/collapse.js',
'js/dropdown.js',
'js/modal.js',
'js/tooltip.js',
'js/popover.js',
'js/scrollspy.js',
'js/tab.js',
'js/affix.js'
],
dest: 'dist/js/<%= pkg.name %>.js'
}
},

uglify: {
options: {
banner: '<%= banner %>'
},
bootstrap: {
src: ['<%= concat.bootstrap.dest %>'],
dest: 'dist/js/<%= pkg.name %>.min.js'
}
},

compass: {
bootstrap: {
options: {
config: 'config.rb',
environment: 'development',
force: grunt.option('force') || false
}
},
min: {
options: {
config: 'config.rb',
environment: 'production',
force: grunt.option('force') || false
}
}
},

compress: {
dist: {
options: {
archive: '<%= pkg.name %>-dist.zip'
},
files: [
{expand:true, cwd: 'dist/', dest: 'dist/', src: ['**']}
]
}
},

copy: {
fonts: {
expand: true,
src: ["fonts/*"],
dest: 'dist/'
}
},

qunit: {
options: {
inject: 'js/tests/unit/phantom.js'
},
files: ['js/tests/*.html']
},

connect: {
server: {
options: {
port: 9003,
base: '.'
}
}
},

jekyll: {
docs: {}
},

validation: {
options: {
reset: false
},
files: {
src: ["_gh_pages/**/*.html"]
}
},

watch: {
src: {
files: '<%= jshint.src.src %>',
tasks: ['jshint:src', 'qunit']
},
test: {
files: '<%= jshint.test.src %>',
tasks: ['jshint:test', 'qunit']
},
css: {
files: ['sass/*.scss', 'sass/*/*.scss'],
tasks: ['compass:bootstrap']
}
}
});


// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-html-validation');
grunt.loadNpmTasks('grunt-jekyll');

// Docs HTML validation task
grunt.registerTask('validate-html', ['jekyll', 'validation']);

// Test task.
grunt.registerTask('testSubtasks', ['jshint', 'qunit', 'validate-html']);
grunt.registerTask('testSubtasksNoValidation', ['jshint', 'qunit', 'jekyll']);
grunt.registerTask('test',
function() {
if(grunt.option('validate')) {
grunt.task.run('testSubtasks');
} else {
grunt.task.run('testSubtasksNoValidation');
}
}
);

// JS distribution task.
grunt.registerTask('dist-js', ['concat', 'uglify']);

// CSS distribution task.
grunt.registerTask('dist-css', ['compass:bootstrap']);

// Fonts distribution task.
grunt.registerTask('dist-fonts', ['copy:fonts']);

// Full distribution task.
grunt.registerTask('dist', ['clean', 'dist-fonts', 'dist-css', 'dist-js', 'compress:dist']);

// Default task.
grunt.registerTask('default', ['test', 'dist']);

};
126 changes: 0 additions & 126 deletions Makefile

This file was deleted.

Loading

0 comments on commit 02f590a

Please sign in to comment.