Skip to content

Fixes mobile and document.js #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
csmartinsfct wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fixes mobile and document.js #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
780dd7a
fixes spacing the the challenge button on mobile
csmartinsfct Apr 4, 2019
e4306d2
upgraded styled components to version 2 due to an error we were getti…
csmartinsfct Apr 4, 2019
4c1669a
removed unwated new line
csmartinsfct Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions components/Bounties/card/StyledButtonChallenge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@ import styled from 'styled-components'

const StyledButtonChallenge = styled.div`
position: relative;
margin-top: 40px;

margin-top: 25px;
.ant-btn {
font-size: 18px;
font-weight: 500;
width: 100%;
}

@media (min-width: 768px) {
margin-top: 0px;

.ant-btn {
width: auto;
}
}
`;

Expand Down
4 changes: 4 additions & 0 deletions components/Bounties/card/StyledFooter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ const StyledFooter = styled.div`
justify-content: space-between;
align-items: flex-start;
}

a{
width: auto;
}
`;

export default StyledFooter;
2 changes: 1 addition & 1 deletion components/Bounties/card/StyledSwitch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
} from 'antd';

const StyledSwitch = styled(Switch)`
margin-top: 20px;
margin-top: 25px;
display: block;

@media (min-width: 768px) {
Expand Down
9 changes: 1 addition & 8 deletions components/Dropdown/StyledDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import styled, { injectGlobal } from 'styled-components'
import styled from 'styled-components'
import Theme from '../Theme';

injectGlobal`
.ant-dropdown-menu-item:hover,
.ant-dropdown-menu-submenu-title:hover{
background-color: ${Theme.dropdown.submenu.colorHover};
}
`

const StyledDropdown = styled.div`
.ant-dropdown-trigger{
color: ${props => props.styling.trigger.color};
Expand Down
10 changes: 1 addition & 9 deletions components/Menu/StyledMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
import styled, { injectGlobal } from 'styled-components'

injectGlobal`
.ant-menu-vertical{
.ant-menu-item{
width: 100%;
}
}
`
import styled from 'styled-components'

const StyledMenu = styled.div`
.ant-menu{
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"react-placeholder": "3.0.1",
"react-router-dom": "4.3.1",
"react-twitter-conversion-tracker": "1.0.0",
"styled-components": "3.4.10",
"styled-components": "4.2.0",
"svg-inline-loader": "^0.8.0",
"webpack": "^4.29.6"
},
Expand All @@ -52,8 +52,8 @@
"enzyme": "3.7.0",
"enzyme-adapter-react-16": "1.6.0",
"jest": "23.6.0",
"prettier-eslint-cli": "^4.7.1",
"mini-css-extract-plugin": "^0.5.0",
"prettier-eslint-cli": "^4.7.1",
"sinon": "7.1.1"
}
}
41 changes: 17 additions & 24 deletions pages/_document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
import Document, { Head, Main, NextScript } from 'next/document'
import Document from 'next/document'
import { ServerStyleSheet } from 'styled-components'

export default class MyDocument extends Document {
static getInitialProps ({ renderPage }) {
static async getInitialProps (ctx) {
const sheet = new ServerStyleSheet()
const page = renderPage(App => props => sheet.collectStyles(<App {...props} />))
const styleTags = sheet.getStyleElement()
return { ...page, styleTags }
}
const originalRenderPage = ctx.renderPage

try {
ctx.renderPage = () =>
originalRenderPage({
enhanceApp: App => props => sheet.collectStyles(<App {...props} />)
})

render () {
return (
<html>
<Head>
<title>Task Market</title>
{this.props.styleTags}
<link
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"
rel="stylesheet"
type="text/css"
/>
</Head>
<body>
<Main />
<NextScript />
</body>
</html>
)
const initialProps = await Document.getInitialProps(ctx)
return {
...initialProps,
styles: <>{initialProps.styles}{sheet.getStyleElement()}</>
}
} finally {
sheet.seal()
}
}
}
3 changes: 1 addition & 2 deletions pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ export default class Home extends React.Component{
if(this.state.pullingIssues) return;
this.setState({pullingIssues: true})
this.getIssues()
}, RefreshTimeInSeconds * 1000);

}, RefreshTimeInSeconds * 1000);
}

checkStorageForCurrencyType = () => {
Expand Down
Loading