Skip to content

Commit

Permalink
Merge pull request #21 from VitorCarvalho67/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@VitorCarvalho67
VitorCarvalho67 authored Jun 12, 2024
2 parents be8052a + e6b099d commit 6200763
Show file tree
Hide file tree
Showing 14 changed files with 386 additions and 72 deletions.
40 changes: 39 additions & 1 deletion client/src/scss/pages/admin/_login.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ main {
border-radius: 20px;
padding: 20px;
color: $font-color-dark;
@include m-screen(1600px) {
height: 75%;
width: 40%;
}
@include m-screen-box;

nav {
width: 100%;
Expand Down Expand Up @@ -65,6 +70,7 @@ main {
@include font-inter(300);
font-size: 2.5rem;
margin-top: 50px;
@include m-screen-h1;
}

p {
Expand Down Expand Up @@ -146,6 +152,10 @@ main {
.hide {
background-image: url("../../assets/icons/olho-2.png");
}

@include m-screen(1200px) {
width: 10%;
}
}
}

Expand All @@ -160,13 +170,18 @@ main {
@include font-inter(300);
font-size: 0.8rem;
}

@include m-screen(600px) {
@include flex(row, flex-start, center);
}

}

.button-box {
width: 100%;
margin-top: 40px;
@include flex(row, flex-start, center);

button {
height: 40px;
width: 140px;
Expand All @@ -185,18 +200,41 @@ main {
color: $primary-color-orange;
}
}

@include m-screen(1800px) {
margin-top: 20px;
}
@include m-screen(600px) {
@include flex(row, flex-end, center);
}
}
}
}

#box1 {
background-color: $secondary-color-dark;
@include m-screen(1150px) {
background-color: $primary-color-dark;
}
}

#box2 {
@include flex-center;

img {
height: 80%;
transform: rotatey(180deg);
}

