luis/paidi_front
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Compare commits

merge into: luis/paidi_front:documents
Branches Tags
luis/paidi_front:master luis/paidi_front:develop luis/paidi_front:main luis/paidi_front:Leydi luis/paidi_front:paidiB luis/paidi_front:paidiA luis/paidi_front:project3 luis/paidi_front:project2 luis/paidi_front:project luis/paidi_front:glossary luis/paidi_front:projectA luis/paidi_front:modification luis/paidi_front:tagA luis/paidi_front:images luis/paidi_front:prueba luis/paidi_front:formats luis/paidi_front:documents luis/paidi_front:responsive luis/paidi_front:frame
...
pull from: luis/paidi_front:projectA
Branches Tags
luis/paidi_front:develop luis/paidi_front:master luis/paidi_front:main luis/paidi_front:Leydi luis/paidi_front:paidiB luis/paidi_front:paidiA luis/paidi_front:project3 luis/paidi_front:project2 luis/paidi_front:project luis/paidi_front:glossary luis/paidi_front:projectA luis/paidi_front:modification luis/paidi_front:tagA luis/paidi_front:images luis/paidi_front:prueba luis/paidi_front:formats luis/paidi_front:documents luis/paidi_front:responsive luis/paidi_front:frame

19 Commits
documents ... projectA

Author SHA1 Message Date
eithan e93db0e3f4 Merge branch 'develop' into projectA 2022-04-29 15:38:56 +00:00
luis 43bd3dcd63 Estructura terminada 2022-04-29 01:22:08 -05:00
luis 782ceb0bb8 responsive images 2022-04-28 17:59:18 -05:00
luis b89f33bdd5 grid container 2022-04-28 14:15:17 -05:00
eithan 6416ebbed2 Merge pull request 'Se agregaron todos los files' (#4) from tagA into develop 
Reviewed-on: #4
 2022-04-28 15:19:56 +00:00
eithan 07a664a3c5 Merge branch 'develop' into tagA 2022-04-28 15:19:50 +00:00
luis 275884300f responsive 2022-04-28 01:31:08 -05:00
luis ae39ad9d1a Se agregaron todos los files 2022-04-27 14:07:00 -05:00
eithan 67d61610b1 Merge pull request 'download files public' (#3) from tagA into develop 
Reviewed-on: #3
 2022-04-27 18:17:10 +00:00
eithan-hernandez 8d218a95fd download files public 2022-04-27 13:14:31 -05:00
eithan-hernandez 711c8070f6 Merge branch 'develop' of https://repositorio.acatlan.unam.mx/luis/paidi_front into develop 2022-04-27 12:57:44 -05:00
eithan 941f4182dc Actualizar 'package.json' 2022-04-27 17:53:48 +00:00
eithan 694a90915e Actualizar 'package.json' 2022-04-27 17:53:46 +00:00
eithan 1790bc850c Actualizar 'package.json' 2022-04-27 17:53:34 +00:00
eithan-hernandez 1b8d538969 Merge branch 'develop' of https://repositorio.acatlan.unam.mx/luis/paidi_front into develop 2022-04-27 12:52:36 -05:00
eithan-hernandez fa3c2fc1b9 commant start 2022-04-27 12:49:10 -05:00
luis 1151bccaaf responsivo 2022-04-27 01:23:08 -05:00
luis f29b163df5 responsive 2022-04-27 01:14:38 -05:00
luis 53ecced8bf l 2022-04-19 02:06:15 -05:00
23 changed files with 10593 additions and 194 deletions
Expand all files Collapse all files
package-lock.json
Generated
+10323 -28
View File
File diff suppressed because it is too large Load Diff
package.json
+1
View File
@@ -3,6 +3,7 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "vue-cli-service serve --port 3156",
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build" "build": "vue-cli-service build"
}, },
public/files/F1_inscripcion_proyecto.docx
BIN
View File
Binary file not shown.
public/files/F2_inscripcion_participantes.docx
BIN
View File
Binary file not shown.
public/files/F3_carta_cesion.docx
BIN
View File
Binary file not shown.
public/files/F4_declaracion_ingresos.docx
BIN
View File
Binary file not shown.
public/files/F5_solicitud_beca.docx
BIN
View File
Binary file not shown.
public/files/F6_carta_justificacion_transferencia.docx
BIN
View File
Binary file not shown.
public/files/F7_Formato_Solicitud_transferencia.docx
BIN
View File
Binary file not shown.
public/files/F8_Entrega_Proyecto_Concluido.docx
BIN
View File
Binary file not shown.
public/files/book.pdf
View File
src/assets/facebook.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

