Skip to content

Commit

Permalink
Merge branch 'main' into new_censo
Browse files Browse the repository at this point in the history
  • Loading branch information
zoedsoupe authored Sep 25, 2024
2 parents 206d43d + 16f9e8d commit 9ec9443
Show file tree
Hide file tree
Showing 23 changed files with 904 additions and 261 deletions.
19 changes: 14 additions & 5 deletions assets/css/agenda.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
height: 260px;
background: rgba(0, 50, 100, 0.8);
margin-bottom: 60px;

.banner-img {
z-index: -1;
position: absolute;
width: 100vw;
max-height: 260px;
max-height: 260px;
}

}
Expand All @@ -24,10 +24,18 @@
justify-content: center;
margin-bottom: 40px;

.alert {
padding: 0 2em;
}

.table-label {
margin-bottom: 15px;
}

.container {
width: 95vw;
}

.table-container {
width: 100%;
overflow-x: auto;
Expand Down Expand Up @@ -70,16 +78,17 @@
background: #0064C8CC;
background-blend-mode: multiply;
margin-bottom: 80px;

h4 {
position: absolute;
text-align: center;
max-width: 668px;
padding: 0 1em;
}

img {
width: 100vw;
height: 100%;
z-index: -1;
}
}
}
7 changes: 5 additions & 2 deletions assets/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ body {
font-size: 62.5%;
font-weight: 400;
position: relative;
overflow-x: hidden;
}

.grid {
Expand Down Expand Up @@ -154,6 +155,7 @@ footer {
@import "./button.scss";
@import "./checkbox.scss";
@import "./flash.scss";
@import "./footer.scss";
@import "./get_in_touch.scss";
@import "./input.scss";
@import "./landing.scss";
Expand All @@ -175,12 +177,13 @@ footer {
@import "./aboutus.scss";
@import "./noticias.scss";
@import "./cooperativas.scss";

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

// Com autenticação
@import "./pages/app/researcher/profile.scss";
Expand All @@ -190,4 +193,4 @@ footer {
@import "./pages/app/researcher/pesquisador";

// Páginas de Erros
@import "./errors/404.scss";
@import "./errors/404.scss";
38 changes: 24 additions & 14 deletions assets/css/boletins.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,42 @@
.boletim-wrapper {
.links-item {
width: 15.5rem;
.card-links{
border-radius: none;

.card-item {
width: 16.5rem;
}
}
}

@media (min-width: 530px) and (max-width: 770px){

.boletim-wrapper {
.links-item {
@apply flex flex-col justify-start items-start m-8;
width: 60%;
height: 16rem;
.card-links{
border-radius: 8px;
box-sizing: border-box;
background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%);
.card-item {
@apply flex flex-col justify-start items-start m-8;
width: 50%;
height: 16rem;
border-radius: 8px;
box-sizing: border-box;
background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%);
}
}
}
}
@media (min-width: 350px) and (max-width: 529px){

.boletim-wrapper {
.links-item {
@apply flex flex-col justify-start items-start m-8;
width: 70%;
height: 13rem;
.card-links{
border-radius: 8px;
box-sizing: border-box;
background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%);
.card-item {
@apply flex flex-col justify-start items-start m-8;
width: 70%;
height: 15rem;
border-radius: 8px;
box-sizing: border-box;
background: linear-gradient(180deg, rgba(16, 16, 16, 0) 0%, #101010 100%);
}
}
}
}
77 changes: 77 additions & 0 deletions assets/css/cards.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
.card-links {
@apply flex flex-wrap justify-center;


.card-item {
@apply flex flex-col justify-start items-start m-8;
width: 20.125rem;
height: 20.875rem;
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 {
@apply absolute;
z-index: -10;
height: inherit;
width: inherit;
}

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 (max-width: 768px) and (min-width: 577px){
.card-links{
.card-item{
width: 70%;
height: 16rem;

img{
border-radius: 8px;
}
}
}

}

@media (min-width: 350px) and (max-width: 576px){
.card-links{
.card-item{
width: 80%;
height: 14rem;

img{
border-radius: 8px;
}
}
}

}
32 changes: 32 additions & 0 deletions assets/css/footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
footer {
@apply flex items-center justify-center fixed bg-white-100;
gap: 2rem;
bottom: 0;
padding: 1.5rem 13.5rem;
width: 100%;

stroke-width: 1px;
stroke: var(--NEUTRAS-20, #CFCFCF);

p {
font-size: 0.75rem;
font-style: normal;
font-weight: 400;
line-height: 1.25rem;
}
}

@media (max-width: 768px) {
footer {
@apply absolute flex-wrap;
padding: 1.5rem 1rem;
align-items: center;

stroke-width: 0;
box-shadow: 0px 0px 20px 2px rgba(64, 64, 64, 0.10);

p {
text-align: center;
}
}
}
2 changes: 2 additions & 0 deletions assets/css/get_in_touch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@

@media (max-width: 767px) {
.onde-nos-encontrar-wrapper {
margin: 0;

.redes-sociais-wrapper {
margin: 1rem;

Expand Down
19 changes: 12 additions & 7 deletions assets/css/landing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@
grid-area: landing-carousel;
grid-column: 1 / -1;

.glide__slide {
max-width: 100%;
height: 100%;
.glide__slides {
height: 30.5625rem;

img {
width: 100%;
height: 100%;
.glide__slide img {
background-size: cover;
transform: translateY(-20%);
}
}

Expand Down Expand Up @@ -284,6 +282,13 @@

@media (max-width: 768px) {
.landing-grid {
.landing-carousel {
.glide__slides {
height: auto;
max-height: 24.125rem;
}
}

.news {
.news-cards {
@apply flex-nowrap;
Expand Down Expand Up @@ -682,4 +687,4 @@
.nossas-equipes-container {
width: 1360px;
}
}
}
57 changes: 57 additions & 0 deletions assets/css/sedes.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
.sedes-wrapper {
@apply flex flex-col;
gap: 5rem;

.mapa {
@apply flex justify-center;
margin-top: 5rem;
padding: 0 2.5rem;

img {
border-radius: 1.5rem;
}
}

.nossas-sedes {
@apply flex flex-col justify-center;
align-items: center;
gap: 5rem;

.nossas-sedes-container {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 2.5rem;
padding: 0 7.19rem;

.sede-detail {
@apply flex;
gap: 0.62rem;

.sede-text {
font-size: 1rem;

h5:nth-child(1) {
font-weight: 700;
}
}
}
}
}

@media (max-width: 768px) {
.mapa {
padding: 0 1rem;
}

.nossas-sedes {
h2 {
text-align: center;
}

.nossas-sedes-container {
grid-template-columns: 1fr;
padding: 0 1rem;
}
}
}
}
Loading

0 comments on commit 9ec9443

Please sign in to comment.