Skip to content

Commit

Permalink
Temporarily remove background image (that freezes page)
Browse files Browse the repository at this point in the history
See #10
  • Loading branch information
skozin committed Nov 22, 2017
1 parent a9413a6 commit aa2ac14
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
3 changes: 1 addition & 2 deletions web/src/components/StatusBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import connect from '~/utils/connect'
import sel from '~/selectors'

import ContractLayout from './freelancer-layout'
import background from '../../assets/background.png'


const StatusBar = styled.div`
Expand All @@ -20,7 +19,7 @@ const StatusBar = styled.div`
`

const getColor = (state) => {

}


Expand Down
15 changes: 7 additions & 8 deletions web/src/components/contract-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@ import { Link } from 'react-router-dom'
import connect from '~/utils/connect'
import sel from '~/selectors'

import background from '../../assets/background.png'
import Status from './StatusBar'

const Item = styled.div`
display: flex;
display: flex;
flex-flow: row nowrap;
justify-content: space-between;
width: 100%;
border-top: 1px solid #E0E0E0;
padding: 24px 30px;
padding: 24px 30px;
box-sizing: border-box;
&:hover {
background: #5E69D7;
color: #FFFFFF;
color: #FFFFFF;
}
`

Expand All @@ -39,7 +38,7 @@ const ExecutionDate = styled.div`
color: #7C7C7C;
${Item}:hover & {
color: #FFFFFF;
color: #FFFFFF;
}
`

Expand All @@ -59,7 +58,7 @@ export default class ContractItem extends React.Component {

render() {
return (
<Link to={ this.props.address }>
<Link to={ this.props.address }>
<Item>
<Name>{ this.props.name }</Name>
<ExecutionDate>{ this.state.lastActivityDate }</ExecutionDate>
Expand All @@ -70,5 +69,5 @@ export default class ContractItem extends React.Component {
</Link>
)
}
}
}

4 changes: 2 additions & 2 deletions web/src/components/freelancer-layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import { Link } from 'react-router-dom'
import connect from '~/utils/connect'
import sel from '~/selectors'

import background from '../../assets/background.png'
// import background from '../../assets/background.png'
import logo from '../../assets/logo.svg'


// background: url(${background}) no-repeat center / cover;
const Contract = styled.div`
display: flex;
justify-content: center;
align-items: center;
padding: 0 40px;
background: url(${background}) no-repeat center / cover;
background-attachment: fixed;
height: 100%;
color: #242738;
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import sel from '~/selectors'

import SplashScreen from './splash-screen'

// background: url('./assets/background.png') no-repeat center / contain;
const LayoutContainer = styled.div`
background: url('./assets/background.png') no-repeat center / contain;
font-face: sans-serif;
font-size: 16px;
height: 100%;
Expand Down

0 comments on commit aa2ac14

Please sign in to comment.