Skip to content
Snippets Groups Projects
Commit fa689739 authored by mrp19's avatar mrp19
Browse files

Merge branch 'homologa' of gitlab.c3sl.ufpr.br:portalmec/portalmec-react into fix/homologa

parents a4ed590f f5f79e5e
No related branches found
No related tags found
4 merge requests!57Merge of develop into master,!56Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...,!39Update admin system,!32Homologa
...@@ -194,6 +194,7 @@ export default function LoginContainer (props) { ...@@ -194,6 +194,7 @@ export default function LoginContainer (props) {
font-size : 14px; font-size : 14px;
@media ${device.mobileM} { @media ${device.mobileM} {
width : 100%; width : 100%;
min-width : unset;
height : 100%; height : 100%;
} }
` `
......
...@@ -24,7 +24,7 @@ import CloseIcon from '@material-ui/icons/Close'; ...@@ -24,7 +24,7 @@ import CloseIcon from '@material-ui/icons/Close';
import styled from 'styled-components' import styled from 'styled-components'
import {device} from './device.js' import {device} from './device.js'
import FormInput from "./FormInput.js" import FormInput from "./FormInput.js"
import {StyledCloseModalButton, DialogContentDiv, DialogHeaderStyled, SocialConnectDiv, StyledGoogleLoginButton, H3Div} from './LoginContainer.js' import {StyledCloseModalButton, DialogContentDiv, DialogHeaderStyled, SocialConnectDiv, H3Div} from './LoginContainer.js'
import ValidateUserInput from '../Components/FormValidationFunction.js' import ValidateUserInput from '../Components/FormValidationFunction.js'
var Recaptcha = require('react-recaptcha') var Recaptcha = require('react-recaptcha')
...@@ -132,14 +132,8 @@ export default function SignUpContainer (props) { ...@@ -132,14 +132,8 @@ export default function SignUpContainer (props) {
<DialogContentDiv> <DialogContentDiv>
<SocialConnectDiv> <SocialConnectDiv>
<StyledGoogleLoginButton <Button onClick={() => {console.log('handleGoogleAttempt')}}>cadastro com google</Button>
clientId="658977310896-knrl3gka66fldh83dao2rhgbblmd4un9.apps.googleusercontent.com"
onSuccess={responseGoogle}
onFailure={responseGoogle}
cookiePolicy={'single_host_origin'}
>
<span style={{textTransform:"none", fontSize:"13px"}}>Usando o Google</span>
</StyledGoogleLoginButton>
</SocialConnectDiv> </SocialConnectDiv>
<H3Div> <H3Div>
...@@ -228,6 +222,7 @@ const ContainerStyled = styled.div` ...@@ -228,6 +222,7 @@ const ContainerStyled = styled.div`
padding : 10px; padding : 10px;
@media ${device.mobileM} { @media ${device.mobileM} {
width : 100%; width : 100%;
min-width : unset;
height : 100%; height : 100%;
} }
` `
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment