From 7916eff572bae06aeb2385ae64f2932006b0e564 Mon Sep 17 00:00:00 2001 From: ivancho2802 Date: Tue, 27 Jan 2015 18:38:22 -0430 Subject: [PATCH 1/3] Inicio modifique el autor de esta pagina --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 4db3fa1..9cf3f55 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,6 @@ From f6762aacac75d2a3dca0614e24abd4e04bf8243a Mon Sep 17 00:00:00 2001 From: ivancho2802 Date: Mon, 16 Feb 2015 20:28:35 -0430 Subject: [PATCH 2/3] edite el archivo style.css index.html edite el archivo style.css para aplicar efector hover y de transicion y el index.html para adaptar el heder para hacerlo mas comodo en h1 id logo use un efecto de transicion para el efecto hover sea lento en su respectivo hover tambien en todo el nav apllique hovers y transicion para aderir colores... --- css/style.css | 128 +++++++++++++++++++++++- images/logo_header.png | Bin 0 -> 22540 bytes index.html | 214 ++++++++++++++++++++++++++++++++--------- 3 files changed, 294 insertions(+), 48 deletions(-) create mode 100644 images/logo_header.png diff --git a/css/style.css b/css/style.css index fe6a2c4..1afdb4d 100644 --- a/css/style.css +++ b/css/style.css @@ -782,7 +782,32 @@ height: 100%; background: rgba(64,64,64,0.125); } + +/*********************************************************************************/ +/* Circular imagenes del equipo */ +/*********************************************************************************/ +.circular img { + + border: 2px solid grey; + margin: 0; + padding: 0; + border-radius: 800px; + overflow: hidden; + width: 35%; + height: 25%; +} + +<<<<<<< HEAD +======= +.circular img:hover{ + -webkit-transform: scale(1.5); + -moz-transform: scale(1.5); + -o-transform: scale(1.5); + -ms-transform: scale(1.5); + transform: scale(1.5) +} +>>>>>>> origin/master /*********************************************************************************/ /* Logo */ /*********************************************************************************/ @@ -791,11 +816,15 @@ { position: relative; z-index: 1; + } #logo h1 { color: #FFF; + -webkit-transition: background 2s; + opacity:0.5; + } #logo a @@ -814,14 +843,21 @@ { font-size: 1.4em; color: #FFF; + } + #logo h1:hover + { + opacity:1; + } + /*********************************************************************************/ /* Nav */ /*********************************************************************************/ #nav { + -webkit-transition: background 0.5s; } #nav-wrapper @@ -845,7 +881,10 @@ display: inline-block; border-right: 1px solid; border-color: rgba(255,255,255,.1); + opacity: .5; + -webkit-transition: background 2s; } + #nav > ul > li:last-child { @@ -875,6 +914,42 @@ { display: none; } + #nav:hover + { + background: rgba(0,0,0,.2); + } + + #nav ul li:hover + { + + opacity:1; + } + + #nav ul li#inicio:hover + { + border-bottom: 4px solid rgba(70,300,80,.5);/*Verde transparente*/ + background: rgba(70,300,80,.5); + } + #nav ul li#portafolio:hover + { + border-bottom: 4px solid rgba(300,50,50,.5);/*Rojo transparente*/ + background: rgba(300,50,50,.5); + } + #nav ul li#equipo:hover + { + border-bottom:4px solid rgba(233,300,26,.5);/*Amarillo transparente*/ + background: rgba(233,300,26,.5); + } + #nav ul li#blog:hover + { + border-bottom:4px solid rgba(0,0,0,.5);/*Negro transparente*/ + background: rgba(0,0,0,.5); + } + #nav ul li#contacto:hover + { + border-bottom:4px solid rgba(22,145,190,.5);/*Azul transparente*/ + background: rgba(22,145,190,.5); + } /*********************************************************************************/ /* Main */ @@ -885,12 +960,22 @@ position: relative; background: #fff; } - + #main h2{ + display: block; + font-weight: 300; + font-size: 3.0em; + padding: 1em; + } .homepage #content { text-align: center; } + .homepage #team + { + text-align: center; + } + .homepage #content header h2 { } @@ -947,6 +1032,45 @@ } /*********************************************************************************/ +/* Team */ +/*********************************************************************************/ + + #team + { + position: relative; + background: #f2f2f2; + text-align: center; + } + + #team p { + + text-align: justify; + margin: 20px; + } + #team h2 + { + display: block; + font-weight: 300; + font-size: 3.0em; + padding: 1em; + } + #team h3 + { + display: block; + font-size: 1.0em; + padding: 1em; + } + + #team .pennant + { + font-size: 4em; + } + + #team .button + { + margin-top: 1.5em; + } +/*********************************************************************************/ /* Featured */ /*********************************************************************************/ @@ -1011,4 +1135,4 @@ margin: 0; font-weight: 300; color: rgba(255,255,255,.6); - } \ No newline at end of file + } diff --git a/images/logo_header.png b/images/logo_header.png new file mode 100644 index 0000000000000000000000000000000000000000..a1e64fbb5fcdcb7ba532551c93ec56775f9d58db GIT binary patch literal 22540 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 literal 0 HcmV?d00001 diff --git a/index.html b/index.html index 9cf3f55..c4cf74a 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,6 @@ - + @@ -8,6 +8,7 @@ + @@ -27,20 +28,32 @@
- +
@@ -48,29 +61,37 @@

