diff --git a/package.json b/package.json index 343eb359..f50b7fe6 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@fortawesome/react-fontawesome": "^0.0.17", "@ledgerhq/common": "2.3.0", "@ledgerhq/currencies": "^2.3.0", - "@ledgerhq/hw-app-btc": "^3.0.2", + "@ledgerhq/hw-app-btc": "^3.0.8", "@ledgerhq/hw-app-eth": "^3.0.0", "@ledgerhq/hw-transport": "^3.0.0", "@ledgerhq/hw-transport-node-hid": "^3.0.0", diff --git a/src/components/SideBar/Item.js b/src/components/SideBar/Item.js index 1014730a..3dd5d262 100644 --- a/src/components/SideBar/Item.js +++ b/src/components/SideBar/Item.js @@ -28,17 +28,19 @@ const mapDispatchToProps = { } const Container = styled(Tabbable).attrs({ - horizontal: true, align: 'center', + flow: 2, + horizontal: true, px: 2, py: 1, - flow: 2, })` border-radius: 5px; cursor: pointer; color: ${p => (p.isActive ? p.theme.colors.shark : p.theme.colors.grey)}; background: ${p => (p.isActive ? p.theme.colors.argile : '')}; + height: 46px; outline: none; + &:hover, &:focus { background: ${p => (p.isActive ? p.theme.colors.argile : p.theme.colors.cream)}; diff --git a/src/styles/global.js b/src/styles/global.js index d56e70d9..e32dc187 100644 --- a/src/styles/global.js +++ b/src/styles/global.js @@ -44,16 +44,26 @@ const fonts = { weight: 100, file: 'museosans/MuseoSans-ExtraLight', }, - { - style: 'italic', - weight: 100, - file: 'museosans/MuseoSans-ExtraLightItalic', - }, { style: 'normal', weight: 300, file: 'museosans/MuseoSans-Light', }, + { + style: 'normal', + weight: 500, + file: 'museosans/MuseoSans-Regular', + }, + { + style: 'bold', + weight: 700, + file: 'museosans/MuseoSans-Bold', + }, + { + style: 'bold', + weight: 900, + file: 'museosans/MuseoSans-ExtraBold', + }, ], } @@ -70,6 +80,7 @@ injectGlobal` ${transformFonts(fonts)}; * { + -webkit-font-smoothing: antialiased; box-sizing: border-box; margin: 0; padding: 0; diff --git a/src/styles/theme.js b/src/styles/theme.js index c6143812..4ce5795d 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -5,7 +5,7 @@ export const fontSizes = [8, 9, 10, 11, 13, 16, 18, 32] export default { sizes: { - sideBarWidth: 250, + sideBarWidth: 230, }, space, fontSizes, diff --git a/yarn.lock b/yarn.lock index 025c2200..44da1b65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -152,9 +152,9 @@ dependencies: querystring "^0.2.0" -"@ledgerhq/hw-app-btc@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-3.0.2.tgz#4bad5d65eeef3711083d681a19d58c63cc12fe02" +"@ledgerhq/hw-app-btc@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-3.0.8.tgz#13609bcd59ebbb6d1246f88eb37e93091d466493" dependencies: "@ledgerhq/hw-transport" "^3.0.0" create-hash "^1.1.3"