Skip to content

Commit 96141de

Browse files
Merge pull request #99 from VitorCarvalho67/dev
Dev
2 parents 98b1978 + ad99099 commit 96141de

File tree

5 files changed

+76
-22
lines changed

5 files changed

+76
-22
lines changed

client/src/scss/pages/aluno/_config.scss

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,20 @@ main {
1414
@include flex(column, flex-start, start);
1515
}
1616

17-
#box1 {
18-
width: 70%;
19-
margin-right: 20px;
17+
@include m-screen(1000px) {
18+
padding: 50px 20px 20px 70px;
19+
}
20+
21+
@include m-screen(700px) {
22+
@include flex(column-reverse, flex-start, start);
23+
padding: 50px 20px 20px 50px;
24+
}
2025

26+
@include m-screen(350px) {
27+
padding: 50px 20px 20px 30px;
28+
}
29+
30+
#box1 {width: 70%;
2131
h1 {
2232
font-size: 2rem;
2333
color: $secondary-color-orange;
@@ -36,9 +46,9 @@ main {
3646
h2 {
3747
font-size: 1.3rem;
3848
color: $font-color-dark-2;
39-
margin-bottom: 40px;
40-
49+
margin-bottom: 60px;
4150
@include font-inter(300);
51+
4252
@include m-screen(1400px) {
4353
font-size: 1.1rem;
4454
}
@@ -49,7 +59,7 @@ main {
4959
font-size: 0.9rem;
5060
}
5161
}
52-
62+
5363
h3 {
5464
font-size: 1.5rem;
5565
color: $font-color-dark;
@@ -64,8 +74,17 @@ main {
6474
@include m-screen(860px) {
6575
font-size: 0.7rem;
6676
}
77+
}
78+
79+
@include m-screen(1000px) {
80+
width: 60%;
6781
}
6882

83+
@include m-screen(700px) {
84+
width: 100%;
85+
margin-bottom: 20px;
86+
}
87+
6988
.inputUpload {
7089
position: relative;
7190
margin: 20px 0px 40px 0px;
@@ -231,6 +250,14 @@ main {
231250
@include font-inter(300);
232251
}
233252
}
253+
254+
@include m-screen(1000px) {
255+
width: 40%;
256+
}
257+
258+
@include m-screen(700px) {
259+
width: 100%;
260+
}
234261
}
235262
}
236263
}

client/src/scss/pages/aluno/_home.scss

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ main {
3030
@include m-screen(1120px) {
3131
font-size: 1.6rem;
3232
}
33-
@include m-screen(860px) {
34-
font-size: 1.3rem;
35-
}
3633
}
3734

3835
h2 {
@@ -46,9 +43,6 @@ main {
4643
@include m-screen(1120px) {
4744
font-size: 1rem;
4845
}
49-
@include m-screen(860px) {
50-
font-size: 0.9rem;
51-
}
5246
}
5347

5448
width: 70%;
@@ -71,6 +65,12 @@ main {
7165
background-color: $secondary-color-dark;
7266
border-left: solid 3px $secondary-color-orange;
7367

68+
@include m-screen(700px) {
69+
width: 95%;
70+
padding: 15px;
71+
border-radius: 0px 8px 8px 0px;
72+
}
73+
7474
.img-box {
7575
width: 70px;
7676
height: 70px;
@@ -162,6 +162,7 @@ main {
162162

163163
@include m-screen(700px) {
164164
width: 100%;
165+
margin-bottom: 20px;
165166
}
166167
}
167168
}

client/src/scss/pages/shared/_vagas.scss

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,17 @@
1717

1818
.search {
1919
@include flex(row, center, start);
20-
height: 50px;
21-
width: 62%;
22-
padding: 20px 30px 20px 80px;
20+
width: 100%;
21+
max-width: 1000px;
22+
padding: 80px 30px 20px 80px;
23+
24+
@include m-screen(800px) {
25+
padding: 80px 30px 20px 20px;
26+
}
27+
28+
@include m-screen(520px) {
29+
padding: 80px 10px 20px 10px;
30+
}
2331

2432
.box {
2533
@include flex(row, cen, start);
@@ -44,6 +52,7 @@
4452
height: 100%;
4553
background-color: transparent;
4654
border: none;
55+
margin-right: 18px;
4756

4857
img {
4958
height: 55%;
@@ -56,12 +65,30 @@
5665
}
5766

5867
> .box {
59-
@include flex(column, flex-start, end);
68+
@include flex(column, flex-start, start);
6069
padding: 50px 0px 0px 100px;
6170
width: 70%;
62-
height: 100%;
71+
max-height: 100%;
72+
overflow-y: auto;
73+
74+
&::-webkit-scrollbar {
75+
width: 0px;
76+
}
77+
78+
&::-webkit-scrollbar-track {
79+
background: transparent;
80+
}
81+
82+
&::-webkit-scrollbar-thumb {
83+
background: rgba(0, 0, 0, 0.2);
84+
border-radius: 10px;
85+
}
86+
87+
scrollbar-width: thin;
88+
scrollbar-color: rgba(0, 0, 0, 0) transparent;
89+
6390

64-
@include m-screen(1600px) {
91+
@include m-screen(1500px) {
6592
width: 80%;
6693
}
6794

client/src/views/aluno/Config.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
</div>
7777
</div>
7878
</main>
79-
<Footer />
8079
</template>
8180

8281
<script>
@@ -273,7 +272,7 @@ export default {
273272
#app {
274273
display: flex;
275274
flex-direction: column;
276-
height: 100vh;
275+
277276
278277
main {
279278
display: flex;
@@ -283,7 +282,7 @@ export default {
283282
.content {
284283
flex: 1;
285284
overflow-y: auto;
286-
height: 100%;
285+
min-height: calc(100vh - 80px);
287286
288287
@media (max-width: 1000px) {
289288
width: calc(100% - 100px);

client/src/views/aluno/Pesquisa.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</template>
4646

4747
<script>
48-
import Header from '../../components/Header.vue';
48+
import Header from '../../components/aluno/Header.vue';
4949
import AsideDashboard from '../../components/aluno/AsideDashboard.vue';
5050
import searchIcon from '../../assets/icons/procurar.png';
5151

0 commit comments

Comments
 (0)