diff --git a/Gruntfile.js b/Gruntfile.js index f5fc69e..988a541 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,71 +1,71 @@ /** - * - * Copyright 2012 Adobe Systems Inc.; - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ +* +* Copyright 2012 Adobe Systems Inc.; +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +*/ /*global module:false*/ module.exports = function(grunt) { - // Project configuration. - grunt.initConfig({ + // Project configuration. + grunt.initConfig({ - clean: { - release: ['css'] - }, + clean: { + release: ['css'] + }, - topcoat: { - options: { - browsers: ['last 2 versions'] - }, - compile: { - files: [{ - src: 'test/fixtures/select.css', - dest: 'css/select.css' - } - ] - } - }, + topcoat: { + options: { + browsers: ['last 2 versions'] + }, + compile: { + files: [{ + src: 'test/fixtures/select.css', + dest: 'css/select.css' + } + ] + } + }, - cssmin: { - minify: { - expand: true, - cwd: 'css', - src: ['*.css', '!*.min.css'], - dest: 'css', - ext: '.min.css' - }, - }, + cssmin: { + minify: { + expand: true, + cwd: 'css', + src: ['*.css', '!*.min.css'], + dest: 'css', + ext: '.min.css' + }, + }, - simplemocha: { - all: { - src: ['test/*.test.js'] - } - } - }); + simplemocha: { + all: { + src: ['test/*.test.js'] + } + } + }); - // These plugins provide necessary tasks. - grunt.loadNpmTasks('grunt-topcoat'); - grunt.loadNpmTasks('grunt-simple-mocha'); - grunt.loadNpmTasks('grunt-contrib-cssmin'); - grunt.loadNpmTasks('grunt-contrib-clean'); + // These plugins provide necessary tasks. + grunt.loadNpmTasks('grunt-topcoat'); + grunt.loadNpmTasks('grunt-simple-mocha'); + grunt.loadNpmTasks('grunt-contrib-cssmin'); + grunt.loadNpmTasks('grunt-contrib-clean'); - grunt.registerTask('default', ['clean', 'build', 'test', 'release']); - grunt.registerTask('build', ['topcoat']); - grunt.registerTask('test', ['simplemocha']); - grunt.registerTask('release', ['cssmin']); + grunt.registerTask('default', ['clean', 'build', 'test', 'release']); + grunt.registerTask('build', ['topcoat']); + grunt.registerTask('test', ['simplemocha']); + grunt.registerTask('release', ['cssmin']); -}; \ No newline at end of file +}; diff --git a/css/select.css b/css/select.css index 57aa400..465c240 100644 --- a/css/select.css +++ b/css/select.css @@ -39,7 +39,6 @@ } .select { - -moz-appearance: none; -webkit-appearance: none; } diff --git a/css/select.min.css b/css/select.min.css index d6ef3da..8568369 100644 --- a/css/select.min.css +++ b/css/select.min.css @@ -1 +1 @@ -.select{padding:0;margin:0;font:inherit;color:inherit;background:transparent;border:0}.select{vertical-align:top;outline:0}.select{cursor:default;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.select{-moz-box-sizing:border-box;box-sizing:border-box;background-clip:padding-box}.select{position:relative;display:inline-block;vertical-align:top}.select:disabled{opacity:.3;cursor:default;pointer-events:none}.select{-moz-appearance:none;-webkit-appearance:none}.select::-ms-expand{display:none} \ No newline at end of file +.select{padding:0;margin:0;font:inherit;color:inherit;background:transparent;border:0}.select{vertical-align:top;outline:0}.select{cursor:default;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.select{-moz-box-sizing:border-box;box-sizing:border-box;background-clip:padding-box}.select{position:relative;display:inline-block;vertical-align:top}.select:disabled{opacity:.3;cursor:default;pointer-events:none}.select{-webkit-appearance:none}.select::-ms-expand{display:none} \ No newline at end of file diff --git a/test/expected/select.css b/test/expected/select.css index 57aa400..c849154 100644 --- a/test/expected/select.css +++ b/test/expected/select.css @@ -39,10 +39,9 @@ } .select { - -moz-appearance: none; -webkit-appearance: none; } .select::-ms-expand { display: none; -} \ No newline at end of file +} diff --git a/test/select.test.js b/test/select.test.js index 99bde90..e4384df 100644 --- a/test/select.test.js +++ b/test/select.test.js @@ -27,7 +27,7 @@ describe('Topcoat select base', function() { it('should output correct reset css', function() { var actual = grunt.file.read('css/select.css'); var expected = grunt.file.read('test/expected/select.css'); - assert.equal(actual, expected, 'should generate correct css'); + assert.equal(actual.trim(), expected.trim(), 'should generate correct css'); }); });