Skip to content

Commit

Permalink
trying to fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafael-Mori-2022 committed Sep 25, 2024
2 parents 8060a51 + f6fb03f commit ab5b963
Show file tree
Hide file tree
Showing 3 changed files with 134 additions and 0 deletions.
3 changes: 3 additions & 0 deletions assets/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,16 @@ footer {
@import "./cooperativas.scss";
@import "./sedes.scss";
@import "./pgtr.scss";
@import "./pgtr.scss";

@import "./agenda.scss";
@import "./contact.scss";
@import "./article.scss";
@import "./boletins.scss";
@import "./noticias.scss";
@import "./cards.scss";
@import "./article.scss";
@import "./boletins.scss";

// Com autenticação
@import "./pages/app/researcher/profile.scss";
Expand Down
114 changes: 114 additions & 0 deletions assets/css/landing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@
flex-direction: column;
align-items: center;
width: 100%;
width: 100%;

.publications-main-text {
margin: 5rem 30rem;
Expand Down Expand Up @@ -633,12 +634,15 @@
justify-content: center;
border-radius: 50%;
overflow: hidden;
overflow: hidden;
width: 3.75rem;
height: 3.75rem;

img {
width: 100%;
object-fit: cover;
width: 100%;
object-fit: cover;
}
}

Expand Down Expand Up @@ -748,6 +752,116 @@



.links-landing {
@apply flex flex-col justify-center items-center;
width: 100%;

.links-item {
@apply flex flex-col justify-start items-start m-8;
width: 70%;
height: 13rem;
border-radius: 8px;
box-sizing: border-box;
background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%);

a {
@apply flex flex-col mt-auto;
}

img {
border-radius: 8px;
width: inherit;
height: inherit;
@apply absolute;
z-index: -10;
}

h3 {
padding-left: 1rem;
}

p {
text-wrap: wrap;
margin-top: 0.5rem;
padding: 0 1rem 1.5rem 1rem;
}

button {
width: 100%;
padding: 0 1rem 1.5rem 0;
background-color: transparent;

p {
display: inline-flex;
width: inherit;

&:hover {
text-decoration: underline;
}
}
}
}
}
}

@media (min-width: 530px) and (max-width: 770px){
.links-landing {
@apply flex flex-col justify-center items-center ;
width: 100%;

.links-item {
@apply flex flex-col justify-start items-start m-8;
width: 60%;
height: 16rem;
border-radius: 8px;
box-sizing: border-box;
background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%);

a {
@apply flex flex-col mt-auto;
}

img {
border-radius: 8px;
width: inherit;
height: inherit;
@apply absolute;
z-index: -10;
}

h3 {
padding-left: 1rem;
}

p {
text-wrap: wrap;
margin-top: 0.5rem;
padding: 0 1rem 1.5rem 1rem;
}

button {
width: 100%;
padding: 0 1rem 1.5rem 0;
background-color: transparent;

p {
display: inline-flex;
width: inherit;

&:hover {
text-decoration: underline;
}
}
}
}
}

}

@media (min-width: 350px) and (max-width: 529px){



.links-landing {
@apply flex flex-col justify-center items-center;
width: 100%;
Expand Down
17 changes: 17 additions & 0 deletions assets/js/accordion.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
const phases = document.querySelectorAll('.phases');
const units = document.querySelectorAll('.units-accordions');

units.forEach(unit => {
const accordions = unit.getElementsByClassName('accordion-bx');

for (let i = 0; i < accordions.length; i++) {
const label = accordions[i].querySelector('.accordion-label');

label.addEventListener('click', function() {
if (!accordions[i].classList.contains('active')) {
accordions[i].classList.add('active');
} else {
accordions[i].classList.remove('active');
}
});
}
});
const units = document.querySelectorAll('.units-accordions');

units.forEach(unit => {
const accordions = unit.getElementsByClassName('accordion-bx');

Expand Down

0 comments on commit ab5b963

Please sign in to comment.