Skip to content

Commit cb5c667

Browse files
committed
fix(css): Fixed css emoji sprite path and add input as callback value
1 parent 9a5d8b4 commit cb5c667

10 files changed

Lines changed: 16 additions & 16 deletions

File tree

β€ŽGruntfile.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ module.exports = function(grunt) {
143143
grunt.loadNpmTasks("grunt-contrib-uglify");
144144
grunt.loadNpmTasks("grunt-contrib-connect");
145145

146-
grunt.registerTask("default", ["clean", "webpack:build-dev", "sass", "connect", "watch"]);
146+
grunt.registerTask("default", ["webpack:build-dev", "sass", "connect", "watch"]);
147147
grunt.registerTask("build", ["clean", "build-emoji", "webpack:build-dev", "uglify", "postcss"]);
148148
grunt.registerTask("build-emoji", ["retinafy", "sprite", "sass"]);
149149
};

β€Ždist/embed.min.cssβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ždist/embed.min.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žsprite.handlebarsβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ $retine_sprite_width : {{retina_spritesheet.width}}px;
44
$retine_sprite_height : {{retina_spritesheet.height}}px;
55

66
.emoticon {
7-
background : transparent url({{spritesheet.image}}) 0 0 no-repeat;
7+
background : transparent url(.././assets/images/emojis.png) 0 0 no-repeat;
88
}
99

1010
@media all and (-webkit-min-device-pixel-ratio : 1), all and (min--moz-device-pixel-ratio : 1), all and (-o-min-device-pixel-ratio : 1), all and (min-device-pixel-ratio : 1), all and (min-resolution : 96dpi) {
1111
.emoticon {
12-
background : transparent url({{spritesheet.image}}) 0 0 no-repeat;
12+
background : transparent url(.././assets/images/emojis.png) 0 0 no-repeat;
1313
}
1414
}
1515

1616
@media all and (-webkit-min-device-pixel-ratio : 1.5), all and (-o-min-device-pixel-ratio : 3/2), all and (min-device-pixel-ratio : 1.5), all and (min-resolution : 144dpi) {
1717
.emoticon {
18-
background : transparent url({{retina_spritesheet.image}}) 0 0 no-repeat;
18+
background : transparent url(.././assets/images/emojis@2x.png) 0 0 no-repeat;
1919
background-size : $retine_sprite_width/2 $retine_sprite_height/2;
2020
}
2121
}

β€Žsrc/css/_emojis.scssβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ $retine_sprite_width : 1320px;
33
$retine_sprite_height : 1320px;
44

55
.emoticon {
6-
background : transparent url(../.././assets/images/emojis.png) 0 0 no-repeat;
6+
background : transparent url(.././assets/images/emojis.png) 0 0 no-repeat;
77
}
88

99
@media all and (-webkit-min-device-pixel-ratio : 1), all and (min--moz-device-pixel-ratio : 1), all and (-o-min-device-pixel-ratio : 1), all and (min-device-pixel-ratio : 1), all and (min-resolution : 96dpi) {
1010
.emoticon {
11-
background : transparent url(../.././assets/images/emojis.png) 0 0 no-repeat;
11+
background : transparent url(.././assets/images/emojis.png) 0 0 no-repeat;
1212
}
1313
}
1414

1515
@media all and (-webkit-min-device-pixel-ratio : 1.5), all and (-o-min-device-pixel-ratio : 3/2), all and (min-device-pixel-ratio : 1.5), all and (min-resolution : 144dpi) {
1616
.emoticon {
17-
background : transparent url(../.././assets/images/emojis@2x.png) 0 0 no-repeat;
17+
background : transparent url(.././assets/images/emojis@2x.png) 0 0 no-repeat;
1818
background-size : $retine_sprite_width/2 $retine_sprite_height/2;
1919
}
2020
}

β€Žsrc/embed.cssβ€Ž

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žsrc/embed.css.mapβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žsrc/embed.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žsrc/embed.js.mapβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žsrc/js/embed.es6β€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ const helper = require('./modules/video/helper.es6');
172172
*/
173173
async text(callback) {
174174
let result = await this.process();
175-
callback(result);
175+
callback(result, this.input);
176176
}
177177
}
178178

0 commit comments

Comments
Β (0)