From c5b0b45fcdcbe76b61cd33dbffaa756431f6e480 Mon Sep 17 00:00:00 2001 From: Pierre Schweiger Date: Wed, 13 Feb 2019 12:31:59 -0200 Subject: [PATCH 01/20] Add Vue Mastery banner for free weekend lessons --- src/images/logo-vuemastery.svg | 22 +++ themes/vue/layout/index.ejs | 53 ++++--- themes/vue/layout/layout.ejs | 1 + .../vue/layout/partials/vue_mastery_promo.ejs | 71 +++++++++ themes/vue/source/css/_vue-mastery-promo.styl | 142 ++++++++++++++++++ themes/vue/source/css/index.styl | 1 + 6 files changed, 265 insertions(+), 25 deletions(-) create mode 100644 src/images/logo-vuemastery.svg create mode 100644 themes/vue/layout/partials/vue_mastery_promo.ejs create mode 100644 themes/vue/source/css/_vue-mastery-promo.styl diff --git a/src/images/logo-vuemastery.svg b/src/images/logo-vuemastery.svg new file mode 100644 index 0000000000..b4ce163d48 --- /dev/null +++ b/src/images/logo-vuemastery.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/vue/layout/index.ejs b/themes/vue/layout/index.ejs index 10eed9f2ca..199ad4401f 100644 --- a/themes/vue/layout/index.ejs +++ b/themes/vue/layout/index.ejs @@ -126,34 +126,37 @@ diff --git a/themes/vue/layout/layout.ejs b/themes/vue/layout/layout.ejs index 77b6689743..0071b7de5c 100644 --- a/themes/vue/layout/layout.ejs +++ b/themes/vue/layout/layout.ejs @@ -78,6 +78,7 @@ + <%- partial('partials/vue_mastery_promo.ejs') %>
> diff --git a/themes/vue/layout/partials/vue_mastery_promo.ejs b/themes/vue/layout/partials/vue_mastery_promo.ejs new file mode 100644 index 0000000000..a1f09895ab --- /dev/null +++ b/themes/vue/layout/partials/vue_mastery_promo.ejs @@ -0,0 +1,71 @@ + + + \ No newline at end of file diff --git a/themes/vue/source/css/_vue-mastery-promo.styl b/themes/vue/source/css/_vue-mastery-promo.styl new file mode 100644 index 0000000000..3cfca21308 --- /dev/null +++ b/themes/vue/source/css/_vue-mastery-promo.styl @@ -0,0 +1,142 @@ +.vue-mastery-promo + background #4fc08d + background-image linear-gradient(to right, #35495E, #35495E 50%, #4fc08d 50%) + overflow hidden + height 80px + transition height .3s ease-in + + &:hover + background-image linear-gradient(to left, #35495E, #35495E 50%, #4fc08d 50%) + .vue-mastery-wrapper + background #35495E + p + color #fff + + &.hide + transition height .3s ease-out + height: 0 + + a + display flex + height 80px + justify-content center + + .vue-mastery-wrapper + display flex + height 100% + align-items center + background #4fc08d + margin-left -50px + padding-left 50px + + &:hover + + .close + &:before, + &:after + transform-origin 100% + + .vue-mastery-logo + height 102% + margin-top: -1px + margin-left 125px + position relative + + p + margin -3px 50px 0 20px + font-size 1.17rem + font-weight 600 + color #2c3e50 + + span + font-size 1rem + display block + color #fff + + .close + position absolute + top 20px + right 25px + height 40px + width 40px + -webkit-tap-highlight-color transparent + border-radius 50% + cursor pointer + + &:before, + &:after + content '' + position absolute + top 19px + left 14px + width 25px + height 2px + background-color #fff + transform-origin 50% + transform rotate(-45deg) + transition all .2s ease-out + + &:after + transform rotate(45deg) + + &:hover + background closeBgHoverColor + &:before, + &:after + background-color closeBarBgHoverColor + transform rotate(180deg) + +@media screen and (max-width: 900px) + .vue-mastery-promo + #mobile-bar.top + position relative + background-color #fff + + .vue-mastery-promo.fixed + margin-bottom 40px + + #mobile-bar + position fixed + + .vue-mastery-promo + .vue-mastery-logo + margin-left 0 + +@media screen and (max-width: 700px) + .vue-mastery-promo + height 40px + a + height 40px + overflow hidden + + .vue-mastery-logo + margin-left 0 + justify-content flex-start + + p, span + font-size .8rem + color #fff + + .close + top 0px + right 0px + + &:before, + &:after + top 19px + left 14px + width 15px + height 2px + +@media screen and (max-width: 425px) + .vue-mastery-promo + p + max-width 185px + span + display none + +@media screen and (max-width 286px) + .vue-mastery-promo p + font-size 0.6rem + margin -3px 28px 0 0px + +@media print + .vue-mastery-promo + display none \ No newline at end of file diff --git a/themes/vue/source/css/index.styl b/themes/vue/source/css/index.styl index 0613877a05..4428e6cad0 100644 --- a/themes/vue/source/css/index.styl +++ b/themes/vue/source/css/index.styl @@ -3,6 +3,7 @@ @import "_sidebar" @import "_sponsors-index" @import "_modal" +@import "_vue-mastery-promo" $width = 900px $space = 40px From 98a96e39ad61173237c5dd6fe11f7df7596e30c8 Mon Sep 17 00:00:00 2001 From: Pierre Schweiger Date: Wed, 13 Feb 2019 12:39:56 -0200 Subject: [PATCH 02/20] Add banner only on homepage --- themes/vue/layout/layout.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/themes/vue/layout/layout.ejs b/themes/vue/layout/layout.ejs index 0071b7de5c..d34aa12faf 100644 --- a/themes/vue/layout/layout.ejs +++ b/themes/vue/layout/layout.ejs @@ -78,7 +78,9 @@ - <%- partial('partials/vue_mastery_promo.ejs') %> + <% if (isIndex) { %> + <%- partial('partials/vue_mastery_promo.ejs') %> + <% } %>
> From 4336b97b192f44f18f86b441795b13f89a0c23cb Mon Sep 17 00:00:00 2001 From: Pierre Schweiger Date: Wed, 13 Feb 2019 14:10:45 -0200 Subject: [PATCH 03/20] Add vuemastery weekend promo on every pages --- themes/vue/layout/layout.ejs | 4 +- .../vue/layout/partials/vue_mastery_promo.ejs | 14 +++++-- themes/vue/source/css/_vue-mastery-promo.styl | 40 ++++++++++++++----- themes/vue/source/css/page.styl | 1 + 4 files changed, 43 insertions(+), 16 deletions(-) diff --git a/themes/vue/layout/layout.ejs b/themes/vue/layout/layout.ejs index d34aa12faf..0071b7de5c 100644 --- a/themes/vue/layout/layout.ejs +++ b/themes/vue/layout/layout.ejs @@ -78,9 +78,7 @@ - <% if (isIndex) { %> - <%- partial('partials/vue_mastery_promo.ejs') %> - <% } %> + <%- partial('partials/vue_mastery_promo.ejs') %>
> diff --git a/themes/vue/layout/partials/vue_mastery_promo.ejs b/themes/vue/layout/partials/vue_mastery_promo.ejs index a1f09895ab..b877614bfa 100644 --- a/themes/vue/layout/partials/vue_mastery_promo.ejs +++ b/themes/vue/layout/partials/vue_mastery_promo.ejs @@ -1,15 +1,15 @@ - - \ No newline at end of file From a07fc45770681dc9e5cba24a423bd0aed766f67e Mon Sep 17 00:00:00 2001 From: Pierre Schweiger Date: Thu, 14 Feb 2019 11:58:45 -0200 Subject: [PATCH 09/20] Optimise code on scroll with vue mastery banner --- .../vue/layout/partials/vue_mastery_promo.ejs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/themes/vue/layout/partials/vue_mastery_promo.ejs b/themes/vue/layout/partials/vue_mastery_promo.ejs index 01e34a8e6e..b1540310b1 100644 --- a/themes/vue/layout/partials/vue_mastery_promo.ejs +++ b/themes/vue/layout/partials/vue_mastery_promo.ejs @@ -10,16 +10,20 @@ - <%- partial('partials/vue_mastery_promo.ejs') %> + <%- partial('partials/vuemastery_banner.ejs') %>
> diff --git a/themes/vue/layout/partials/vue_mastery_promo.ejs b/themes/vue/layout/partials/vuemastery_banner.ejs similarity index 83% rename from themes/vue/layout/partials/vue_mastery_promo.ejs rename to themes/vue/layout/partials/vuemastery_banner.ejs index aba761254e..eebff7ef78 100644 --- a/themes/vue/layout/partials/vue_mastery_promo.ejs +++ b/themes/vue/layout/partials/vuemastery_banner.ejs @@ -1,43 +1,23 @@ -