Compare commits

...

25 Commits

Author SHA1 Message Date
498f753aed Merge pull request 'development' (#23) from development into main
Reviewed-on: #23
2023-01-19 17:30:56 +00:00
8741c594da Merge pull request 'feature/ajuste4k' (#22) from feature/ajuste4k into development
Reviewed-on: #22
2023-01-19 17:30:05 +00:00
4940f388ca fix: ajuste de tamanho em telas 4k e links redirecionando redes sociais 2023-01-19 14:28:49 -03:00
52120f48d3 Merge pull request 'development' (#21) from development into main
Reviewed-on: #21
2023-01-19 02:44:28 +00:00
29768e017b Merge pull request 'fix: corrige rota no breadcrumb' (#20) from feature/ajustBreadcrumb into development
Reviewed-on: #20
2023-01-19 02:40:34 +00:00
e0452d65e4 fix: corrige rota no breadcrumb 2023-01-18 23:39:26 -03:00
a214d04e1d Merge pull request 'fix: corrige erro inicial das rotas do projeto' (#19) from feature/ajusteDeRotas into development
Reviewed-on: #19
2023-01-19 02:29:23 +00:00
0d1b3d715f Merge pull request 'style: organização e padronizacao de arquivos scss, para utilizar variaveis de cor e de tamanho' (#18) from feature/padronizacaoSASS into development
Reviewed-on: #18
2023-01-19 02:27:23 +00:00
6374c3c05b Merge pull request 'feature/ajustesFinos' (#17) from feature/ajustesFinos into development
Reviewed-on: #17
2023-01-18 06:13:25 +00:00
ff0a880329 Merge pull request 'feat: cria botão de scroll para o topo e botao de redirecionar ao whatsapp' (#16) from feature/whatsESeta into development
Reviewed-on: #16
2023-01-18 06:13:11 +00:00
1391d1a151 Merge pull request 'fix: ajusta tamanho de espaçamento em telas 4k' (#15) from feature/ajusteFooter into development
Reviewed-on: #15
2023-01-18 06:12:25 +00:00
8846de48db Merge pull request 'fix: ajusta responsividade em telas acima de 2500' (#14) from feature/organizationContactFormResponsive into development
Reviewed-on: #14
2023-01-18 06:11:20 +00:00
1bd92c572b Merge pull request 'fix: ajuste de formulario de contato' (#13) from feature/organizationContactForm into development
Reviewed-on: #13
2023-01-18 01:08:19 +00:00
78a6ea6b5d Merge pull request 'fix: Corrige alinha mente e responsividade dos conteudos dentro do main' (#12) from feature/responsiveArticle into development
Reviewed-on: #12
2023-01-16 19:26:31 +00:00
70428932e3 Merge pull request 'feat: criar componente de paginas q serao renderizadas na rotas' (#11) from feature/contentArticle into development
Reviewed-on: #11
2023-01-16 15:17:58 +00:00
a116dea3f6 Merge pull request 'feat: cria rotas para subpastas de institucional' (#10) from feature/router into development
Reviewed-on: #10
2023-01-16 15:16:57 +00:00
5fca2d2bcc Merge pull request 'feat: cria formulario, validação e regex do formulario' (#9) from feature/createForm into development
Reviewed-on: #9
2023-01-16 15:15:40 +00:00
fe2296af78 Merge pull request 'feat: cria organizacao base das pastas e arquivos da parte centrar da SPA' (#8) from feature/mainAreaOrganizationFiles into development
Reviewed-on: #8
2023-01-16 15:14:09 +00:00
65f02271cd Merge pull request 'fix: corrige organização das pastas do footer e componente do Accordion' (#7) from feature/organizationComponentFooter into development
Reviewed-on: #7
2023-01-13 16:23:43 +00:00
d842468f5a Merge pull request 'feat: cria componente accordion do footer' (#6) from feature/footerAccordion into development
Reviewed-on: #6
2023-01-13 16:23:11 +00:00
aec42122f0 Merge pull request 'feat: cria componente das midias sociais do footer' (#5) from feature/footerSocialMedias into development
Reviewed-on: #5
2023-01-13 16:22:18 +00:00
eea65b1334 Merge pull request 'feat: cria area da newsletter da pagina, com responsividade' (#4) from feature/NewsLetter into development
Reviewed-on: #4
2023-01-12 02:30:01 +00:00
2b6a155e32 Merge pull request 'feat: cria estrutura base do footer da pagina e todo o rodape da pagina responsivo' (#3) from feature/footer into development
Reviewed-on: #3
2023-01-12 02:29:17 +00:00
586dddb142 Merge pull request 'feat: cria componentes para o header, menu hamburguer e header totalmente responsivo' (#2) from feature/header into development
Reviewed-on: #2
2023-01-12 02:28:24 +00:00
da2e066140 Merge pull request 'feat: cria organizacao de pastas e arquivos base do projeto' (#1) from feature/filesOrganization into development
Reviewed-on: #1
2023-01-12 02:27:19 +00:00
6 changed files with 27 additions and 11 deletions

View File

@ -15,7 +15,7 @@ export const BreadCrumb = () => {
{pathname !== "/" && (
<ul className={styles["breadNav"]}>
<li className={styles["navItem"]}>
<Link to="/sobre">
<Link to="/institucional/sobre">
<img src={homeIcon} alt="Icone de home" />
</Link>
</li>
@ -25,7 +25,6 @@ export const BreadCrumb = () => {
<span className={styles["routeName"]}>
{routeName}
{/* Institucional */}
</span>
</li>

View File

@ -5,13 +5,13 @@
flex-direction: column;
height: 137px;
position: fixed;
bottom: 25%;
bottom: 255px;
right: 16px;
@media (max-width:2499px) {
height: 73px;
position: fixed;
bottom: 35%;
bottom: 225px;
right: 16px;
}

View File

@ -15,23 +15,23 @@ export const SocialMedia = () => {
<div className={styleSocialMedia["wrapper"]}>
<div className={styleSocialMedia["wrapper__social__media"]}>
<IconLink link={"/"}
<IconLink link={"https://web.facebook.com/digitalm3"}
sourceImg={facebook}
altText="Logo da rede social "
/>
<IconLink link={"/"}
<IconLink link={"https://www.instagram.com/m3.ecommerce/"}
sourceImg={instagram}
altText="Logo da rede social "
/>
<IconLink link={"/"}
<IconLink link={"https://twitter.com/eCommerce_Br/status/1443210495784366089"}
sourceImg={twitter}
altText="Logo da rede social "
/>
<IconLink link={"/"}
<IconLink link={"https://www.youtube.com/@m3e-commerce796"}
sourceImg={youtube}
altText="Logo da rede social "
/>
<IconLink link={"/"}
<IconLink link={"https://www.linkedin.com/company/m3ecommerce/"}
sourceImg={linkedin}
altText="Logo da rede social "
/>

View File

@ -7,6 +7,12 @@
height: 100%;
overflow: hidden;
@media (min-width:3000px) {
height: 100vh;
flex: 1;
}
}
.main {
@ -20,7 +26,8 @@
@media (min-width: 3000px) {
min-height: 897px;
flex: 1;
height: 100vh;
}
@media (max-width:$tablets) {

View File

@ -9,7 +9,7 @@ interface IconLink {
export const IconLink = ({ link, sourceImg, altText }: IconLink) => {
return (
<li>
<a href={link}>
<a href={link} target="_blank">
<img src={sourceImg} alt={altText} />
</a>
</li>

View File

@ -7,6 +7,12 @@
height: 100%;
overflow: hidden;
@media (min-width:3000px) {
height: 100vh;
flex: 1;
}
}
.main {
@ -21,6 +27,10 @@
@media (min-width: 3000px) {
min-height: 897px;
height: 100vh;
flex: 1;
border: 1px solid blue;
}
@media (max-width:$tablets) {