7 Commits

Author SHA1 Message Date
danielGe c0abcda7d3 act 2020-08-05 23:12:36 -05:00
danielGe efadb88b56 actualizado con pruebas 2020-08-05 23:02:37 -05:00
danielGe 55dbe8ab32 principal 2020-08-05 22:55:07 -05:00
danielGe 8ae9294477 correcion de botones 2020-08-05 22:46:59 -05:00
danielGe 62b184430c Merge branch 'headerPrincipal' into pruebas
Actualizacion de logos en el header
2020-08-05 20:54:58 -05:00
danielGe 107cd7c7ee correccion de logos 2020-08-05 20:40:34 -05:00
eithan 660e8fd230 nav sin funcionamiento 2020-08-05 16:07:27 -05:00
9 changed files with 334 additions and 178 deletions
+20 -17
View File
@@ -1,17 +1,20 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
</head> </head>
<body> <body>
<noscript> <noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
</html> <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.1/js/bootstrap.min.js" integrity="sha384-XEerZL0cuoUbHE4nZReLT7nx9gQrQreJekYhJD9WNWhH8nEW+0c5qq7aIo2Wl30J" crossorigin="anonymous"></script>
</body>
</html>
+4 -1
View File
@@ -1,6 +1,7 @@
<template> <template>
<div id="app"> <div id="app">
<Header /> <Header />
<Nav />
<router-view></router-view> <router-view></router-view>
<Footer /> <Footer />
</div> </div>
@@ -9,12 +10,14 @@
<script> <script>
import Header from "./esteticas/header.vue"; import Header from "./esteticas/header.vue";
import Footer from "./esteticas/footer.vue"; import Footer from "./esteticas/footer.vue";
import Nav from "./esteticas/nav.vue";
export default { export default {
name: "App", name: "App",
components: { components: {
Header, Header,
Footer Footer,
Nav
} }
}; };
</script> </script>
Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

