Skip to content

Commit

Permalink
Merge branch 'main' into fix/agenda-outubro
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafael-Mori-2022 committed Sep 25, 2024
2 parents 278e1ae + 1b5dbab commit 1697e44
Show file tree
Hide file tree
Showing 46 changed files with 2,239 additions and 651 deletions.
16 changes: 8 additions & 8 deletions assets/css/aboutus.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
}

.lighter-banner{
.lighter-banner {
display: flex;
flex-direction: column;
text-align: center;
Expand All @@ -18,10 +18,10 @@
background-blend-mode: multiply;

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

}
Expand Down Expand Up @@ -64,7 +64,7 @@
}

.know-content {
width: 100vw;
width: 100vw;
padding: 0px 20px;
margin-top: 40px;
}
Expand Down Expand Up @@ -221,7 +221,7 @@
}

img {
order: 2;
order: 2;
width: 100%;
}

Expand Down Expand Up @@ -251,4 +251,4 @@
height: 100%;
z-index: -1;
}
}
}
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;
}
}
}
8 changes: 7 additions & 1 deletion 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 @@ -173,11 +175,15 @@ footer {
// Sem autenticação
@import "./pages/login.scss";
@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 Down
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;
}
}
}

}
49 changes: 49 additions & 0 deletions assets/css/contact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,38 @@
display: flex;
align-items: center;
justify-content: center;
max-width: 100vw;
margin-bottom: 40px;
padding: 80px 120px;

.contact-message {
display: flex;
flex-direction: column;
justify-content: center;
width: 50%;

h2 {
margin-bottom: 20px;
}

.text-black-80 {
margin-bottom: 20px;
}

.return-button {
display: flex;
align-items: center;
justify-content: center;
background: #0064C8;
border-radius: 4px;
gap: 8px;
padding: 16px 24px;
width: 267px;
cursor: pointer;
}

}

.contact-form {
width: 50%;
.form-inputs {
Expand Down Expand Up @@ -51,4 +80,24 @@
}
}
}
}

@media (min-width: 769px) and (max-width: 1024px) {
.contact-area {
margin: 20px 40px;
}
}

@media (min-width: 360px) and (max-width: 768px) {
.contact-area {
display: flex;
padding: 10px 5px;
flex-direction: column;
text-align: center;
gap: 40px;

.contact-message {
align-items: center;
}
}
}
Loading

0 comments on commit 1697e44

Please sign in to comment.