Skip to content

Commit

Permalink
Simplified Gruntfile
Browse files Browse the repository at this point in the history
  • Loading branch information
lipis committed Sep 25, 2013
1 parent 46d97fa commit 2a0ad63
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 45 deletions.
22 changes: 5 additions & 17 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ module.exports = (grunt)->

grunt.initConfig
pkg: grunt.file.readJSON('package.json')
clean:
main:
src: TARGET_DIR

less:
app_css:
src: "#{SRC_DIR}/<%= pkg.name %>.less"
Expand All @@ -19,22 +15,16 @@ module.exports = (grunt)->
dest: "#{TARGET_DIR}/<%= pkg.name %>.min.css"

watch:
build:
options:
base: SRC_DIR
keepalive: true
files: ["#{SRC_DIR}/**/*.less"]
tasks: ["less"]

css:
options:
livereload: true
files: "#{TARGET_DIR}/<%= pkg.name %>.css"
files: "#{SRC_DIR}/*.less"
tasks: ["build"]

html_templates:
assets:
options:
livereload: true
files: 'index.html'
files: ['index.html', 'assets/*']

connect:
server:
Expand All @@ -43,12 +33,10 @@ module.exports = (grunt)->
keepalive: true


grunt.loadNpmTasks("grunt-contrib-clean")
grunt.loadNpmTasks("grunt-contrib-less")
grunt.loadNpmTasks("grunt-contrib-cssmin")
grunt.loadNpmTasks("grunt-contrib-watch")
grunt.loadNpmTasks('grunt-contrib-connect')

grunt.registerTask("default", ["build", "watch"])
grunt.registerTask("build", ["clean", "less"])
grunt.registerTask("dist", ["clean", "less", "cssmin"])
grunt.registerTask("build", ["less", "cssmin"])
2 changes: 1 addition & 1 deletion assets/docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.flag-wrapper:after {
padding-top: 75%; /*1160/2000 ratio*/
padding-top: 75%; /* ratio */
display: block;
content: '';
}
Expand Down
20 changes: 1 addition & 19 deletions css/country-flag-icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
position: relative;
display: inline-block;
width: 1.3333333333333333em;
line-height: 1em;
line-height: 2em;
background-size: contain;
background-position: 50%;
background-repeat: no-repeat;
Expand All @@ -18,24 +18,6 @@
background-position: 50%;
background-repeat: no-repeat;
}
.flag-icon-gr {
background-image: url(../flags/4x3/gr.svg);
}
.flag-icon-gr.flag-icon-squared {
background-image: url(../flags/1x1/gr.svg);
}
.flag-icon-dk {
background-image: url(../flags/4x3/dk.svg);
}
.flag-icon-dk.flag-icon-squared {
background-image: url(../flags/1x1/dk.svg);
}
.flag-icon-us {
background-image: url(../flags/4x3/us.svg);
}
.flag-icon-us.flag-icon-squared {
background-image: url(../flags/1x1/us.svg);
}
.flag-icon-ad {
background-image: url(../flags/4x3/ad.svg);
}
Expand Down
2 changes: 1 addition & 1 deletion css/country-flag-icons.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion less/country-flag-icons-base.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
position: relative;
display: inline-block;
width: unit(4 / 3, em);
line-height: 1em;
line-height: 2em;
.flag-icon-background;
&:before {
content: "\00a0";
Expand Down
5 changes: 0 additions & 5 deletions less/country-flag-icons-list.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
.flag-icon(gr);
.flag-icon(dk);
.flag-icon(us);


.flag-icon(ad);
.flag-icon(ae);
.flag-icon(af);
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"version": "0.1.0",
"devDependencies": {
"grunt": "0.4.x",
"grunt-contrib-clean": "0.4.x",
"grunt-contrib-less": "0.6.x",
"grunt-contrib-cssmin": "0.5.x",
"grunt-contrib-watch": "0.5.x",
Expand Down

0 comments on commit 2a0ad63

Please sign in to comment.