src/assets/logo_fesa.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

src/assets/twitter.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

src/assets/youtube.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

src/components/footer.vue
+79 -2
View File
@@ -9,8 +9,28 @@
<p> <p>
completa y su dirección electrónica. De otra forma, requiere permiso completa y su dirección electrónica. De otra forma, requiere permiso
previo por escrito de la institución. previo por escrito de la institución.
</p> </p>
</div> </div>
<div id="bottom">
<!-- wrapper-bottom -->
<div class="wrapper" style="text-align:right">
<!-- Social -->
<ul class="social ">
<li><a href="https://www.facebook.com/unamacatlan"><img src= "../assets/facebook.png" title="Unete a Facebook" />
</a></li>
<li><a href="https://twitter.com/FES_ACATLAN"><img src= "../assets/twitter.png" title="Sigue nuestros tweets" />
</a></li>
<li><a href="http://www.youtube.com/user/UNAMAcatlan"><img src= "../assets/youtube.png" title="Ve nuestros videos" />
</a></li>
</ul>
<!-- ENDS Social -->
<div id="to-top" class="poshytip" title="Hacia arriba"></div>
</div>
<!-- ENDS wrapper-bottom -->
<br>
</div>
</footer> </footer>
</template> </template>
@@ -19,6 +39,54 @@ export default {};
</script> </script>
<style scoped> <style scoped>
#bottom {
position: relative;
width: 100%;
height: 100%;
font-size: 12px;
line-height: 1.5em;
line-height: 60px;
color: white;
background: #1B3D70;
}
.wrapper {
min-width: 700px;
width: 80%;
margin: 0px auto;
position: relative;
}
.social {
position: absolute;
top: 15px;
right: 0px;
display: block;
overflow: hidden;
}
.social li {
display: block;
width: 32px;
height: 32px;
float: left;
margin-right: 10px;
margin-bottom: 0px;
}
#bottom .social a {
display: block;
width: 32px;
height: 32px;
text-indent: -9000px;
}
#bottom a {
color: #AFEAF9;
text-decoration: none;
}
.boton-footer { .boton-footer {
background-color: rgb(187, 136, 0); background-color: rgb(187, 136, 0);
color: white; color: white;
@@ -34,6 +102,15 @@ export default {};
margin-bottom: 1rem; margin-bottom: 1rem;
} }
#footer {
width: 100%;
height: 200px;
background: #333;
border-top: 2px solid #000;
position: absolute;
bottom: 0;
}
.Azul-puma { .Azul-puma {
background-color: #1e3c70; background-color: #1e3c70;
} }
@@ -64,7 +141,7 @@ export default {};
} }
.footer { .footer {
font-size: 0.7rem; font-size: 0.5rem;
} }
} }
</style> </style>
src/components/header.vue
+70 -47
View File
@@ -1,63 +1,86 @@
<template> <template>
<div class="row divMaster header cl-12 azulUnam">
<div class="wrapper">
<div class="wrapperleft">
<a href="https://www.acatlan.unam.mx/" target="_blank">
<img src="../assets/logo_acatlan.png" class= "img-fluid" alt="logo acatlan" />
</a>
</div>
<div class="wrapperright2">
<a href="https://www.unam.mx/" target="_blank">
<img src="../assets/logo_unam.png" class= "img-fluid" alt="logo unam" />
</a>
</div>
</div>
</div>
<div class="azulUnam">
<div class="row">
<div class="logo_unam col-5 offset-0">
<a href="https://www.unam.mx/" target="_blank">
<img class="sizeImg" src="../assets/logo_unam.png" alt="logo unam" />
</a>
</div>
<div class="logo_acatlan col-5 offset-2">
<a href="https://www.acatlan.unam.mx/" target="_blank">
<img
class="sizeImga"
src="../assets/logo_fesa.png"
alt="logo unam"
/>
</a>
</div>
</div>
<div
class="logo_acatlan_resp col-4 offset-2 d-flex justify-content-center my-2 align-items-center"
>
<a href="https://www.acatlan.unam.mx/" target="_blank">
<img
class="sizeImg"
src="../assets/logo_acatlan.png"
alt="logo unam"
/>
</a>
</div>
</div>
</template> </template>
<script scoped>
export default {};
</script>
<style> <style>
.wrapperright2 {
min-width: 50px;
float: left; .pad{
height: 10px;
width: 48%; padding: 0px;
background-size: 280px, 84px;
background-repeat: no-repeat;
padding: 13px
} }
.wrapperleft {
min-width: 20px;
float: right;
height: 10px;
width: 50%;
background-size: 100px, 69px;
background-repeat: no-repeat;
background-position-x: 50%;
padding: 4px
}
.wrapper {
min-width: 50px;
width: 100%;
margin: 0px auto;
position: relative;
}
.divMaster { .divMaster {
height: 7em; height: 6em;
margin: 0 auto; margin: 0 auto;
} }
.azulUnam { .azulUnam {
background-color: #1e3c70; background-color: #1e3c70;
padding: 15px;
}
.sizeImg {
height: 4.8rem;
margin: auto 0;
} }
.sizeImga {
height: 4.4rem;
}
.logo_acatlan_resp {
display: none !important;
}
@media (max-width: 450px) {
.logo_acatlan,
.logo_unam {
display: none !important;
}
.logo_acatlan_resp {
display: block !important;
}
.logo_acatlan_resp a img {
height: 5rem;
}
}
</style> </style>
src/components/nav.vue
+25 -15
View File
@@ -1,7 +1,9 @@
<template> <template>
<div class="divMaster doradoUnam row d-flex justify-content-center"> <div class="divMaster doradoUnam row d-flex justify-content-center">
<div class="col-10 offset-1"> <div class="col-9 offset-3">
<nav class="navbar navbar-expand-sm navbar-dark "> <nav class="navbar navbar-expand-sm navbar-dark ">
<button <button
@click="method()" @click="method()"
class="navbar-toggler col-5" class="navbar-toggler col-5"
@@ -14,8 +16,12 @@
> >
<span class="navbar-toggler-icon blanco d-flex"></span> <span class="navbar-toggler-icon blanco d-flex"></span>
<!-- <span class="mx-2">Menu</span> --> <!-- <span class="mx-2">Menu</span> -->
</button> </button>
<div class="collapse navbar-collapse " id="navbarTogglerDemo02"> <div class="collapse navbar-collapse " id="navbarTogglerDemo02">
<ul class="navbar-nav mr-auto w-100 d-flex align-items-center justify-content-between mt-0 mt-lg-0"> <ul class="navbar-nav mr-auto w-100 d-flex align-items-center justify-content-between mt-0 mt-lg-0">
<li class="nav-item"> <li class="nav-item">
@@ -42,8 +48,8 @@
</nav> </nav>
</div> </div>
</div>
</div>
</template> </template>
@@ -90,18 +96,20 @@
</script> </script>
<style scoped> <style scoped>
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.divMaster { .divMaster {
/* max-width: 1280px; */
height: auto; height: auto;
margin: 0 auto; margin: 0 auto;
} }
nav { nav {
padding: 0.5rem 0; padding: 1.5rem 0;
} }
.azulUnam { .azulUnam {
@@ -127,14 +135,14 @@ nav {
} }
.nav-link:hover { .nav-link:hover {
background-color: #1e3c70; background: linear-gradient(to right, #1e3c70, #30589e);
color: white; color: white;
border-radius: 0.2rem; border-radius: 3rem;
} }
.nav-link { .nav-link {
transition: 0.3s; transition: 0.4s;
font-size: 20px; font-size: 22px;
} }
.dropdown-item { .dropdown-item {
@@ -176,9 +184,7 @@ nav {
left: -10rem; left: -10rem;
display: block; display: block;
} }
.rescont {
z-index: ;
}
.list-group-item { .list-group-item {
padding: 2px 2px; padding: 2px 2px;
@@ -192,13 +198,17 @@ nav {
} }
@media (max-width: 450px) { @media (max-width: 450px) {
.menuText, .menuText
.buscador { {
display: block !important; display: block !important;
} }
.dropdown-menu { .dropdown-menu {
width: 80vw !important; width: 80vw !important;
} }
.nav-link {
font-size: 10px;
margin-top: 1rem;
}
} }
</style> </style>
src/views/announcement.vue
+3 -7
View File
@@ -3,14 +3,11 @@
<Header></Header> <Header></Header>
<Nav></Nav> <Nav></Nav>
<div class ="box"> <div class ="box">
<nav class="breadcrumb">
</nav>
<div class= "container"> <div class= "container">
<div class= "content is-normal ">
<h6><b>I. </b></h6> <h6><b>I. </b></h6>
@@ -188,7 +185,6 @@
</div> </div>
</div>
</div> </div>
<Footer></Footer> <Footer></Footer>
@@ -252,7 +248,7 @@ table, th, td {
} }
.space { .space {
margin-left: 40px;width: 700px; margin-left: 40px;width: 20px;
} }
src/views/criteria.vue
+8 -10
View File
@@ -2,16 +2,12 @@
<div> <div>
<Header></Header> <Header></Header>
<Nav></Nav> <Nav></Nav>
<div class ="box">
<nav class="breadcrumb">
</nav> <div class ="box">
<div class= "container"> <div class= "container">
<div class= "content is-normal ">
<h6><b>I. </b></h6> <h6><b>I. </b></h6>
@@ -57,7 +53,7 @@
<li>3. </li> <li>3. </li>
<div class="space"> <div class="space">
<ul class="circle"> <ul class="circle">
<li> </li> <li></li>
<li> </li> <li> </li>
<li> </li> <li> </li>
</ul> </ul>
@@ -394,10 +390,9 @@
</tr> </tr>
</tbody></table> </tbody></table>
</div>
</div> </div>
</div>
</div>
<Footer></Footer> <Footer></Footer>
</div> </div>
@@ -459,11 +454,11 @@ table, th, td {
} }
.space { .space {
margin-left: 40px;width: 700px; margin-left: 0px;width: 0px;
} }
.list { .list {
margin-left: 50px;width: 700px; margin-left: 0px;width: 0px;
} }
@@ -513,6 +508,7 @@ h1, h2, h3, h4, h5, h6 {
padding: 1.25rem; padding: 1.25rem;
text-align: justify; text-align: justify;
} }
@@ -531,4 +527,6 @@ text-align: justify;
} }
</style> </style>
src/views/formats.vue
+66 -67
View File
@@ -1,84 +1,82 @@
<template> <template>
<div> <div>
<Header></Header> <Header></Header>
<Nav></Nav> <Nav></Nav>
<div class ="box"> <div class="box">
<nav class="breadcrumb"></nav>
<div class= "container">
<div class= "content is-normal "> <div class="container">
<h6><b> </b></h6>
<p><a href="/files/F1_inscripcion_proyecto.docx" download>F1. Inscripcion de Proyecto</a></p>
<p><a href="/files/F2_inscripcion_participantes.docx" download>F2. Inscripcion de Particiones</a></p>
<p><a href="/files/F3_carta_cesion.docx" download>F3. Carta de Cesión de Derechos</a></p>
<p><a href="/files/F4_declaracion_ingresos.docx" download>F4. Inscripcion de Particiones</a></p>
<p><a href="/files/F5_solicitud_beca.docx" download>F5. Inscripcion de Particiones</a></p>
<p><a href="/files/F6_carta_justificacion_transferencia.docx" download>F6. Carta justificación de transferencia</a></p>
<p><a href="/files/F7_Formato_Solicitud_transferencia.docx" download>F7. Formato Solicitud de transferencia PAIDI</a></p>
<p><a href="/files/F8_Entrega_Proyecto_Concluido.docx" download>F9. Formato de entrega de trabajo concluido</a></p>
<p>
<h6><b> </b></h6> <a href="recursos/2021/F1_inscripcion_proyecto.docx" target="_blank"
>F1. Inscripción de Proyecto</a
<a >
:href="item.url" </p>
v-text="item.label" <p><a href="" target="_blank"></a></p>
@click.prevent="downloadItem(item)"/> <p><a href="" target="_blank"></a></p>
<p><a href="" target="_blank"></a></p>
<p><a href="" target="_blank"></a></p>
<p><a href="recursos/2021/F1_inscripcion_proyecto.docx" target="_blank">F1. Inscripción de Proyecto</a></p> <p><a href="" target="_blank"></a></p>
<p><a href="" target="_blank"></a></p> <p><a href="" target="_blank"></a></p>
<p><a href="" target="_blank"></a></p> </div>
<p><a href="" target="_blank"></a></p> </div>
<p><a href="" target="_blank"></a></p>
<p><a href="" target="_blank"></a></p>
<p><a href="" target="_blank"></a></p>
</div>
</div>
</div>
<Footer></Footer>
</div>
<Footer></Footer>
</div>
</template> </template>
<script> <script>
import Header from "./../components/header.vue";
import Nav from "./../components/nav.vue";
import Header from "../components/header.vue"; import Footer from "./../components/footer.vue";
import Nav from "../components/nav.vue";
import Footer from "../components/footer.vue";
export default { export default {
components: { components: {
Header, Header,
Nav, Nav,
Footer Footer,
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.cent { .cent {
text-align: center; text-align: center;
} }
h6 { h6 {
font-family: Arial, A030, "Nimbus Sans L", FreeSans, "Liberation Sans",
font-family: Arial,A030,"Nimbus Sans L",FreeSans,"Liberation Sans",sans-serif; sans-serif;
width: 95%; width: 95%;
font-size: 130%; font-size: 130%;
line-height: 115%; line-height: 115%;
background-color: #E5EBFD; background-color: #e5ebfd;
background-position: -136px -33px; background-position: -136px -33px;
border-color: #A0B1DE; border-color: #a0b1de;
border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
padding: 8px 0px 8px 34px; padding: 8px 0px 8px 34px;
} }
h1, h2, h3, h4, h5, h6 { h1,
h2,
h3,
h4,
h5,
h6 {
line-height: 1.4em; line-height: 1.4em;
font-family: 'Ubuntu', arial, serif; font-family: "Ubuntu", arial, serif;
font-weight: lighter; font-weight: lighter;
} }
@@ -88,33 +86,34 @@ h1, h2, h3, h4, h5, h6 {
} }
.box { .box {
background: #f1f1f1; background: #f1f1f1;
padding: 1.25rem; padding: 1.25rem;
text-align: justify; text-align: justify;
} }
.container { .container {
width: 950px; width: 950px;
max-width: 100%; max-width: 100%;
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
padding: 1.2em; padding: 1.2em;
} }
p { p {
width: 95%; width: 95%;
text-align: justify; text-align: justify;
} }
a { a {
color: #37b2d1; color: #37b2d1;
} }
.panes .plain-text a { .panes .plain-text a {
text-decoration: none; text-decoration: none;
} }
@media (max-width: 700px) {
.container {
width: 100%;
margin: auto;
}
}
</style> </style>
src/views/glossary.vue
+16 -10
View File
@@ -2,15 +2,15 @@
<div> <div>
<Header></Header> <Header></Header>
<Nav></Nav> <Nav></Nav>
<meta name="viewport" content="initial-scale=1">
<div class ="box"> <div class ="box">
<nav class="breadcrumb">
</nav>
<div class= "container"> <div class= "container">
<div class= "content is-normal ">
<p> </p> <p> </p>
<!-- --> <!-- -->
@@ -59,21 +59,25 @@
<p><strong> </strong></p> <p><strong> </strong></p>
<p><strong> </strong></p> <p><strong> </strong></p>
<p><strong> </strong></p> <p><strong> </strong></p>
<p><strong> </strong></p>
</div> </div>
</div> </div>
</div>
<Footer></Footer> <Footer></Footer>
</div> </div>
</template> </template>
<script> <script>
import Header from "../components/header.vue"; import Header from "./../components/header.vue";
import Nav from "../components/nav.vue"; import Nav from "./../components/nav.vue";
import Footer from "../components/footer.vue"; import Footer from "./../components/footer.vue";
export default { export default {
@@ -90,7 +94,9 @@ export default {
.circle{ .circle{
list-style:disc; list-style:disc;
margin-left: 50px;width: 700px; margin-left: 50px;width: 20px;
} }
ul.space { ul.space {
src/views/home.vue
+2 -8
View File
@@ -6,7 +6,7 @@
<div class= "container"> <div class= "container">
<div class= "content is-normal ">
<br><br><br> <br><br><br>
<div class="paidi"> <div class="paidi">
<img src="../assets/paidi.png" class= "img-fluid"> <img src="../assets/paidi.png" class= "img-fluid">
@@ -15,12 +15,6 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>
</div>
<Footer></Footer> <Footer></Footer>
</div> </div>
@@ -59,7 +53,7 @@ export default {
} }
.box { .box {
background: #f1f1f1; background: #ffffff;
padding: 1.25rem; padding: 1.25rem;
text-align: justify; text-align: justify;