Guareber Tech

+ + +
-
“In posuere eleifend odio. Quisque semper augue mattis wisi. Maecenas ligula. Pellentesque viverra vulputate enim. Aliquam erat volutpat.”
+
La innovación distingue a los líderes de los seguidores. Steven Jobs. ”
@@ -153,4 +275,4 @@

Get in touch

- \ No newline at end of file + From de56c170895ec5d39075171def41e5787f3a4f05 Mon Sep 17 00:00:00 2001 From: ivancho2802 Date: Mon, 16 Feb 2015 21:51:42 -0430 Subject: [PATCH 3/3] =?UTF-8?q?Me=20equivoque=20pues=20sub=C3=AD=20los=20a?= =?UTF-8?q?rchivos=20de=20forma=20incorrecta=20y=20de=20duplicaron=20las?= =?UTF-8?q?=20lineas=20las=20viejas=20y=20las=20nuevas=20aparecen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lo que hice fue editar y borrar las viejas --- index.html | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index c4cf74a..cbf7938 100644 --- a/index.html +++ b/index.html @@ -35,11 +35,7 @@
  • Blog
  • Contacto
    • ======= -
  • Inicio
    • -
  • Portafolio
    • -
  • Equipo
    • -
  • Blog
    • -
  • Contacto
    • + >>>>>>> origin/master @@ -51,8 +47,6 @@ <<<<<<< HEAD

    ======= -

    - >>>>>>> origin/master @@ -72,8 +66,7 @@

    Guareber Tech

    -

    La Fundacion Guareber Tech, Es una organizacion sin fines de lucro con el objetivo principal de crear soluciones tecnologicas que generen un impacto positivo en nuestra sociedad. Es por ello, utilizamos nuestras habilidades en las diferentes tecnologicas para crear contenido que faciliten las tareas cotidianas a nuestros clientes. Sabiendo el gran potencial que existe en nuestra organizacion; sobre las diferentes tecnologias, contamos con un talento humano de jovenes emprendedores capacitados para enfrentar cualquier reto. Nuestras tecnologias estan basadas para la adaptacion de las solicitudes de nuestros clientes y de esta manera crear software de calidad.

    -
    +

    La Fundacion Guareber Tech, Es una organizacion sin fines de lucro con el objetivo principal de crear soluciones tecnologicas que generen un impacto positivo en nuestra sociedad. Es por ello, utilizamos nuestras habilidades en las diferentes tecnologicas para crear contenido que faciliten las tareas cotidianas a nuestros clientes. Sabiendo el gran potencial que existe en nuestra organizacion; sobre las diferentes tecnologias, contamos con un talento humano de jovenes emprendedores capacitados para enfrentar cualquier reto. Nuestras tecnologias estan basadas para la adaptacion de las solicitudes de nuestros clientes y de esta manera crear software de calidad.