Merge pull request #99 from VitorCarvalho67/dev

Dev
VitorCarvalho67 · Nov 4, 2024 · 96141de · 96141de
2 parents 98b1978 + ad99099
commit 96141de
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 22 deletions.
diff --git a/client/src/scss/pages/aluno/_config.scss b/client/src/scss/pages/aluno/_config.scss
@@ -14,10 +14,20 @@ main {
             @include flex(column, flex-start, start);
         }
 
-        #box1 {
-            width: 70%;
-            margin-right: 20px;
+        @include m-screen(1000px) {
+            padding: 50px 20px 20px 70px;
+        }
+
+        @include m-screen(700px) {
+            @include flex(column-reverse, flex-start, start);
+            padding: 50px 20px 20px 50px;
+        }
 
+        @include m-screen(350px) {
+            padding: 50px 20px 20px 30px;
+        }
+
+        #box1 {width: 70%;
             h1 {
                 font-size: 2rem;
                 color: $secondary-color-orange;
@@ -36,9 +46,9 @@ main {
             h2 {
                 font-size: 1.3rem;
                 color: $font-color-dark-2;
-                margin-bottom: 40px;
-
+                margin-bottom: 60px;
                 @include font-inter(300);
+
                 @include m-screen(1400px) {
                     font-size: 1.1rem;
                 }
@@ -49,7 +59,7 @@ main {
                     font-size: 0.9rem;
                 }
             }
-
+            
             h3 {
                 font-size: 1.5rem;
                 color: $font-color-dark;
@@ -64,8 +74,17 @@ main {
                 @include m-screen(860px) {
                     font-size: 0.7rem;
                 }
+            }   
+
+            @include m-screen(1000px) {
+                width: 60%;
             }
 
+            @include m-screen(700px) {
+                width: 100%;
+                margin-bottom: 20px;
+            }
+
             .inputUpload {
                 position: relative;
                 margin: 20px 0px 40px 0px;
@@ -231,6 +250,14 @@ main {
                     @include font-inter(300);
                 }
             }
+
+            @include m-screen(1000px) {
+                width: 40%;
+            }
+
+            @include m-screen(700px) {
+                width: 100%;
+            }
         }
     }
 }
diff --git a/client/src/scss/pages/aluno/_home.scss b/client/src/scss/pages/aluno/_home.scss
@@ -30,9 +30,6 @@ main {
                 @include m-screen(1120px) {
                     font-size: 1.6rem;
                 }
-                @include m-screen(860px) {
-                    font-size: 1.3rem;
-                }
             }
 
             h2 {
@@ -46,9 +43,6 @@ main {
                 @include m-screen(1120px) {
                     font-size: 1rem;
                 }
-                @include m-screen(860px) {
-                    font-size: 0.9rem;
-                }
             }
 
             width: 70%;
@@ -71,6 +65,12 @@ main {
                 background-color: $secondary-color-dark;
                 border-left: solid 3px $secondary-color-orange;
 
+                @include m-screen(700px) {
+                    width: 95%;
+                    padding: 15px;
+                    border-radius: 0px 8px 8px 0px;
+                }
+
                 .img-box {
                     width: 70px;
                     height: 70px;
@@ -162,6 +162,7 @@ main {
 
             @include m-screen(700px) {
                 width: 100%;
+                margin-bottom: 20px;
             }
         }
     }

diff --git a/client/src/scss/pages/shared/_vagas.scss b/client/src/scss/pages/shared/_vagas.scss
@@ -17,9 +17,17 @@
 
             .search {
                 @include flex(row, center, start);
-                height: 50px;
-                width: 62%;
-                padding: 20px 30px 20px 80px;
+                width: 100%;
+                max-width: 1000px;
+                padding: 80px 30px 20px 80px;
+
+                @include m-screen(800px) {
+                    padding: 80px 30px 20px 20px;
+                }
+
+                @include m-screen(520px) {
+                    padding: 80px 10px 20px 10px;
+                }
 
                 .box {
                     @include flex(row, cen, start);
@@ -44,6 +52,7 @@
                         height: 100%;
                         background-color: transparent;
                         border: none;
+                        margin-right: 18px;
 
                         img {
                             height: 55%;
@@ -56,12 +65,30 @@
             }
 
             > .box {
-                @include flex(column, flex-start, end);
+                @include flex(column, flex-start, start);
                 padding: 50px 0px 0px 100px;
                 width: 70%;
-                height: 100%;
+                max-height: 100%;
+                overflow-y: auto;
+
+                &::-webkit-scrollbar {
+                    width: 0px;
+                }
+
+                &::-webkit-scrollbar-track {
+                    background: transparent;
+                }
+
+                &::-webkit-scrollbar-thumb {
+                    background: rgba(0, 0, 0, 0.2);
+                    border-radius: 10px;
+                }
+
+                scrollbar-width: thin;
+                scrollbar-color: rgba(0, 0, 0, 0) transparent;
+
 
-                @include m-screen(1600px) {
+                @include m-screen(1500px) {
                     width: 80%;
                 }
 

diff --git a/client/src/views/aluno/Config.vue b/client/src/views/aluno/Config.vue
@@ -76,7 +76,6 @@
             </div>
         </div>
     </main>
-    <Footer />
 </template>
 
 <script>
@@ -273,7 +272,7 @@ export default {
 #app {
     display: flex;
     flex-direction: column;
-    height: 100vh;
+    
 
     main {
         display: flex;
@@ -283,7 +282,7 @@ export default {
         .content {
             flex: 1;
             overflow-y: auto;
-            height: 100%;
+            min-height: calc(100vh - 80px);
 
             @media (max-width: 1000px) {
                 width: calc(100% - 100px);

diff --git a/client/src/views/aluno/Pesquisa.vue b/client/src/views/aluno/Pesquisa.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import Header from '../../components/Header.vue';
+import Header from '../../components/aluno/Header.vue';
 import AsideDashboard from '../../components/aluno/AsideDashboard.vue';
 import searchIcon from '../../assets/icons/procurar.png';