Skip to content

Commit

Permalink
update values
Browse files Browse the repository at this point in the history
  • Loading branch information
@francescjimenez
francescjimenez committed May 28, 2017
1 parent c46ae69 commit 61423bd
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 34 deletions.
52 changes: 34 additions & 18 deletions .idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified image/masterasp.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/masterasp2.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 16 additions & 16 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ <h3 class="media-heading">Adaptable a otros dispositivos</h3>

<div class="col-lg-6 col-sm-8 col-md-8 col-md-offset-2 col-sm-offset-2 col-lg-offset-0 showcase-carousel hidden-xs scrollpoint sp-effect2">
<img src="image/imac.png" class="img-responsive" alt="">

<div id="carousel-reference" class="carousel slide" data-ride="carousel">
<!-- Wrapper for slides -->
<div class="carousel-inner">
Expand Down Expand Up @@ -439,7 +439,7 @@ <h3>Menu Sharing</h3>
<section id="blog" class="content-first">
<div class="container">
<h2 class="scrollpoint sp-effect3">Latest Blog Posts</h2>
<p class="scrollpoint sp-effect3">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce in turpis quam. Nulla quis eleifend lectus.</p>
<p class="scrollpoint sp-effect3">When I was learning programming, I create a blog about programming <a href="http://www.desenweb.es" target="_blank">Desenweb</a></p>
</div>

<div class="line hidden-xs">
Expand All @@ -458,13 +458,13 @@ <h2 class="scrollpoint sp-effect3">Latest Blog Posts</h2>
<div class="col-sm-4 scrollpoint sp-effect1">
<div class="blog-post">
<div class="blog-body">
<h3>Lorem Ipsum</h3>
<p>At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum. At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum</p>
<a href="" class="btn btn-primary">Read More</a>
<h3>Filtros CSS: escala de grises</h3>
<p>El efecto de escala de grises nos puede dar un efecto atractivo en los “hover” de nuestras imágenes. O al revés, mostrar siempre la imagen en escala de grises y mostrar los colores al hover...</p>
<a href="http://desenweb.es/css-escala-grises/" target="_blank" class="btn btn-primary">Read More</a>
</div>
<div class="blog-info">
<a><i class="fa fa-comment"></i> 352</a>
<a><i class="fa fa-calendar"></i> 21/03/2014</a>
<a><i class="fa fa-comment"></i> 12</a>
<a><i class="fa fa-calendar"></i> 06/09/2014</a>
<a href="#"><i class="fa fa-facebook"></i></a>
<a href="#"><i class="fa fa-twitter"></i></a>
</div>
Expand All @@ -476,9 +476,9 @@ <h3>Lorem Ipsum</h3>
<div class="col-sm-4 scrollpoint sp-effect3">
<div class="blog-post">
<div class="blog-body">
<h3>Lorem Ipsum</h3>
<p>At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum. At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum</p>
<a href="" class="btn btn-primary">Read More</a>
<h3>Organización en AngularJS</h3>
<p>El código en AngularJS está organizado en modelos, vistas y controladores. Para llegar a esta organización podríamos decir que tenemos 4 funcionalidades en JavaScript que nos ayudan a conseguir esta organización...</p>
<a href="http://desenweb.es/organizacion-angularjs/" target="_blank" class="btn btn-primary">Read More</a>
</div>
<div class="blog-info">
<a><i class="fa fa-comment"></i> 352</a>
Expand All @@ -494,13 +494,13 @@ <h3>Lorem Ipsum</h3>
<div class="col-sm-4 scrollpoint sp-effect2">
<div class="blog-post">
<div class="blog-body">
<h3>Lorem Ipsum</h3>
<p>At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum. At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum</p>
<h3>Herramientas para que el cliente revise los diseños</h3>
<p>La tarea de compartir el diseño con el cliente suele ser a menudo complicada de gestionar. A veces te intercambias 100 mails y la página que estais opinando es totalmente distinta o una se refiere al menú X y el otro al menú Y...</p>
<a href="" class="btn btn-primary">Read More</a>
</div>
<div class="blog-info">
<a><i class="fa fa-comment"></i> 352</a>
<a><i class="fa fa-calendar"></i> 21/03/2014</a>
<a><i class="fa fa-comment"></i> 11</a>
<a><i class="fa fa-calendar"></i> 31/09/2014</a>
<a href="#"><i class="fa fa-facebook"></i></a>
<a href="#"><i class="fa fa-twitter"></i></a>
</div>
Expand All @@ -515,7 +515,7 @@ <h3>Lorem Ipsum</h3>
<section id="testimonials" class="content-first">
<div class="container">
<h2 class="scrollpoint sp-effect3 text-center">Testimonials</h2>
<p class="scrollpoint sp-effect3 text-center">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce in turpis quam. Nulla quis eleifend lectus.</p>
<p class="scrollpoint sp-effect3 text-center">Durante estos más de 10 años en el sector terminas teniendo más que relaciones laborales</p>
<div class="row">

<!-- TESTIMONIAL 1 - START -->
Expand Down Expand Up @@ -585,7 +585,7 @@ <h3 class="hidden-xs">Leave a message</h3>
<textarea class="form-control" placeholder="Message" id="message"></textarea>
</div>

<button class="btn btn-primary">Send message</button>
<button class="btn btn-primary" onclick="sendMail()" >Send message</button>

</fieldset>
</form>
Expand Down
6 changes: 6 additions & 0 deletions js/custom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,10 @@ $(document).ready(function() {

$('.macbook-inner').waypoint(function(){$(this).toggleClass('active');$(this).toggleClass('black');},{offset:'60%'});
}

function sendMail(){
alert('HOLA! K TAL?');
// window.open('mailto:[email protected]?subject=subject&body=body');
}

});

0 comments on commit 61423bd

Please sign in to comment.