Skip to content

remove back to school banner #2697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2020
Merged

remove back to school banner #2697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions themes/vue/layout/layout.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<% var isIndex = page.path === 'index.html' %>
<% var isThemes = page.path === 'resources/themes.html' %>
<% var hasBtsBanner = true %>

<!DOCTYPE html>
<html lang="en">
Expand Down Expand Up @@ -92,10 +91,13 @@
</head>
<body class="<%- isIndex ? '' : 'docs' -%>">
<div id="mobile-bar" <%- isIndex ? 'class="top"' : '' %>>
<a class="menu-button"></a>
<a class="menu-button<%- isIndex ? ' blm' : '' %>"></a>
<a class="logo" href="/"></a>
<% if (isIndex) { %>
<a class="blm-mobile" href="/#">#BlackLivesMatter</a>
<% } %>
</div>
<%- partial('partials/header', { hasBtsBanner }) %>
<%- partial('partials/header') %>
<% if (!isIndex) { %>
<div id="main" class="fix-sidebar">
<%- body %>
Expand Down
25 changes: 4 additions & 21 deletions themes/vue/layout/partials/header.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
<div>
<% if (hasBtsBanner) { %>
<a id="bts" class="bts-hidden" href="https://vueschool.io/sales/back-to-school?friend=vuejs" target="_blank" rel="noreferrer">
<div class="bts-logo">
<img src="/images/banners/bts-logo.svg">
<% if (page.path === 'index.html') { %>
<div id="blm">
<span id="blm-hashtag">#B<span>lack</span>L<span>ives</span>M<span>atter</span></span>
<a href="https://support.eji.org/give/153413/#!/donation/checkout" target="_blank" rel="noreferrer" id="blm-link">Support the Equal Justice Initiative.</a>
</div>
<div class="bts-main">
<div class="bts-backpack">
<img src="/images/banners/bts-backpack.svg">
</div>
<div class="bts-slogan">
<div class="bts-title">
Less than <span class="bts-title-green">48 hours</span> left for the Vue School offer
</div>
</div>
<div>
<div class="bts-button">GET ACCESS</div>
</div>
</div>
<div id="bts-close" class="bts-close">
&times;
</div>
</a>
<% } %>

<header id="header">
Expand Down
135 changes: 0 additions & 135 deletions themes/vue/source/css/_banners.styl
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions themes/vue/source/css/_fonts.styl
View file
Open in desktop

This file was deleted.

52 changes: 48 additions & 4 deletions themes/vue/source/css/_header.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "_settings"
$header-height = 40px

red-dot-before(leftPos = -8px)
Expand All @@ -13,23 +12,60 @@ red-dot-before(leftPos = -8px)

#header
background-color: #fff
padding: $heading-padding-vertical 30px $heading-padding-vertical 60px
height: $header-height
padding: $heading-padding-vertical 60px
position: relative
z-index: $z-header
display: flex
justify-content: space-between

#blm
background-color: #000
min-height: $blm-height
padding: $heading-padding-vertical 60px
z-index: $z-header - 1
box-sizing: border-box
text-align: center
color: #fff

#blm-hashtag
font-weight: bold
margin-right: 4px

#blm-hashtag span
display: none

@media (min-width: 470px)
#blm-hashtag span
display: inline

#blm-link
color: $green
white-space: nowrap

body.docs
#blm
position: fixed
top: 0
width: 100%
#header
position: fixed
width: 100%
top: 0
#nav
position: fixed
top: $heading-padding-vertical

@media screen and (max-width: 900px)
body.docs #blm
display: none

#nav
list-style-type: none
margin: 0
padding: 0
position: absolute
right: 30px
top: $heading-padding-vertical
height: $header-height
line-height: $header-height
.break
display: none
Expand Down Expand Up @@ -135,6 +171,9 @@ body.docs
left: 12px
background: url(../images/menu.png) center center no-repeat
background-size: 24px
&.blm
background: url(../images/menu-blm.png) center center no-repeat
background-size: 24px
.logo
position: absolute
width: 30px
Expand All @@ -144,6 +183,11 @@ body.docs
left: 50%
margin-left: -15px
background-size: 30px
.blm-mobile
position: absolute
right: 12px
line-height: 40px
font-weight: bold

@media print
#header
Expand Down
2 changes: 2 additions & 0 deletions themes/vue/source/css/_settings.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ $z-sidebar = 10
$z-header = 20
$z-overlay = 30
$z-modal = 40

$blm-height = 40px
5 changes: 2 additions & 3 deletions themes/vue/source/css/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
@import "_sponsors-index"
@import "_modal"
@import "_themes"
@import "_fonts"
@import "_banners"

$width = 900px
$space = 40px
Expand All @@ -27,7 +25,8 @@ body
background-color: transparent
box-shadow: none
z-index: ($z-sidebar - 1)
.logo
.logo,
.blm-mobile
display: none

#hero,
Expand Down
2 changes: 0 additions & 2 deletions themes/vue/source/css/page.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
@import "_scrimba"
@import "_vue-mastery"
@import "_themes"
@import "_fonts"
@import "_banners"

#header
box-shadow: 0 0 1px rgba(0,0,0,.25)
Expand Down
Binary file removed themes/vue/source/fonts/circular/CircularStd-Bold.eot
View file
Open in desktop
Binary file not shown.
Binary file removed themes/vue/source/fonts/circular/CircularStd-Bold.otf
View file
Open in desktop
Binary file not shown.
Loading