diff --git a/website/source/javascripts/app/deploy/site.js b/website/source/javascripts/app/deploy/site.js index 50f04f090e..79a6dd002e 100644 --- a/website/source/javascripts/app/deploy/site.js +++ b/website/source/javascripts/app/deploy/site.js @@ -66,8 +66,7 @@ var APP = APP || {}; //cache elements this.ui = { $doc: $(window), - $hero: $('#jumbotron'), - $pagination: null + $hero: $('#jumbotron') } this.addEventListeners(); @@ -87,7 +86,6 @@ var APP = APP || {}; _this.ui.$hero.css('webkitTransform', 'translate(0, '+ speedAdj +'px)'); _this.ui.$hero.find('.container').css('webkitTransform', 'translate(0, '+ speedAdjOffset +'px)'); - //_this.ui.$pagination.css('webkitTransform', 'translate(0, '+ speedAdjOffset +'px)'); }) } } diff --git a/website/source/javascripts/app/deploy/site.min.js b/website/source/javascripts/app/deploy/site.min.js index 96bf618e6a..17bca6be4c 100644 --- a/website/source/javascripts/app/deploy/site.min.js +++ b/website/source/javascripts/app/deploy/site.min.js @@ -1 +1 @@ -var APP=function(){function a(){APP.Utils.runIfClassNamePresent("page-home",b)}function b(){APP.Homepage.init()}return{initialize:a}}(),APP=APP||{};APP.Utils=function(){return{isMobile:function(){return navigator.userAgent.match(/Android/i)||navigator.userAgent.match(/webOS/i)||navigator.userAgent.match(/iPhone/i)||navigator.userAgent.match(/iPod/i)||navigator.userAgent.match(/BlackBerry/i)||navigator.userAgent.match(/Windows Phone/i)?!0:!1}(),runIfClassNamePresent:function(a,b){var c=document.getElementsByClassName(a);c.length>0&&b()}}}();var APP=APP||{};!function(){APP.Homepage=function(){return{ui:null,init:function(){this.ui={$doc:$(window),$hero:$("#jumbotron"),$pagination:null},this.addEventListeners()},addEventListeners:function(){var a=this;APP.Utils.isMobile||a.ui.$doc.scroll(function(){var b=a.ui.$doc.scrollTop(),c=.8*b,d=c-b;a.ui.$hero.css("webkitTransform","translate(0, "+c+"px)"),a.ui.$hero.find(".container").css("webkitTransform","translate(0, "+d+"px)")})}}}()}(jQuery,this); \ No newline at end of file +var APP=function(){function a(){APP.Utils.runIfClassNamePresent("page-home",b)}function b(){APP.Homepage.init()}return{initialize:a}}(),APP=APP||{};APP.Utils=function(){return{isMobile:function(){return navigator.userAgent.match(/Android/i)||navigator.userAgent.match(/webOS/i)||navigator.userAgent.match(/iPhone/i)||navigator.userAgent.match(/iPod/i)||navigator.userAgent.match(/BlackBerry/i)||navigator.userAgent.match(/Windows Phone/i)?!0:!1}(),runIfClassNamePresent:function(a,b){var c=document.getElementsByClassName(a);c.length>0&&b()}}}();var APP=APP||{};!function(){APP.Homepage=function(){return{ui:null,init:function(){this.ui={$doc:$(window),$hero:$("#jumbotron")},this.addEventListeners()},addEventListeners:function(){var a=this;APP.Utils.isMobile||a.ui.$doc.scroll(function(){var b=a.ui.$doc.scrollTop(),c=.8*b,d=c-b;a.ui.$hero.css("webkitTransform","translate(0, "+c+"px)"),a.ui.$hero.find(".container").css("webkitTransform","translate(0, "+d+"px)")})}}}()}(jQuery,this); \ No newline at end of file diff --git a/website/source/javascripts/app/homepage.js b/website/source/javascripts/app/homepage.js index ff66839479..d51e369eec 100644 --- a/website/source/javascripts/app/homepage.js +++ b/website/source/javascripts/app/homepage.js @@ -14,8 +14,7 @@ var APP = APP || {}; //cache elements this.ui = { $doc: $(window), - $hero: $('#jumbotron'), - $pagination: null + $hero: $('#jumbotron') } this.addEventListeners(); @@ -35,7 +34,6 @@ var APP = APP || {}; _this.ui.$hero.css('webkitTransform', 'translate(0, '+ speedAdj +'px)'); _this.ui.$hero.find('.container').css('webkitTransform', 'translate(0, '+ speedAdjOffset +'px)'); - //_this.ui.$pagination.css('webkitTransform', 'translate(0, '+ speedAdjOffset +'px)'); }) } } diff --git a/website/source/stylesheets/_docs.less b/website/source/stylesheets/_docs.less index 25f19974f7..a6bad2fb2f 100755 --- a/website/source/stylesheets/_docs.less +++ b/website/source/stylesheets/_docs.less @@ -8,8 +8,23 @@ body.layout-intro{ >.container{ .col-md-8[role=main]{ - min-height: 600px; + min-height: 800px; background-color: white; + + &::before { + content: ""; + position: absolute; + top: 0; + bottom: 0; + left: -9999px; + right: 0; + box-shadow: 9999px 0 0 white; + } + + >div{ + position: relative; + z-index: 10; + } } } } diff --git a/website/source/stylesheets/_home.less b/website/source/stylesheets/_home.less index 20f40e8400..5576819de0 100755 --- a/website/source/stylesheets/_home.less +++ b/website/source/stylesheets/_home.less @@ -1,6 +1,9 @@ // // Home // -------------------------------------------------- +body.page-home{ + background-color: #f8f8f8; +} #features{ .anti-alias(); diff --git a/website/source/stylesheets/_jumbotron.less b/website/source/stylesheets/_jumbotron.less index e5a72469ea..ceea6a9cab 100755 --- a/website/source/stylesheets/_jumbotron.less +++ b/website/source/stylesheets/_jumbotron.less @@ -4,8 +4,9 @@ #jumbotron-mask{ overflow: hidden; + width: 100%; height: @jumbotron-total-height; - margin-top: -92px; + margin-top: @negative-hero-margin; } #jumbotron { @@ -13,7 +14,7 @@ height: @jumbotron-total-height; padding-top: 0; padding-bottom: 0; - margin-top: -92px; + margin-top: @negative-hero-margin; color: @jumbotron-color; .consul-gradient-bg(); @@ -30,7 +31,7 @@ left: 0; height: 632px; width: 100%; - margin-top: -92px; + margin-top: @negative-hero-margin; background: transparent url('../images/hero-dots.png') center @header-height no-repeat; } diff --git a/website/source/stylesheets/_variables.less b/website/source/stylesheets/_variables.less index ffe54f07bd..b7cd2e68c8 100755 --- a/website/source/stylesheets/_variables.less +++ b/website/source/stylesheets/_variables.less @@ -12,6 +12,7 @@ @jumbotron-color: #fff; @btn-border-radius: 4px; @el-border-radius: 6px; +@negative-hero-margin: -93px; // colors // ------------------------- diff --git a/website/source/stylesheets/main.css b/website/source/stylesheets/main.css index fe11385d4e..19c507fb88 100644 --- a/website/source/stylesheets/main.css +++ b/website/source/stylesheets/main.css @@ -371,15 +371,16 @@ body.page-sub #header { } #jumbotron-mask { overflow: hidden; + width: 100%; height: 542px; - margin-top: -92px; + margin-top: -93px; } #jumbotron { position: relative; height: 542px; padding-top: 0; padding-bottom: 0; - margin-top: -92px; + margin-top: -93px; color: #ffffff; background: #694a9c; /* Old browsers */ @@ -409,7 +410,7 @@ body.page-sub #header { left: 0; height: 632px; width: 100%; - margin-top: -92px; + margin-top: -93px; background: transparent url('../images/hero-dots.png') center 92px no-repeat; } #jumbotron .container { @@ -466,6 +467,9 @@ body.page-sub #header { .outline-btn:hover.purple { background-color: rgba(255, 255, 255, 0.5); } +body.page-home { + background-color: #f8f8f8; +} #features { text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; @@ -637,9 +641,24 @@ body.layout-intro { } body.layout-docs > .container .col-md-8[role=main], body.layout-intro > .container .col-md-8[role=main] { - min-height: 600px; + min-height: 800px; background-color: white; } +body.layout-docs > .container .col-md-8[role=main]::before, +body.layout-intro > .container .col-md-8[role=main]::before { + content: ""; + position: absolute; + top: 0; + bottom: 0; + left: -9999px; + right: 0; + box-shadow: 9999px 0 0 white; +} +body.layout-docs > .container .col-md-8[role=main] > div, +body.layout-intro > .container .col-md-8[role=main] > div { + position: relative; + z-index: 10; +} .docs-sidebar { margin-bottom: 30px; margin-top: 50px;