Browse Source

Change sidebar width

master
Loëck Vézien 7 years ago
parent
commit
10453aab59
No known key found for this signature in database GPG Key ID: CBCDCE384E853AC4
  1. 2
      package.json
  2. 6
      src/components/SideBar/Item.js
  3. 21
      src/styles/global.js
  4. 2
      src/styles/theme.js
  5. 6
      yarn.lock

2
package.json

@ -47,7 +47,7 @@
"@fortawesome/react-fontawesome": "^0.0.17", "@fortawesome/react-fontawesome": "^0.0.17",
"@ledgerhq/common": "2.3.0", "@ledgerhq/common": "2.3.0",
"@ledgerhq/currencies": "^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-app-eth": "^3.0.0",
"@ledgerhq/hw-transport": "^3.0.0", "@ledgerhq/hw-transport": "^3.0.0",
"@ledgerhq/hw-transport-node-hid": "^3.0.0", "@ledgerhq/hw-transport-node-hid": "^3.0.0",

6
src/components/SideBar/Item.js

@ -28,17 +28,19 @@ const mapDispatchToProps = {
} }
const Container = styled(Tabbable).attrs({ const Container = styled(Tabbable).attrs({
horizontal: true,
align: 'center', align: 'center',
flow: 2,
horizontal: true,
px: 2, px: 2,
py: 1, py: 1,
flow: 2,
})` })`
border-radius: 5px; border-radius: 5px;
cursor: pointer; cursor: pointer;
color: ${p => (p.isActive ? p.theme.colors.shark : p.theme.colors.grey)}; color: ${p => (p.isActive ? p.theme.colors.shark : p.theme.colors.grey)};
background: ${p => (p.isActive ? p.theme.colors.argile : '')}; background: ${p => (p.isActive ? p.theme.colors.argile : '')};
height: 46px;
outline: none; outline: none;
&:hover, &:hover,
&:focus { &:focus {
background: ${p => (p.isActive ? p.theme.colors.argile : p.theme.colors.cream)}; background: ${p => (p.isActive ? p.theme.colors.argile : p.theme.colors.cream)};

21
src/styles/global.js

@ -44,16 +44,26 @@ const fonts = {
weight: 100, weight: 100,
file: 'museosans/MuseoSans-ExtraLight', file: 'museosans/MuseoSans-ExtraLight',
}, },
{
style: 'italic',
weight: 100,
file: 'museosans/MuseoSans-ExtraLightItalic',
},
{ {
style: 'normal', style: 'normal',
weight: 300, weight: 300,
file: 'museosans/MuseoSans-Light', 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)}; ${transformFonts(fonts)};
* { * {
-webkit-font-smoothing: antialiased;
box-sizing: border-box; box-sizing: border-box;
margin: 0; margin: 0;
padding: 0; padding: 0;

2
src/styles/theme.js

@ -5,7 +5,7 @@ export const fontSizes = [8, 9, 10, 11, 13, 16, 18, 32]
export default { export default {
sizes: { sizes: {
sideBarWidth: 250, sideBarWidth: 230,
}, },
space, space,
fontSizes, fontSizes,

6
yarn.lock

@ -152,9 +152,9 @@
dependencies: dependencies:
querystring "^0.2.0" querystring "^0.2.0"
"@ledgerhq/hw-app-btc@^3.0.2": "@ledgerhq/hw-app-btc@^3.0.8":
version "3.0.2" version "3.0.8"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-3.0.2.tgz#4bad5d65eeef3711083d681a19d58c63cc12fe02" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-3.0.8.tgz#13609bcd59ebbb6d1246f88eb37e93091d466493"
dependencies: dependencies:
"@ledgerhq/hw-transport" "^3.0.0" "@ledgerhq/hw-transport" "^3.0.0"
create-hash "^1.1.3" create-hash "^1.1.3"

Loading…
Cancel
Save