diff --git a/src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.eot b/public/fonts/roboto/RobotoMonoRegular.eot similarity index 100% rename from src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.eot rename to public/fonts/roboto/RobotoMonoRegular.eot diff --git a/src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.svg b/public/fonts/roboto/RobotoMonoRegular.svg similarity index 100% rename from src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.svg rename to public/fonts/roboto/RobotoMonoRegular.svg diff --git a/src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.ttf b/public/fonts/roboto/RobotoMonoRegular.ttf similarity index 100% rename from src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.ttf rename to public/fonts/roboto/RobotoMonoRegular.ttf diff --git a/src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.woff b/public/fonts/roboto/RobotoMonoRegular.woff similarity index 100% rename from src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.woff rename to public/fonts/roboto/RobotoMonoRegular.woff diff --git a/src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.woff2 b/public/fonts/roboto/RobotoMonoRegular.woff2 similarity index 100% rename from src/support/fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.woff2 rename to public/fonts/roboto/RobotoMonoRegular.woff2 diff --git a/public/fonts/roboto/RobotoZero.eot b/public/fonts/roboto/RobotoZero.eot new file mode 100644 index 00000000..55531629 Binary files /dev/null and b/public/fonts/roboto/RobotoZero.eot differ diff --git a/public/fonts/roboto/RobotoZero.ttf b/public/fonts/roboto/RobotoZero.ttf new file mode 100644 index 00000000..524e29e0 Binary files /dev/null and b/public/fonts/roboto/RobotoZero.ttf differ diff --git a/public/fonts/roboto/RobotoZero.woff b/public/fonts/roboto/RobotoZero.woff new file mode 100755 index 00000000..2807d896 Binary files /dev/null and b/public/fonts/roboto/RobotoZero.woff differ diff --git a/public/fonts/roboto/font-name.txt b/public/fonts/roboto/font-name.txt new file mode 100644 index 00000000..de567ae9 --- /dev/null +++ b/public/fonts/roboto/font-name.txt @@ -0,0 +1 @@ +roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular \ No newline at end of file diff --git a/src/support/BaseStyles.js b/src/support/BaseStyles.js index 354d4960..ffa328eb 100644 --- a/src/support/BaseStyles.js +++ b/src/support/BaseStyles.js @@ -52,21 +52,21 @@ const baseStyles = () => injectGlobal` @font-face { font-family: 'Roboto Zero'; - src: url('./fonts/roboto/RobotoZero.eot') format('embedded-opentype'), - url('./fonts/roboto/RobotoZero.eot?#iefix') format('embedded-opentype'), - url('./fonts/roboto/RobotoZero.woff') format('woff'), - url('./fonts/roboto/RobotoZero.ttf') format('truetype'); + src: url('/fonts/roboto/RobotoZero.eot') format('embedded-opentype'), + url('/fonts/roboto/RobotoZero.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto/RobotoZero.woff') format('woff'), + url('/fonts/roboto/RobotoZero.ttf') format('truetype'); } @font-face { font-family: 'Roboto Mono'; font-style: normal; - src: url('./fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.eot') format('embedded-opentype'), /* IE9 Compat Modes */ - url('./fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('./fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('./fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.woff') format('woff'), /* Modern Browsers */ - url('./fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('./fonts/roboto/roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */ + src:url('/fonts/roboto/RobotoMonoRegular.eot') format('embedded-opentype'), /* IE9 Compat Modes */ + url('/fonts/roboto/RobotoMonoRegular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/fonts/roboto/RobotoMonoRegular.woff2') format('woff2'), /* Super Modern Browsers */ + url('/fonts/roboto/RobotoMonoRegular.woff') format('woff'), /* Modern Browsers */ + url('/fonts/roboto/RobotoMonoRegular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/fonts/roboto/RobotoMonoRegular.svg#RobotoMono') format('svg'); /* Legacy iOS */ } .slide-left-enter { diff --git a/src/support/fonts/roboto/RobotoMonoRegular.eot b/src/support/fonts/roboto/RobotoMonoRegular.eot new file mode 100644 index 00000000..53d6bc70 Binary files /dev/null and b/src/support/fonts/roboto/RobotoMonoRegular.eot differ diff --git a/src/support/fonts/roboto/RobotoMonoRegular.svg b/src/support/fonts/roboto/RobotoMonoRegular.svg new file mode 100644 index 00000000..37448f0e --- /dev/null +++ b/src/support/fonts/roboto/RobotoMonoRegular.svg @@ -0,0 +1,390 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/support/fonts/roboto/RobotoMonoRegular.ttf b/src/support/fonts/roboto/RobotoMonoRegular.ttf new file mode 100644 index 00000000..b158a334 Binary files /dev/null and b/src/support/fonts/roboto/RobotoMonoRegular.ttf differ diff --git a/src/support/fonts/roboto/RobotoMonoRegular.woff b/src/support/fonts/roboto/RobotoMonoRegular.woff new file mode 100644 index 00000000..f6b49d38 Binary files /dev/null and b/src/support/fonts/roboto/RobotoMonoRegular.woff differ diff --git a/src/support/fonts/roboto/RobotoMonoRegular.woff2 b/src/support/fonts/roboto/RobotoMonoRegular.woff2 new file mode 100644 index 00000000..b6a521fe Binary files /dev/null and b/src/support/fonts/roboto/RobotoMonoRegular.woff2 differ diff --git a/src/support/fonts/roboto/font-name.txt b/src/support/fonts/roboto/font-name.txt new file mode 100644 index 00000000..de567ae9 --- /dev/null +++ b/src/support/fonts/roboto/font-name.txt @@ -0,0 +1 @@ +roboto-mono-v4-greek_cyrillic-ext_greek-ext_latin_cyrillic_vietnamese_latin-ext-regular \ No newline at end of file diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/DeviceList/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/DeviceList/index.js index d4b86412..723e177b 100644 --- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/DeviceList/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/DeviceList/index.js @@ -31,14 +31,14 @@ class DeviceList extends Component { device !== selectedDevice && ( { if (device.features) { if (device.features.bootloader_mode) { this.redirectToBootloader(selectedDevice); } - onSelectDevice(device); } + onSelectDevice(device); }} onClickIcon={() => forgetDevice(device)} icon={(