Merge pull request #139 from unb-mds/fixing-bugs-frontend

Fixing bugs frontend
unb-mds · Aug 21, 2024 · 8315e5d · 8315e5d
2 parents 8d3b9fa + 2cc88e5
commit 8315e5d
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 270 deletions.
diff --git a/Front end/projeto-react/src/components/Inicial/inicial.jsx b/Front end/projeto-react/src/components/Inicial/inicial.jsx
@@ -2,19 +2,35 @@ import styled from "styled-components";
 
 
 export const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    height: 52vw;
+    margin-top: 4vw;
+
+.fundo{
+    position: absolute;
+    margin: 0 auto;
+    
+    height: 36.4vw;
+}
+.fundo2{
+    display: none;
+}
+
     .conteudo{
         margin: 4vw auto 0 auto;
         display: flex;
         justify-content: center;
         flex-direction: row-reverse;
         height: 45vw;
         width: 70%;
-        background-image: url('../../../assets/images/Component 7.png');
-        background-size: contain;
-        background-repeat: no-repeat;
+        
+        
         
     }
     .textos{
+        position: relative;
         display: flex;
         flex-direction: column;
         margin-top: 13vw;
@@ -23,6 +39,7 @@ export const Container = styled.div`
     }
     
     .principal_text{
+        
         font-size: 2.5vw;
         text-align: center;
         height: auto;
@@ -45,6 +62,7 @@ export const Container = styled.div`
     }
     
     .mulher{
+        position: relative;
         margin: 9.8vw auto;
         width: 30vw;
         height: auto;
@@ -56,25 +74,33 @@ export const Container = styled.div`
         display: none;
     }
     @media (max-width:700px){
+        margin-top: 30vw;
+        margin-bottom: 90vw;
+        .fundo{
+            display: none;
+        }
+        .fundo2{
+            display: block;
+            position: absolute;
+            margin: 0 auto 40vw auto;
+            height: 91vw;
+
+        }
         
 
         .conteudo{
             all: unset;
-            margin: 2vw auto;
+            margin: 1.2vw auto;
             display: flex;
             flex-direction: column;
-            
             align-items: center;
-            height: 91vw;
-            width: auto;
-            background-image: url('../../../assets/images/Component 6.png');
-            background-size: cover;
-            background-repeat: no-repeat;
+            position: relative;
         }
 
         .textos{
         
         all: unset;
+        position: relative;
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -112,8 +138,8 @@ export const Container = styled.div`
         
         }
         .mulher2{
+            position: relative;
             display: block;
-            margin-top: 1vw;
             width: 45vw;
             height: auto;
         }

diff --git a/Front end/projeto-react/src/components/Inicial/inicial_main.jsx b/Front end/projeto-react/src/components/Inicial/inicial_main.jsx
@@ -2,12 +2,16 @@ import mulher from '../../../assets/images/mulher.png';
 import mulher2 from '../../../assets/images/mulher2.png';
 import { Container } from './inicial';
 import { StyledLink } from "../navbar/navbar";
+import fundo from '../../../assets/images/Component 7.png'
+import fundo2 from '../../../assets/images/Component 6.png'
+
 
 const Inicial = () => {
     return(
     <div>
         <Container className='container'>
-
+        <img src={fundo} alt="" className='fundo'/>
+        <img src={fundo2} alt="" className='fundo2'/>
         <div className='conteudo'>
             <div>
                 <img src={mulher2} alt="mulher" className='mulher'/>

diff --git a/Front end/projeto-react/src/components/licitacoes/licitacoes.jsx b/Front end/projeto-react/src/components/licitacoes/licitacoes.jsx
@@ -38,6 +38,7 @@ export const Container = styled.div`
         flex-direction: column;
         height: auto;
         width: auto;
+        margin-bottom:40vw;
 
         .image{
             display: none;

diff --git a/Front end/projeto-react/src/components/main_button/button.jsx b/Front end/projeto-react/src/components/main_button/button.jsx
@@ -32,7 +32,8 @@ export const Container = styled.div`
             display: none;
         }
 
-        .logo2{
+        .logo_recursiva{
+            margin-top: 0;
             display: block;
         }