diff --git a/addons/website_blog/static/src/css/website_blog.css b/addons/website_blog/static/src/css/website_blog.css index ed0d40f4558..b00111201db 100644 --- a/addons/website_blog/static/src/css/website_blog.css +++ b/addons/website_blog/static/src/css/website_blog.css @@ -29,45 +29,25 @@ p.post-meta { background-position: center; background-repeat: no-repeat; background-color: black; - opacity: 0.8; -} - -.cover_header { color: white; + position: relative; } -.cover_header .blog_title { - padding-top: 10%; +.cover .blog_title { + position: absolute; + text-align: center; + top: 10%; + left: 0; + right: 0; } -.cover_header h1 { +.cover .blog_title h1 { font-weight: bold; } -.cover_header h2.text-muted { - color: white; -} .cover_footer { - color: white; - background-color: grey; min-height: 200px; height: 50vh; - padding-top: 5vh; cursor: pointer; } -.cover_footer h1 { - font-weight: bold; -} - -.easing_upward { - -webkit-transform: translate3d(0, -20%, 0); - -moz-transform: translate3d(0, -20%, 0); - -ms-transform: translate3d(0, -20%, 0); - -o-transform: translate3d(0, -20%, 0); - transform: translate3d(0, -20%, 0); - -webkit-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1); - -moz-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1); - -o-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1); - transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1); -} /*Inline Discussion */ .discussion { diff --git a/addons/website_blog/static/src/css/website_blog.sass b/addons/website_blog/static/src/css/website_blog.sass index 60ead30ce68..1e293158bbe 100644 --- a/addons/website_blog/static/src/css/website_blog.sass +++ b/addons/website_blog/static/src/css/website_blog.sass @@ -27,37 +27,21 @@ p.post-meta background-position: center background-repeat: no-repeat background-color: #000 - opacity : 0.8 - -.cover_header - color: white + color: #fff + position: relative .blog_title - padding-top : 10% - h1 - font-weight: bold - h2.text-muted - color: white + position: absolute + text-align: center + top: 10% + left: 0 + right: 0 + h1 + font-weight: bold .cover_footer - color: white - background-color: grey min-height : 200px height: 50vh - padding-top: 5vh cursor: pointer - h1 - font-weight: bold - -.easing_upward - -webkit-transform: translate3d(0, -20%, 0) - -moz-transform: translate3d(0, -20%, 0) - -ms-transform: translate3d(0, -20%, 0) - -o-transform: translate3d(0, -20%, 0) - transform: translate3d(0, -20%, 0) - -webkit-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1) - -moz-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1) - -o-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1) - transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1) /*Inline Discussion diff --git a/addons/website_blog/static/src/img/post1.jpg b/addons/website_blog/static/src/img/post1.jpg index eebccd036e1..f3e3aa852a6 100644 Binary files a/addons/website_blog/static/src/img/post1.jpg and b/addons/website_blog/static/src/img/post1.jpg differ diff --git a/addons/website_blog/static/src/img/post2.jpg b/addons/website_blog/static/src/img/post2.jpg index de06b295c31..8f6002a40db 100644 Binary files a/addons/website_blog/static/src/img/post2.jpg and b/addons/website_blog/static/src/img/post2.jpg differ diff --git a/addons/website_blog/static/src/img/post3.jpg b/addons/website_blog/static/src/img/post3.jpg index 58d02a8d02e..0123f640dab 100644 Binary files a/addons/website_blog/static/src/img/post3.jpg and b/addons/website_blog/static/src/img/post3.jpg differ diff --git a/addons/website_blog/static/src/js/website_blog.js b/addons/website_blog/static/src/js/website_blog.js index ad4a675f8c5..8b48cde8167 100644 --- a/addons/website_blog/static/src/js/website_blog.js +++ b/addons/website_blog/static/src/js/website_blog.js @@ -6,10 +6,10 @@ $(document).ready(function() { var top = $('.cover_footer').offset().top; $('.cover_footer').animate({ height: $(window).height()+'px' - }, 500); + }, 300); $('html, body').animate({ scrollTop: top - }, 500, 'swing', function() { + }, 300, 'swing', function() { window.location.href = newLocation; }); } @@ -17,9 +17,9 @@ $(document).ready(function() { function animate() { var target = $(this.hash); $('html, body').stop().animate({ - 'scrollTop': target.offset().top - }, 900, 'swing', function () { - window.location.hash = target; + 'scrollTop': target.offset().top - 32 + }, 500, 'swing', function () { + window.location.hash = 'blog_content'; }); return false; } @@ -30,7 +30,7 @@ $(document).ready(function() { new openerp.website.blog_discussion({'content' : content}); } - $('.cover_header').css('min-height', $(window).height()); + $('.js_header').css('min-height', $(window).height()); $("js_tweet").find("h1, h2, h3, h4, li, p").share({'author_name':$('#blog_author').text()}); $('.cover_footer').on('click',page_transist); $('a[href^="#blog_content"]').on('click', animate); diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 6991fe70df6..8c06623e13e 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -155,7 +155,7 @@