File tree 7 files changed +27
-9
lines changed
7 files changed +27
-9
lines changed Original file line number Diff line number Diff line change 68
68
"react-router" : " ^3.0.0" ,
69
69
"react-router-scroll" : " ^0.4.1" ,
70
70
"styled-components" : " ^1.2.1" ,
71
- "styled-theme" : " ^0.2.1"
71
+ "styled-theme" : " ^0.3.0" ,
72
+ "styled-tools" : " ^0.1.2"
72
73
}
73
74
}
Original file line number Diff line number Diff line change 1
1
import { PropTypes } from 'react'
2
2
import styled from 'styled-components'
3
- import { font , palette , ifProp } from 'styled-theme'
3
+ import { font , palette } from 'styled-theme'
4
+ import { ifProp } from 'styled-tools'
4
5
5
6
const Block = styled . div `
6
7
font-family: ${ font ( 'primary' ) } ;
Original file line number Diff line number Diff line change 1
1
import React , { PropTypes } from 'react'
2
2
import styled , { css } from 'styled-components'
3
3
import { Link } from 'react-router'
4
- import { font , palette , ifProp } from 'styled-theme'
4
+ import { font , palette } from 'styled-theme'
5
+ import { ifProp } from 'styled-tools'
5
6
6
7
const fontSize = ( { height } ) => `${ height / 40 } rem`
7
8
Original file line number Diff line number Diff line change 1
1
import React , { PropTypes } from 'react'
2
2
import styled from 'styled-components'
3
- import { palette , ifProp } from 'styled-theme'
3
+ import { palette } from 'styled-theme'
4
+ import { ifProp } from 'styled-tools'
4
5
5
6
export const fontSize = ( { height } ) => height ? `${ height / 16 } rem` : '1.25em'
6
7
Original file line number Diff line number Diff line change 1
1
import React , { PropTypes } from 'react'
2
2
import styled , { css } from 'styled-components'
3
- import { font , palette , ifProp } from 'styled-theme'
3
+ import { font , palette } from 'styled-theme'
4
+ import { ifProp } from 'styled-tools'
4
5
5
6
export const fontSize = ( { height } ) => `${ height / 35.5555555556 } rem`
6
7
Original file line number Diff line number Diff line change 1
1
import React , { PropTypes } from 'react'
2
2
import styled , { css } from 'styled-components'
3
- import { font , ifProp } from 'styled-theme'
3
+ import { font } from 'styled-theme'
4
+ import { ifProp } from 'styled-tools'
4
5
5
6
const opposites = {
6
7
top : 'bottom' ,
Original file line number Diff line number Diff line change @@ -5701,11 +5701,23 @@ styled-components@^1.2.1:
5701
5701
is-plain-object "^2.0.1"
5702
5702
supports-color "^3.1.2"
5703
5703
5704
- styled-theme@^0.2.1 :
5705
- version "0.2.1 "
5706
- resolved "https://registry.yarnpkg.com/styled-theme/-/styled-theme-0.2.1 .tgz#0da58d88509aa8084dc45478d083346f62ab810e "
5704
+ styled-theme@^0.3.0 :
5705
+ version "0.3.0 "
5706
+ resolved "https://registry.yarnpkg.com/styled-theme/-/styled-theme-0.3.0 .tgz#3c61d971a402b7b6d3583c4ee0b48fbdf99ae464 "
5707
5707
dependencies :
5708
5708
coolors-to-hex "^1.0.0"
5709
+ styled-tools "^0.1.1"
5710
+
5711
+ styled-tools@^0.1.1 :
5712
+ version "0.1.1"
5713
+ resolved "https://registry.yarnpkg.com/styled-tools/-/styled-tools-0.1.1.tgz#32ceb2b2b14465786c2a5cc2d51ff7cc23edb933"
5714
+ dependencies :
5715
+ lodash "^4.17.4"
5716
+
5717
+ styled-tools@^0.1.2 :
5718
+ version "0.1.2"
5719
+ resolved "https://registry.yarnpkg.com/styled-tools/-/styled-tools-0.1.2.tgz#5cf7a45f4885537e9a292df9d682bd98c6917972"
5720
+ dependencies :
5709
5721
lodash "^4.17.4"
5710
5722
5711
5723
supports-color@^0.2.0 :
You can’t perform that action at this time.
0 commit comments