@include m-screen(1250px) {
height: 75%;
width: 30%;
}
@include m-screen(1250px) {
height: 75%;
width: 30%;
}
@include m-screen(1150px) {
display: none;
}
}
8 changes: 3 additions & 5 deletions client/src/scss/pages/aluno/_login.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,6 @@ main {
width: 100%;
margin-top: 40px;
@include flex(row, flex-start, center);
@include m-screen(1800px) {
margin-top:20px;
}

button {
height: 40px;
Expand All @@ -205,7 +202,9 @@ main {
color: $primary-color-orange;
}
}

@include m-screen(1800px) {
margin-top: 20px;
}
@include m-screen(600px) {
@include flex(row, flex-end, center);
}
Expand Down Expand Up @@ -239,5 +238,4 @@ main {
@include m-screen(1150px) {
display: none;
}

}
6 changes: 3 additions & 3 deletions client/src/scss/pages/aluno/_profile.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ main {
}

.capa {
// background-color: red;
width: 100%;
height: 400px;
position: relative;

.capaProfile {
height: 66.66%;
border-radius: 16px;
border-radius: 6px;
background-color: $secondary-color-dark;

> img {
height: 100%;
width: 100%;
border-radius: 6px;
@include flex-center;
object-fit: cover;
}
Expand Down Expand Up @@ -121,7 +121,7 @@ main {
width: 100%;
background-color: $secondary-color-dark;
padding: 20px;
border-radius: 18px;
border-radius: 6px;

p,
textarea {
Expand Down
44 changes: 33 additions & 11 deletions client/src/scss/pages/aluno/_recovery.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ main {
border-radius: 20px;
padding: 20px;
color: $font-color-dark;
@include m-screen(1600px) {
height: 75%;
width: 40%;
}
@include m-screen-box;
@include m-screen(1150px) {
background-color: $primary-color-dark;
}

nav {
width: 100%;
Expand Down Expand Up @@ -70,6 +78,7 @@ main {
@include font-inter(300);
font-size: 2.5rem;
margin-top: 30px;
@include m-screen-h1;
}

p {
Expand All @@ -79,6 +88,20 @@ main {
color: $font-color-dark-2;
@include font-inter(200);
margin-bottom: 50px;

width: 100%;
margin-bottom: 10px;

a {
text-decoration: none;
color: $font-color-dark-2;
@include font-inter(300);
font-size: 0.8rem;
}
}

p:last-child {
@include flex(row, flex-end, center);
}

.input-box {
Expand Down Expand Up @@ -118,7 +141,7 @@ main {
}
}

> p {
p {
width: 100%;
margin-bottom: 10px;
@include flex(row, flex-end, center);
Expand All @@ -129,17 +152,9 @@ main {
@include font-inter(300);
font-size: 0.8rem;
}
}

p {
width: 100%;
@include flex(row, flex-end, center);

a {
text-decoration: none;
color: $font-color-dark-2;
@include font-inter(300);
font-size: 0.8rem;
@include m-screen(600px) {
@include flex(row, flex-start, center);
}
}

Expand All @@ -166,6 +181,13 @@ main {
color: $primary-color-orange;
}
}

@include m-screen(1800px) {
margin-top: 20px;
}
@include m-screen(600px) {
@include flex(row, flex-end, center);
}
}
}
}
27 changes: 26 additions & 1 deletion client/src/scss/pages/empresa/_login.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ main {
padding: 20px;
color: $font-color-dark;
background-color: $secondary-color-dark;
@include m-screen(1600px) {
height: 75%;
width: 40%;
}
@include m-screen-box;
@include m-screen(1150px) {
background-color: $primary-color-dark;
}

nav {
width: 100%;
Expand All @@ -23,7 +31,7 @@ main {
@include font-inter(300);
margin-inline: 20px;

p {
> p {
@include flex(column, center, center);
@include font-inter(400);
width: 60px;
Expand Down Expand Up @@ -66,6 +74,7 @@ main {
@include font-inter(300);
font-size: 2.5rem;
margin-top: 50px;
@include m-screen-h1;
}

p {
Expand Down Expand Up @@ -147,6 +156,10 @@ main {
.hide {
background-image: url("../../assets/icons/olho-2.png");
}

@include m-screen(1200px) {
width: 10%;
}
}
}

Expand All @@ -161,6 +174,11 @@ main {
@include font-inter(300);
font-size: 0.8rem;
}

@include m-screen(600px) {
@include flex(row, flex-start, center);
}

}

.button-box {
Expand All @@ -186,6 +204,13 @@ main {
color: $primary-color-orange;
}
}

@include m-screen(1800px) {
margin-top: 20px;
}
@include m-screen(600px) {
@include flex(row, flex-end, center);
}
}
}
}
44 changes: 33 additions & 11 deletions client/src/scss/pages/empresa/_recovery.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ main {
border-radius: 20px;
padding: 20px;
color: $font-color-dark;
@include m-screen(1600px) {
height: 75%;
width: 40%;
}
@include m-screen-box;
@include m-screen(1150px) {
background-color: $primary-color-dark;
}

nav {
width: 100%;
Expand Down Expand Up @@ -70,6 +78,7 @@ main {
@include font-inter(300);
font-size: 2.5rem;
margin-top: 30px;
@include m-screen-h1;
}

p {
Expand All @@ -79,6 +88,20 @@ main {
color: $font-color-dark-2;
@include font-inter(200);
margin-bottom: 50px;

width: 100%;
margin-bottom: 10px;

a {
text-decoration: none;
color: $font-color-dark-2;
@include font-inter(300);
font-size: 0.8rem;
}
}

p:last-child {
@include flex(row, flex-end, center);
}

.input-box {
Expand Down Expand Up @@ -118,7 +141,7 @@ main {
}
}

> p {
p {
width: 100%;
margin-bottom: 10px;
@include flex(row, flex-end, center);
Expand All @@ -129,17 +152,9 @@ main {
@include font-inter(300);
font-size: 0.8rem;
}
}

p {
width: 100%;
@include flex(row, flex-end, center);

a {
text-decoration: none;
color: $font-color-dark-2;
@include font-inter(300);
font-size: 0.8rem;
@include m-screen(600px) {
@include flex(row, flex-start, center);
}
}

Expand All @@ -166,6 +181,13 @@ main {
color: $primary-color-orange;
}
}

@include m-screen(1800px) {
margin-top: 20px;
}
@include m-screen(600px) {
@include flex(row, flex-end, center);
}
}
}
}
Loading

0 comments on commit 6200763

Please sign in to comment.