Skip to content

Commit f8dc5b8

Browse files
committed
Revert "Revert "Bug 1059051 - Convert Keyboard-Symbols.woff to Keyboard-Symbols.ttf""
This reverts commit 7f44b86.
1 parent 7f44b86 commit f8dc5b8

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

build/push-to-device.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ function execute(options) {
186186
}).then(function() {
187187
if (buildAppName === '*') {
188188
return sh.run(['-c', adb + ' push ' +
189-
'"shared/style/keyboard_symbols/Keyboard-Symbols.woff" ' +
190-
'//system/fonts/hidden/Keyboard-Symbols.woff']);
189+
'"shared/style/keyboard_symbols/Keyboard-Symbols.ttf" ' +
190+
'//system/fonts/hidden/Keyboard-Symbols.ttf']);
191191
}
192192
}).then(function() {
193193
if (buildAppName === '*' || restartB2g) {

build/test/unit/push-to-device.test.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,8 @@ suite('push-to-device.js', function() {
155155
' //data/local/user.js',
156156
'-c adb push "shared/elements/gaia-icons/fonts/gaia-icons.ttf"' +
157157
' //system/fonts/hidden/gaia-icons.ttf',
158-
'-c adb push "shared/style/keyboard_symbols/' +
159-
'Keyboard-Symbols.woff"' +
160-
' //system/fonts/hidden/Keyboard-Symbols.woff',
158+
'-c adb push "shared/style/keyboard_symbols/Keyboard-Symbols.ttf"' +
159+
' //system/fonts/hidden/Keyboard-Symbols.ttf',
161160
'-c adb shell start b2g']});
162161
done();
163162
});

gaia.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
PRODUCT_COPY_FILES += gaia/shared/elements/gaia-icons/fonts/gaia-icons.ttf:system/fonts/hidden/gaia-icons.ttf
2-
PRODUCT_COPY_FILES += gaia/shared/style/keyboard_symbols/Keyboard-Symbols.woff:system/fonts/hidden/Keyboard-Symbols.woff
2+
PRODUCT_COPY_FILES += gaia/shared/style/keyboard_symbols/Keyboard-Symbols.ttf:system/fonts/hidden/Keyboard-Symbols.ttf

shared/style/keyboard_symbols.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@font-face {
22
font-family: 'Keyboard Symbols';
33
font-weight: 600;
4-
src: url(keyboard_symbols/Keyboard-Symbols.woff);
4+
src: url(keyboard_symbols/Keyboard-Symbols.ttf);
55
}
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)