+90 -76
View File
@@ -1,76 +1,90 @@
<template> <template>
<div class="divMaster"> <footer class="container-fluid Azul-puma footer py-3 ">
<div class="footer cl-12 azulUnam"> <container>
<div class="row d-flex justify-content-center "> <div row>
<div class=" col-5 col-lg-3 my-3 text-center btn-foo "> <button type="button" class="col-md-6 col-sm-12 btn boton-footer uno">
<a Comité Editorial
href="#" </button>
class="btn rounded-pill doradoUnam text-white btn-sm active" <button type="button" class="col-md-6 col-sm-12 btn boton-footer dos">
role="button" Política Editorial y Lineamentos
aria-pressed="true" </button>
>Comite Editorial</a <button type="button" class="col-md-6 col-sm-12 btn boton-footer tres">
> Proceso Editorial y Organismos
</div> </button>
<div class=" col-5 col-lg-3 my-3 text-center btn-foo "> <button
<a type="button"
href="#" class="col-md-6 col-sm-12 btn boton-footer cuatro"
class="btn rounded-pill doradoUnam text-white btn-sm active" >
role="button" Puntos de Venta
aria-pressed="true" </button>
>Politica Editorial y Lineamietos</a </div>
> </container>
</div> <div row>
<div class=" col-5 col-lg-3 my-3 text-center btn-foo "> <p class="mb-0 ">Hecho en México, todos los derechos reservados 2020.</p>
<a <p class="my-0 ">
href="#" Esta página puede ser reproducida con fines no lucrativos, siempre y
class="btn rounded-pill doradoUnam text-white btn-sm active" cuando no se mutile, se cite la fuente
role="button" </p>
aria-pressed="true" <p>
>Libreria</a completa y su dirección electrónica. De otra forma, requiere permiso
> previo por escrito de la institución.
</div> </p>
<div class=" col-5 col-lg-3 my-3 text-center btn-foo "> </div>
<a </footer>
href="#" </template>
class="btn rounded-pill doradoUnam text-white btn-sm active"
role="button" <script>
aria-pressed="true" export default {};
>contactanos</a </script>
>
</div> <style scoped>
</div> .boton-footer {
<div class="row"> background-color: rgb(187, 136, 0);
<p class="text-white px-3"> color: white;
Hecho en México, todos los derechos reservados 2020. Esta página puede width: 14rem;
ser reproducida con fines no lucrativos, siempre y cuando no se font-size: 0.8rem;
mutile, se cite la fuente completa y su dirección electrónica. De otra }
forma, requiere permiso previo por escrito de la institución .uno,
</p> .dos,
</div> .tres {
</div> margin-right: 1rem;
</div> }
</template> .btn {
margin-bottom: 1rem;
<style scoped> }
* {
margin: 0; .Azul-puma {
padding: 0; background-color: #1e3c70;
} }
.divMaster { .footer {
max-width: 1280px; text-align: center;
height: auto; color: white;
margin: 0 auto; }
}
@media (max-width: 768px) {
.azulUnam { .uno,
background-color: #1e3c70; .tres {
} margin-right: 4rem;
.doradoUnam { }
background-color: #bb8800; .dos {
} margin-right: 0rem;
}
/* .footer{ .footer {
height: 100px; font-size: 0.7rem;
} */ }
</style> }
@media (max-width: 970px) {
.uno,
.dos,
.tres {
margin-right: 0.5rem;
}
.footer {
font-size: 0.7rem;
}
}
</style>
>>>>>>> pruebas
+64 -84
View File
@@ -1,84 +1,64 @@
<template> <template>
<div class="divMaster"> <container>
<div class="header cl-12 azulUnam"> <div class="row divMaster header cl-12 azulUnam">
<div class="row"> <div
<div class="logo_unam col-4 offset-1 d-inline-flex my-2 align-items-center"
class="logo_unam col-4 offset-1 d-inline-flex my-2 align-items-center" >
> <a href="https://www.unam.mx/" target="_blank">
<a href="https://www.unam.mx/" target="_blank"> <img class="sizeImg" src="../assets/Logo-UNAM.png" alt="logo unam" />
<img </a>
class="sizeImg" </div>
src="https://www.c3.unam.mx/image/logoUnam.png"
alt="logo unam" <div
/> class="logo_acatlan col-4 offset-2 d-inline-flex justify-content-end my-2 align-items-center"
</a> >
</div> <a href="https://www.acatlan.unam.mx/" target="_blank">
<img
<div class="sizeImg"
class="logo_acatlan col-4 offset-2 d-inline-flex justify-content-end my-2 align-items-center" src="../assets/FES-editoriales.png"
> alt="logo unam"
<a href="https://www.acatlan.unam.mx/" target="_blank"> />
<img </a>
class="sizeImg" </div>
src="https://flisol.acatlan.unam.mx/img/logo-acatlan.png"
alt="logo unam" <div
/> class="logo_acatlan_resp col-8 offset-2 d-flex justify-content-center my-2 align-items-center"
</a> >
</div> <a href="https://www.acatlan.unam.mx/" target="_blank">
<img
<div class="sizeImg"
class="logo_acatlan_resp col-8 offset-2 d-flex justify-content-center my-2 align-items-center" src="../assets/FES-editoriales.png"
> alt="logo unam"
<a href="https://www.acatlan.unam.mx/" target="_blank"> />
<img </a>
class="sizeImg" </div>
src="../assets/FESAcatlan.png" </div>
alt="logo unam" </container>
/> </template>
</a>
</div> <style >
</div> .divMaster {
</div>
</div> height: 7em;
</template> /* max-width: 1280px; */
height: 7em;
<style scoped> color: #1e3c70;
* { }
margin: 0; .sizeImg {
padding: 0; height: 5rem;
} }
.logo_acatlan_resp {
.divMaster { display: none !important;
max-width: 1280px; }
height: auto;
margin: 0 auto; @media (max-width: 450px) {
} .logo_acatlan,
.logo_unam {
.azulUnam { display: none !important;
background-color: #1e3c70; }
} .logo_acatlan_resp {
display: block !important;
/* .header{ }
height: 100px; .logo_acatlan_resp a img {
} */ height: 5rem;
e>
.sizeImg {
height: 5rem;
}
.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: 3rem;
}
}
</style>
+156
View File
@@ -0,0 +1,156 @@
<template>
<div class="divMaster doradoUnam row">
<div class="col-10 offset-1">
<nav class="navbar navbar-expand-sm navbar-light ">
<button
class="navbar-toggler"
type="button"
data-toggle="collapse"
data-target="#navbarTogglerDemo02"
aria-controls="navbarTogglerDemo02"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span class="navbar-toggler-icon blanco"></span>
</button>
<div class="collapse navbar-collapse" id="navbarTogglerDemo02">
<ul class="navbar-nav mr-auto mt-0 mt-lg-0">
<li class="nav-item">
<a class="nav-link text-white" href="#">Inicio</a>
</li>
<li class="nav-item">
<a class="nav-link text-white" href="#">Presentacion</a>
</li>
<li class="nav-item ">
<a
class="nav-link dropdown-toggle text-white "
id="navbarDropdown"
role="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
href="#"
>Libros</a
>
<div
class="dropdown-menu azulUnam"
aria-labelledby="navbarDropdown"
>
<a class="dropdown-item text-white" href="#"
>Ciencias Socioeconomicas</a
>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-white" href="#"
>Diseño y Edificacion</a
>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-white" href="#"
>Enseñanza de Idiomas</a
>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-white" href="#"
>Estudios de Posgrado</a
>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-white" href="#">Humanidades</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-white" href="#"
>Matematicas e Ingenieria</a
>
</div>
</li>
<li class="nav-item">
<a class="nav-link text-white" href="#">Difusion Editorial</a>
</li>
</ul>
<form class="form-inline my-0 my-lg-0">
<div class="input-group input-group-sm mb-0">
<input
type="text"
class="form-control reIzq "
placeholder="Buscar"
aria-label="Recipient's username"
aria-describedby="basic-addon2"
/>
<div class="input-group-append reDer bg-white">
<button class="btn my-0" type="submit">
<svg
width="1em"
height="1em"
viewBox="0 0 16 16"
class="bi bi-search"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill-rule="evenodd"
d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"
/>
<path
fill-rule="evenodd"
d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"
/>
</svg>
</button>
</div>
</div>
</form>
</div>
</nav>
</div>
</div>
</template>
<style scoped>
* {
margin: 0;
padding: 0;
}
.divMaster {
/* max-width: 1280px; */
height: auto;
margin: 0 auto;
}
nav {
padding: 0.5rem 0;
}
.azulUnam {
background-color: #1e3c70;
}
.doradoUnam {
background-color: #bb8800;
}
.blanco {
color: white !important;
}
.dropdown-item:hover {
background-color: #bb8800;
}
.nav-link:focus {
background-color: #1e3c70;
}
.menuText {
display: none;
}
.reDer {
border-top-right-radius: 20px 20px !important;
border-bottom-right-radius: 20px 20px !important;
}
.reIzq {
border-top-left-radius: 20px 20px !important;
border-bottom-left-radius: 20px 20px !important;
}
@media (max-width: 450px) {
.menuText {
display: block;
}
}
</style>