Merge pull request #189 from CampusDual/develop

Sincronismo BD
CampusDual · Dec 10, 2024 · 88ce2b6 · 88ce2b6
2 parents 39227ed + 24c647f
commit 88ce2b6
Show file tree

Hide file tree

Showing 6 changed files with 237 additions and 178 deletions.
diff --git a/...frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css b/...frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css
@@ -12,9 +12,16 @@ background-color: #f5f0f2;
 border-radius: 15px;
 padding: 30px;
 display: grid;
-grid-template-columns: 1fr 1fr 1fr;
+grid-template-columns: 1fr 1fr ;
 gap: 15px;
 }
+.gridDatos{
+  grid-column: 2/3;
+  display: grid;
+  grid-column: 1fr;
+  grid-template-rows:1fr 1fr;
+  gap: 15px;
+}
 
 
 .grid-Employment{
@@ -74,16 +81,25 @@ grid-column: 2/3;
 padding-left: 40px;
 }
 
+.sepGitUdemy {
+  display: grid;
+  grid-column: 1 fr 1 fr;
+  gap: 10px;
+}
+
+.github {
+  grid-column: 1/2;
+}
 
 input,
 select,
 textarea {
 width: 100%;
 }
 .udemy{
-width: 20%;
-padding-top: 22px;
-padding-left: 40px;
+  grid-column: 2/3;
+  width: 20%;
+  padding-top: 22px;
 }
 .datos {
 display: grid;
@@ -101,6 +117,7 @@ padding: 20px 40px;
 
 .datosPrincipales2 {
   grid-column: 2 / 3;
+  width: 80%;
   padding: 20px 40px;
   display: flex;
   flex-direction: column;
@@ -109,13 +126,7 @@ padding: 20px 40px;
 
 
 
-.datosPersonales {
-display: grid;
-grid-template-columns: 1fr 1fr;
-grid-column: 1/4;
-padding: 20px;
-gap: 50%;
-}
+
 .user-grid {
 display: grid;
 grid-template-columns: 1fr 1fr;
@@ -172,16 +183,13 @@ height: 100%;
 background-color: #f5f0f2;
 }
 
-
-
 .general_table_segunda{
 background-color: #f5f0f2;
 }
 
-
-
 .separadorFile{
 display:grid;
+grid-template-columns: 2.5fr 0.5fr;
 }
 
 :host {
@@ -191,58 +199,90 @@ display:grid;
   height: 100%;
   overflow: hidden;
 }
+.login fieldset{
+  height: 100%;
+}
+.contacto{
+  grid-column: 1/2;
+  grid-row: 2/3;
+  height: 100%;
 
+}
+.contacto fieldset{
+  height: 100%;
+  width: 100%;
+}
+.usuario{
+  margin-top: 30px;
+}
 @media (max-width: 1500px) {
 .grid-container {
 display: grid;
-grid-template-columns: 1fr 1fr;
+grid-template-columns: 1fr;
 gap: 20px;
 width: 95%;
 }
 .datos {
 grid-column: 1 / 2;
 }
-.login, .contacto {
-grid-column: 2 / 3;
+
+.gridDatos{
+  grid-column: 1/2;
+  grid-template-rows: 1fr
 }
- .datosPrincipales2 {
-  grid-column: 1 / 2;
+.datosPrincipales2 {
+  grid-column: 2 / 3;
   padding: 0;
   }
-.datosPrincipales1, .datosPrincipales2 {
+.datosPrincipales1{
 grid-column: 1 / 2;
 padding: 0;
 }
-.fct-container {
-display: grid;
-grid-template-columns: 1fr 1fr;
-gap: 20px;
-width: 95%;
-}
-.fct-grid {
-grid-column: 1 / 3;
-}
 .user-grid {
 grid-column: 1 / 2;
 }
-.notes {
-grid-column: 1 / 2;
-}
-.fct-container fieldset {
-width: 100%;
-}
 .documentsGrid {
 grid-column: 1 / 3;
 }
 .estudiantesDocumentos {
 grid-column: 1 / 3;
 }
-.notes {
-grid-column: 1 / 2;
-}
+
 .o-form-layout-manager{
 grid-column: 1 / 3;
 }
+.login{
+  grid-column: 1/2;
+}
+.contacto{
+  grid-column: 2/3;
+  grid-row: 1;
+}
+
+.fct-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+}
+
+.fct-grid {
+  flex: 1 1 100%;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+}
+
+.fct_school,
+.fct_tutor,
+.fct_start,
+.fct_end {
+  flex: 1 1 45%;
+  min-width: 300px;
+}
+
+.notes {
+  flex: 1 1 100%;
+}
 }
 
 .foto {