Merge branch 'develop' into projectA

Reviewed-on: #4

src/components/footer.vue

@@ -9,8 +9,28 @@
       <p>
         completa y su dirección electrónica. De otra forma, requiere permiso
         previo por escrito de la institución.
-      </p>
+      </p>     
     </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>
 </template>
 
@@ -19,6 +39,54 @@ export default {};
 </script>
 
 <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 {
   background-color: rgb(187, 136, 0);
   color: white;
@@ -73,7 +141,7 @@ export default {};
   }
 
   .footer {
-    font-size: 0.7rem;
+    font-size: 0.5rem;
   }
 }
 </style>

src/components/header.vue

@@ -1,30 +1,30 @@
 <template>
-  <div class="row  azulUnam">
+  
-    <div class= "pad">
+  <div class="azulUnam">
-    <div
+  <div class="row">
-      class="logo_unam  col-3 d-inline-flex my-3 align-items-left"
+    
-    >
+    
+
+    <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>
 
-
+    <div class="logo_acatlan col-5 offset-2">
-
-    <div class="logo_acatlan  col-1   offset-3   my-4  ">
       <a href="https://www.acatlan.unam.mx/" target="_blank">
-        <div id="imagenbanner">
+        
         <img
           class="sizeImga"
           src="../assets/logo_fesa.png"
           alt="logo unam"
         />
-        </div>
+       
       </a>
-    </div>
+     </div>
+      </div>
+
 
 
     <div
@@ -43,13 +43,6 @@
 
 <style>
 
-#imagenbanner{
-	position: absolute;
-	top: 8px;
-	left: 160px;
-	width: 100px;
-	line-height: 17px;
-}
 
 .pad{
      
@@ -63,13 +56,15 @@
 
 .azulUnam {
   background-color: #1e3c70;
+  padding: 15px;
 }
 .sizeImg {
-  height: 4.5rem;
+  height: 4.8rem;
+   margin: auto 0;
 }
 
 .sizeImga {
-  height: 3.3rem;
+  height: 4.4rem;
  
 }
 .logo_acatlan_resp {

src/components/nav.vue

@@ -1,6 +1,6 @@
 <template>
  <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  ">
        
         
@@ -109,7 +109,7 @@
   margin: 0 auto;
 }
 nav {
-  padding: 1.2rem 0;
+  padding: 1.5rem 0;
 }
 
 .azulUnam {
@@ -135,7 +135,7 @@ nav {
 }
 
 .nav-link:hover {
-  background-color: #1e3c70;
+  background:  linear-gradient(to right, #1e3c70, #30589e);
   color: white;
   border-radius: 3rem;
 }