Skip to content

Commit

Permalink
Merge branch 'hotfix/v.0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
brianpkelley committed Mar 3, 2016
2 parents 5d20153 + a0ff5a4 commit 16f3c4f
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 26 deletions.
12 changes: 6 additions & 6 deletions dist/mdColorPicker.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
md-color-picker 0.2.0
https://github.com/brianpkelley/md-color-picker
Brian Kelley
GNU GENERAL PUBLIC LICENSE
*/
/**
* md-color-picker - Angular-Material inspired color picker.
* @version v0.2.0
* @link https://github.com/brianpkelley/md-color-picker
* @license MIT
*/
md-color-picker .md-color-picker-input-container,
[md-color-picker] .md-color-picker-input-container {
position: relative;
Expand Down
12 changes: 6 additions & 6 deletions dist/mdColorPicker.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
* md-color-picker - Angular-Material inspired color picker.
* @version v0.2.0
* @link https://github.com/brianpkelley/md-color-picker
* @license MIT
*/
;(function(angular, window, tinycolor) {
/*
md-color-picker 0.2.0
https://github.com/brianpkelley/md-color-picker
Brian Kelley
GNU GENERAL PUBLIC LICENSE
*/

(function( window, angular, undefined ) {
'use strict';
Expand Down
6 changes: 6 additions & 0 deletions dist/mdColorPicker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions dist/mdColorPicker.min.js

Large diffs are not rendered by default.

20 changes: 19 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ var gulp = require('gulp'),
http = require('http'),
st = require('st'),
del = require('del'),
merge = require('merge-stream');
merge = require('merge-stream'),
header = require('gulp-header');

var debug = false;

Expand All @@ -41,6 +42,18 @@ var paths = {
};


var pkg = require('./package.json');
var banner = ['/**',
' * <%= pkg.name %> - <%= pkg.description %>',
' * @version v<%= pkg.version %>',
' * @link <%= pkg.homepage %>',
' * @license <%= pkg.license %>',
' */',
''].join('\n');




/*====================================================================
= Compile and minify less and css =
====================================================================*/
Expand All @@ -50,9 +63,11 @@ gulp.task('less', function () {
.pipe(less({strictMath: true}))
.pipe(concat(moduleName + '.css'))
.pipe(autoprefix({browsers: ['last 2 versions', 'last 4 Android versions']}))
.pipe(header(banner, { pkg : pkg } ))
.pipe(gulp.dest(paths.dist))
.pipe(rename({extname: '.min.css'}))
.pipe(cssnano({ safe: true }))
.pipe(header(banner, { pkg : pkg } ))
.pipe(gulp.dest(paths.dist))
.pipe(livereload());
});
Expand All @@ -72,15 +87,18 @@ gulp.task('js', function () {

.pipe(gdebug())


//.pipe(debug({title: 'JS: '}))
//.pipe(sourcemaps.init())
.pipe(concat(moduleName + '.js'))
//.pipe(sourcemaps.write('.'))
.pipe(closure(['angular', 'window', 'tinycolor']))
.pipe(ngAnnotate())
.pipe(header(banner, { pkg : pkg } ))
.pipe(gulp.dest(paths.dist))
.pipe(rename({suffix: '.min'}))
.pipe(uglify())
.pipe(header(banner, { pkg : pkg } ))
.pipe(gulp.dest(paths.dist))
.pipe(livereload());

Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"version": "0.2.0",
"description": "Angular-Material inspired color picker.",
"main": "dist/mdColorPicker.min.js",
"dependencies": {},
"dependencies": {
},
"devDependencies": {
"del": "^2.0.1",
"gulp": "^3.9.0",
Expand All @@ -21,6 +22,7 @@
"gulp-sourcemaps": "^1.5.2",
"gulp-uglify": "^1.4.0",
"gulp-util": "^3.0.7",
"gulp-header": "^1.7.1",
"merge-stream": "^1.0.0",
"run-sequence": "^1.1.2",
"st": "^1.0.0",
Expand Down
6 changes: 0 additions & 6 deletions src/js/mdColorPicker.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/*
md-color-picker 0.2.0
https://github.com/brianpkelley/md-color-picker
Brian Kelley
GNU GENERAL PUBLIC LICENSE
*/

(function( window, angular, undefined ) {
'use strict';
Expand Down
6 changes: 0 additions & 6 deletions src/less/mdColorPicker.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/*
md-color-picker 0.2.0
https://github.com/brianpkelley/md-color-picker
Brian Kelley
GNU GENERAL PUBLIC LICENSE
*/

@cubic-trans: cubic-bezier(.25,.8,.25,1) .25s;
.checkered_bg() {
Expand Down

0 comments on commit 16f3c4f

Please sign in to comment.