diff options
| author | xiphon <xiphon@protonmail.com> | 2019-09-03 18:41:08 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2019-09-03 18:43:12 +0000 |
| commit | cb9cb6eb09a0ac13d8fef6652167cbc9d9c3f2bc (patch) | |
| tree | 9251d4a37dc5897153174573e3a1f23d9272afd0 | |
| parent | 562c46660acda12c2818b9edaffd6c3f841b2113 (diff) | |
| download | monzero-gui-cb9cb6eb09a0ac13d8fef6652167cbc9d9c3f2bc.tar.gz monzero-gui-cb9cb6eb09a0ac13d8fef6652167cbc9d9c3f2bc.tar.xz monzero-gui-cb9cb6eb09a0ac13d8fef6652167cbc9d9c3f2bc.zip | |
FontAwesome: bump to 5.10.2
| -rw-r--r-- | fonts/FontAwesome/FontAwesome.qml | 14 | ||||
| -rw-r--r-- | fonts/FontAwesome/fa-brands-400.ttf | bin | 0 -> 129284 bytes | |||
| -rw-r--r-- | fonts/FontAwesome/fa-regular-400.ttf | bin | 0 -> 34096 bytes | |||
| -rw-r--r-- | fonts/FontAwesome/fa-solid-900.ttf | bin | 0 -> 191836 bytes | |||
| -rw-r--r-- | fonts/FontAwesome/fontawesome-webfont.ttf | bin | 165548 -> 0 bytes | |||
| -rw-r--r-- | pages/History.qml | 2 | ||||
| -rw-r--r-- | qml.qrc | 4 |
7 files changed, 17 insertions, 3 deletions
diff --git a/fonts/FontAwesome/FontAwesome.qml b/fonts/FontAwesome/FontAwesome.qml index 136f8a6d..7e5f6d04 100644 --- a/fonts/FontAwesome/FontAwesome.qml +++ b/fonts/FontAwesome/FontAwesome.qml @@ -4,10 +4,22 @@ import QtQuick 2.9 Object { FontLoader { - source: "./fontawesome-webfont.ttf" + source: "./fa-regular-400.ttf" + } + + FontLoader { + id: brands + source: "./fa-brands-400.ttf" + } + + FontLoader { + id: solid + source: "./fa-solid-900.ttf" } property string fontFamily: "FontAwesome" + property string fontFamilyBrands: brands.name + property string fontFamilySolid: solid.name // Icons property string addressBook : "\uf2b9" diff --git a/fonts/FontAwesome/fa-brands-400.ttf b/fonts/FontAwesome/fa-brands-400.ttf Binary files differnew file mode 100644 index 00000000..aa1687de --- /dev/null +++ b/fonts/FontAwesome/fa-brands-400.ttf diff --git a/fonts/FontAwesome/fa-regular-400.ttf b/fonts/FontAwesome/fa-regular-400.ttf Binary files differnew file mode 100644 index 00000000..34629a6d --- /dev/null +++ b/fonts/FontAwesome/fa-regular-400.ttf diff --git a/fonts/FontAwesome/fa-solid-900.ttf b/fonts/FontAwesome/fa-solid-900.ttf Binary files differnew file mode 100644 index 00000000..704a2a99 --- /dev/null +++ b/fonts/FontAwesome/fa-solid-900.ttf diff --git a/fonts/FontAwesome/fontawesome-webfont.ttf b/fonts/FontAwesome/fontawesome-webfont.ttf Binary files differdeleted file mode 100644 index 35acda2f..00000000 --- a/fonts/FontAwesome/fontawesome-webfont.ttf +++ /dev/null diff --git a/pages/History.qml b/pages/History.qml index 4a1d9515..2dc04de8 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -939,7 +939,7 @@ Rectangle { anchors.leftMargin: 10 text: FontAwesome.productHunt small: true - label.font.family: FontAwesome.fontFamily + label.font.family: FontAwesome.fontFamilyBrands fontSize: 18 width: 36 @@ -180,7 +180,9 @@ <file>images/merchant/arrow_right.png</file> <file>images/merchant/bg.png</file> <file>images/merchant/input_box.png</file> - <file>fonts/FontAwesome/fontawesome-webfont.ttf</file> + <file>fonts/FontAwesome/fa-brands-400.ttf</file> + <file>fonts/FontAwesome/fa-regular-400.ttf</file> + <file>fonts/FontAwesome/fa-solid-900.ttf</file> <file>fonts/FontAwesome/FontAwesome.qml</file> <file>fonts/FontAwesome/Object.qml</file> <file>fonts/FontAwesome/qmldir</file> |