Skip to content

Commit

Permalink
Update styled-theme to the latest version 🚀 (#70)
Browse files Browse the repository at this point in the history
* fix(package): update styled-theme to version 0.3.0

https://greenkeeper.io/

* Add styled-tools
  • Loading branch information
greenkeeper[bot] authored and diegohaz committed Jan 20, 2017
1 parent 2c5603d commit 2d390ef
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 9 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"react-router": "^3.0.0",
"react-router-scroll": "^0.4.1",
"styled-components": "^1.2.1",
"styled-theme": "^0.2.1"
"styled-theme": "^0.3.0",
"styled-tools": "^0.1.2"
}
}
3 changes: 2 additions & 1 deletion src/components/atoms/Block/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { PropTypes } from 'react'
import styled from 'styled-components'
import { font, palette, ifProp } from 'styled-theme'
import { font, palette } from 'styled-theme'
import { ifProp } from 'styled-tools'

const Block = styled.div`
font-family: ${font('primary')};
Expand Down
3 changes: 2 additions & 1 deletion src/components/atoms/Button/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { PropTypes } from 'react'
import styled, { css } from 'styled-components'
import { Link } from 'react-router'
import { font, palette, ifProp } from 'styled-theme'
import { font, palette } from 'styled-theme'
import { ifProp } from 'styled-tools'

const fontSize = ({ height }) => `${height / 40}rem`

Expand Down
3 changes: 2 additions & 1 deletion src/components/atoms/Icon/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { PropTypes } from 'react'
import styled from 'styled-components'
import { palette, ifProp } from 'styled-theme'
import { palette } from 'styled-theme'
import { ifProp } from 'styled-tools'

export const fontSize = ({ height }) => height ? `${height / 16}rem` : '1.25em'

Expand Down
3 changes: 2 additions & 1 deletion src/components/atoms/Input/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { PropTypes } from 'react'
import styled, { css } from 'styled-components'
import { font, palette, ifProp } from 'styled-theme'
import { font, palette } from 'styled-theme'
import { ifProp } from 'styled-tools'

export const fontSize = ({ height }) => `${height / 35.5555555556}rem`

Expand Down
3 changes: 2 additions & 1 deletion src/components/atoms/Tooltip/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { PropTypes } from 'react'
import styled, { css } from 'styled-components'
import { font, ifProp } from 'styled-theme'
import { font } from 'styled-theme'
import { ifProp } from 'styled-tools'

const opposites = {
top: 'bottom',
Expand Down
18 changes: 15 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5701,11 +5701,23 @@ styled-components@^1.2.1:
is-plain-object "^2.0.1"
supports-color "^3.1.2"

styled-theme@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/styled-theme/-/styled-theme-0.2.1.tgz#0da58d88509aa8084dc45478d083346f62ab810e"
styled-theme@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/styled-theme/-/styled-theme-0.3.0.tgz#3c61d971a402b7b6d3583c4ee0b48fbdf99ae464"
dependencies:
coolors-to-hex "^1.0.0"
styled-tools "^0.1.1"

styled-tools@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/styled-tools/-/styled-tools-0.1.1.tgz#32ceb2b2b14465786c2a5cc2d51ff7cc23edb933"
dependencies:
lodash "^4.17.4"

styled-tools@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/styled-tools/-/styled-tools-0.1.2.tgz#5cf7a45f4885537e9a292df9d682bd98c6917972"
dependencies:
lodash "^4.17.4"

supports-color@^0.2.0:
Expand Down

0 comments on commit 2d390ef

Please sign in to comment.