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

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

parents 34d1018d 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
...@@ -77,7 +77,7 @@ export default function App(){ ...@@ -77,7 +77,7 @@ export default function App(){
},[window.innerWidth,window.innerHeight]) },[window.innerWidth,window.innerHeight])
return( return(
<BrowserRouter> <BrowserRouter basename="/react">
<Header /> <Header />
<div style={{backgroundImage: "linear-gradient(to right,#ff7f00,#e81f4f,#673ab7,#00bcd4)", height:"5px"}}></div> <div style={{backgroundImage: "linear-gradient(to right,#ff7f00,#e81f4f,#673ab7,#00bcd4)", height:"5px"}}></div>
<link href="https://fonts.googleapis.com/css?family=Kalam|Pompiere|Roboto&display=swap" rel="stylesheet"/> <link href="https://fonts.googleapis.com/css?family=Kalam|Pompiere|Roboto&display=swap" rel="stylesheet"/>
......
...@@ -116,7 +116,6 @@ export default function Header(props){ ...@@ -116,7 +116,6 @@ export default function Header(props){
} }
}, [loc]) }, [loc])
const toggleSnackbar = (event, reason) => { const toggleSnackbar = (event, reason) => {
if (reason === 'clickaway') { if (reason === 'clickaway') {
return; return;
......
...@@ -37,7 +37,6 @@ async function handleGoogleAttempt () { ...@@ -37,7 +37,6 @@ async function handleGoogleAttempt () {
window.location.replace(request_url) window.location.replace(request_url)
} }
export default function LoginContainer (props) { export default function LoginContainer (props) {
const [formEmail, setEmail] = useState( const [formEmail, setEmail] = useState(
{ {
...@@ -193,6 +192,7 @@ export default function LoginContainer (props) { ...@@ -193,6 +192,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%;
min-width : unset !important; min-width : unset !important;
......
...@@ -224,6 +224,7 @@ const ContainerStyled = styled.div` ...@@ -224,6 +224,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%;
min-width : unset !important; min-width : unset !important;
......
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