Skip to content

Commit a9005bb

Browse files
committed
Move styling to less and add gulp tasks to generate css.
1 parent 1938b1d commit a9005bb

12 files changed

+281
-126
lines changed

Diff for: .csscomb.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"remove-empty-rulesets": true,
3+
"always-semicolon": true,
4+
"color-case": "lower",
5+
"block-indent": " ",
6+
"color-shorthand": false,
7+
"element-case": "lower",
8+
"eof-newline": true,
9+
"leading-zero": true,
10+
"quotes": "single",
11+
"sort-order-fallback": "abc",
12+
"space-before-colon": "",
13+
"space-after-colon": " ",
14+
"space-before-combinator": " ",
15+
"space-after-combinator": " ",
16+
"space-between-declarations": "\n",
17+
"space-before-opening-brace": " ",
18+
"space-after-opening-brace": "\n",
19+
"space-after-selector-delimiter": "\n",
20+
"space-before-selector-delimiter": "",
21+
"space-before-closing-brace": "\n",
22+
"strip-spaces": true,
23+
"tab-size": true,
24+
"unitless-zero": true,
25+
"vendor-prefix-align": true
26+
}

Diff for: Gruntfile.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ module.exports = function (grunt) {
66
// load all grunt tasks
77
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
88

9+
var paths = require('./paths');
10+
911
// Project configuration.
1012
grunt.initConfig({
1113
bump: {
1214
options: {
13-
files: ['package.json', 'bower.json', 'README.md', 'src/js/*.js', 'src/css/*.css'],
15+
files: paths.bump,
1416
updateConfigs: [],
1517
commit: false,
1618
createTag: false,

Diff for: demo/demo-controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ angular.module('demo.demoController', [])
5555
};
5656

5757
$scope.beforeRender = function ($dates) {
58-
var index = Math.floor(Math.random() * $dates.length);
58+
var index = Math.ceil($dates.length / 2);
5959
$log.info(index);
6060
$dates[index].selectable = false;
6161
};

Diff for: demo/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ <h3>ng-repeat with drop-down using text link</h3>
326326

327327
<div class="col-sm-6">
328328
<h3>Drop-down Datetime with restricted dates</h3>
329-
<h4>One date is randomly disabled on each view</h4>
329+
<h4>One date - somewhere near the middle of the display - is disabled on each view</h4>
330330

331331
<p><code>dropdownSelector: '#dropdown6'</code> to toggle the dropdown.</p>
332332

Diff for: gulpfile.js

+22-1
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,28 @@ gulp.task('test', function (done) {
5353
server.start();
5454
});
5555

56+
gulp.task('less', function () {
57+
var less = require('gulp-less');
58+
var postcss = require('gulp-postcss');
59+
var sourcemaps = require('gulp-sourcemaps');
60+
var autoprefixer = require('autoprefixer');
61+
62+
return gulp.src('./src/less/datetimepicker.less')
63+
.pipe(less())
64+
.pipe(sourcemaps.init())
65+
.pipe(postcss([ autoprefixer({ browsers: ['last 2 versions'] }) ]))
66+
.pipe(sourcemaps.write('.'))
67+
.pipe(gulp.dest('./src/css'));
68+
});
69+
70+
gulp.task('csscomb', ['less'], function () {
71+
var Comb = require('csscomb');
72+
var comb = new Comb();
73+
comb.processPath('./src/css');
74+
});
75+
5676
gulp.task('tdd', function (done) {
57-
gulp.watch(paths.all, ['jscs', 'lint', 'csslint']);
77+
gulp.watch(paths.all.concat(paths.less), ['jscs', 'lint', 'makecss']);
5878

5979
var config = testConfig(
6080
{
@@ -84,4 +104,5 @@ gulp.task('jscs', function () {
84104
.pipe(jscs('.jscsrc'));
85105
});
86106

107+
gulp.task('makecss', ['less', 'csscomb']);
87108
gulp.task('default', ['jscs', 'lint', 'csslint', 'complexity', 'test']);

Diff for: package.json

+5
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,20 @@
1515
},
1616
"devDependencies": {
1717
"angular-mocks": "^1.4.7",
18+
"autoprefixer": "^6.0.3",
1819
"bootstrap": "^3.3.5",
1920
"bower": "latest",
21+
"csscomb": "^3.1.8",
2022
"csslint": "^0.10.0",
2123
"grunt": "^0.4.4",
2224
"grunt-bump": "^0.6.0",
2325
"gulp": "^3.8.11",
2426
"gulp-csslint": "^0.2.0",
2527
"gulp-jscs": "^3.0.0",
2628
"gulp-jshint": "^1.11.2",
29+
"gulp-less": "^3.0.3",
30+
"gulp-postcss": "^6.0.1",
31+
"gulp-sourcemaps": "^1.6.0",
2732
"jquery": "^2.1.4",
2833
"jshint": "^2.6.0",
2934
"jshint-stylish": "^2.0.1",

Diff for: paths.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ var modules = [
99
'node_modules/angular-mocks/angular-mocks.js'
1010
];
1111
var bumpFiles = ['package.json', 'bower.json', 'README.md', 'src/js/*.js'];
12+
var lessFiles = ['src/less/*.less'];
1213
var cssFiles = ['src/css/*.css'];
1314
var demoFiles = ['demo/**/*.js'];
1415
var miscFiles = ['GruntFile.js', 'gulpfile.js', 'karma.conf.js', 'paths.js'];
1516
var sourceFiles = ['src/**/*.js'];
1617
var testFiles = ['test/**/*.spec.js'];
1718

1819
module.exports = {
19-
all: modules.concat(sourceFiles).concat(testFiles).concat(demoFiles),
20+
all: modules.concat(sourceFiles).concat(testFiles).concat(demoFiles).concat(cssFiles),
2021
app: sourceFiles,
21-
bump: bumpFiles.concat(cssFiles),
22+
bump: bumpFiles.concat(cssFiles).concat(lessFiles),
2223
css: cssFiles,
24+
less: lessFiles,
2325
lint: miscFiles.concat(sourceFiles).concat(testFiles).concat(miscFiles),
2426
src: sourceFiles,
2527
test: testFiles

Diff for: src/css/datetimepicker.css

+62-120
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: src/css/datetimepicker.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)