diff --git a/public/site/2015-05/_includes/footer.html b/public/site/2015-05/_includes/footer.html index 4a5195fd..1c317add 100644 --- a/public/site/2015-05/_includes/footer.html +++ b/public/site/2015-05/_includes/footer.html @@ -2,5 +2,5 @@ - - + + diff --git a/public/site/2015-05/_includes/head.html b/public/site/2015-05/_includes/head.html index 1598d6fe..c4abe827 100644 --- a/public/site/2015-05/_includes/head.html +++ b/public/site/2015-05/_includes/head.html @@ -9,4 +9,7 @@ + + + diff --git a/public/site/2015-05/_includes/header.html b/public/site/2015-05/_includes/header.html index 4fc882a8..03b4109f 100644 --- a/public/site/2015-05/_includes/header.html +++ b/public/site/2015-05/_includes/header.html @@ -1,13 +1,22 @@
+ + @@ -15,8 +24,8 @@
diff --git a/public/site/2015-05/_layouts/default.html b/public/site/2015-05/_layouts/default.html index b066ddc3..27412535 100644 --- a/public/site/2015-05/_layouts/default.html +++ b/public/site/2015-05/_layouts/default.html @@ -1,5 +1,5 @@ - + {% include head.html %} diff --git a/public/site/2015-05/_sass/_layout.scss b/public/site/2015-05/_sass/_layout.scss index d4737b16..de4e3b3f 100644 --- a/public/site/2015-05/_sass/_layout.scss +++ b/public/site/2015-05/_sass/_layout.scss @@ -67,18 +67,54 @@ header, section { width: 100%; min-height: 90%; } - header { display: flex; + position: relative; overflow: hidden; - background: url('../img/shot-laptop-just-iphone.jpg') center top; - background-size: cover; - flex-direction: column; justify-content: stretch; align-items: stretch; + &::before, &::after { + position: absolute; + background-size: cover !important; + opacity: 0; + transition: 0.3s opacity; + z-index: -1; + width: 100%; + height: 100%; + content: " "; + } + &::after { + z-index: -2; + background: url('../img/hero_ios.jpg') center top; + opacity: 1; + } + &.hero_ios::before { + background: url('../img/hero_ios.jpg') center top; + opacity: 1; + } + &.hero_android::before { + background: url('../img/hero_android.jpg') center center; + opacity: 1; + } + &.hero_mac::before { + background: url('../img/hero_mac.jpg') center center; + opacity: 1; + } + &.hero_desktop::before { + background: url('../img/hero_desktop.jpg') center bottom; + opacity: 1; + } + &.hero_cli::before { + background: url('../img/hero_cli.jpg') center center; + opacity: 1; + } + &.hero_web::before { + background: url('../img/hero_web.jpg') center center; + opacity: 1; + } h1 { height: 1em; diff --git a/public/site/2015-05/how.html b/public/site/2015-05/how.html index f2bed267..594729c9 100644 --- a/public/site/2015-05/how.html +++ b/public/site/2015-05/how.html @@ -1,5 +1,6 @@ --- layout: default +nav: how ---
diff --git a/public/site/2015-05/img/laptop-iphone.jpg b/public/site/2015-05/img/laptop-iphone.jpg deleted file mode 100644 index c54773f5..00000000 Binary files a/public/site/2015-05/img/laptop-iphone.jpg and /dev/null differ diff --git a/public/site/2015-05/index.html b/public/site/2015-05/index.html index 91b1e3ab..3c303453 100644 --- a/public/site/2015-05/index.html +++ b/public/site/2015-05/index.html @@ -1,5 +1,6 @@ --- layout: default +nav: why ---