Skip to content

Commit

Permalink
Replaced SASS by LESS
Browse files Browse the repository at this point in the history
  • Loading branch information
timschlechter committed Aug 13, 2013
1 parent bee12c7 commit d540ce3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 19 deletions.
16 changes: 8 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = function(grunt) {

grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-zip');
Expand All @@ -14,7 +14,7 @@ module.exports = function(grunt) {
copy: {
main: {
files: [
{expand: true, flatten: true, src: ['src/*.js'], dest: 'examples/assets/', filter: 'isFile'},
{expand: true, flatten: true, src: ['src/*.*'], dest: 'examples/assets/', filter: 'isFile'},
{expand: true, flatten: true, src: ['lib/jquery.min.js'], dest: 'examples/assets/', filter: 'isFile'},
{expand: true, cwd: 'lib', src: ['bootstrap*/**'], dest: 'examples/assets/' },
{expand: true, flatten: true, src: ['lib/angular.min.js'], dest: 'examples/assets', filter: 'isFile'}
Expand All @@ -33,10 +33,10 @@ module.exports = function(grunt) {
}
}
},
sass: {
less: {
build: {
files: {
'examples/assets/<%= pkg.name %>.css' : 'src/<%= pkg.name %>.scss'
"examples/assets/<%= pkg.name %>.css": "src/<%= pkg.name %>.less"
}
}
},
Expand All @@ -51,7 +51,7 @@ module.exports = function(grunt) {
},
watch: {
scripts: {
files: ['src/**/*.js', 'test/**/*.js'],
files: ['src/**/*.*', 'test/**/*.js'],
tasks: ['copy', 'uglify'],
options: {
spawn: false,
Expand All @@ -73,10 +73,10 @@ module.exports = function(grunt) {
title: '<%= pkg.title %>'
}
}
}
}
});

grunt.registerTask('default', ['karma','jquerymanifest', 'copy', 'uglify', 'sass', 'zip']);
grunt.registerTask('build', ['copy', 'uglify', 'sass']);
grunt.registerTask('default', ['karma','jquerymanifest', 'copy', 'uglify', 'less', 'zip']);
grunt.registerTask('build', ['copy', 'uglify', 'less']);
grunt.registerTask('unit', ['karma']);
};
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"grunt-karma": "~0.4.5",
"grunt-contrib-watch": "~0.5.1",
"grunt-contrib-copy": "~0.4.1",
"grunt-sass": "~0.6.0",
"grunt-zip": "~0.9.2",
"grunt-jquerymanifest": "~0.1.2"
"grunt-jquerymanifest": "~0.1.2",
"grunt-contrib-less": "~0.6.4"
},
"banner": "/*\n * <%= pkg.name %> v<%= pkg.version %> by <%= pkg.author %>\n * <%= pkg.license.url %>\n */\n"
}
12 changes: 3 additions & 9 deletions src/bootstrap-tagsinput.scss → src/bootstrap-tagsinput.less
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
.bootstrap-tagsinput {
background-color: #ffffff;
border: 1px solid #cccccc;
background-color: #fff;
border: 1px solid #ccc;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
transition: border linear 0.2s, box-shadow linear 0.2s;
display: inline-block;
padding: 4px 6px;
margin-bottom: 10px;
color: #555555;
color: #555;
vertical-align: middle;
border-radius: 4px;
max-width: 100%;
Expand Down Expand Up @@ -46,9 +45,4 @@
}
}
}

.icon-white {
margin-left: 5px;
}

}

0 comments on commit d540ce3

Please sign in to comment.