Skip to content

Commit

Permalink
Revert "Revert "Bug 1059051 - Convert Keyboard-Symbols.woff to Keyboa…
Browse files Browse the repository at this point in the history
…rd-Symbols.ttf""

This reverts commit 7f44b86.
  • Loading branch information
KevinGrandon committed Aug 27, 2014
1 parent 7f44b86 commit f8dc5b8
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build/push-to-device.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ function execute(options) {
}).then(function() {
if (buildAppName === '*') {
return sh.run(['-c', adb + ' push ' +
'"shared/style/keyboard_symbols/Keyboard-Symbols.woff" ' +
'//system/fonts/hidden/Keyboard-Symbols.woff']);
'"shared/style/keyboard_symbols/Keyboard-Symbols.ttf" ' +
'//system/fonts/hidden/Keyboard-Symbols.ttf']);
}
}).then(function() {
if (buildAppName === '*' || restartB2g) {
Expand Down
5 changes: 2 additions & 3 deletions build/test/unit/push-to-device.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,8 @@ suite('push-to-device.js', function() {
' //data/local/user.js',
'-c adb push "shared/elements/gaia-icons/fonts/gaia-icons.ttf"' +
' //system/fonts/hidden/gaia-icons.ttf',
'-c adb push "shared/style/keyboard_symbols/' +
'Keyboard-Symbols.woff"' +
' //system/fonts/hidden/Keyboard-Symbols.woff',
'-c adb push "shared/style/keyboard_symbols/Keyboard-Symbols.ttf"' +
' //system/fonts/hidden/Keyboard-Symbols.ttf',
'-c adb shell start b2g']});
done();
});
Expand Down
2 changes: 1 addition & 1 deletion gaia.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PRODUCT_COPY_FILES += gaia/shared/elements/gaia-icons/fonts/gaia-icons.ttf:system/fonts/hidden/gaia-icons.ttf
PRODUCT_COPY_FILES += gaia/shared/style/keyboard_symbols/Keyboard-Symbols.woff:system/fonts/hidden/Keyboard-Symbols.woff
PRODUCT_COPY_FILES += gaia/shared/style/keyboard_symbols/Keyboard-Symbols.ttf:system/fonts/hidden/Keyboard-Symbols.ttf
2 changes: 1 addition & 1 deletion shared/style/keyboard_symbols.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@font-face {
font-family: 'Keyboard Symbols';
font-weight: 600;
src: url(keyboard_symbols/Keyboard-Symbols.woff);
src: url(keyboard_symbols/Keyboard-Symbols.ttf);
}
Binary file not shown.
Binary file removed shared/style/keyboard_symbols/Keyboard-Symbols.woff
Binary file not shown.

0 comments on commit f8dc5b8

Please sign in to comment.