Skip to content

Remove Vue School banner #2796

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.

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
Apr 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions themes/vue/layout/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,10 @@
})

window.addEventListener('scroll', function () {
var offset = 20
if (window.pageYOffset > offset && !topScrolled) {
if (window.pageYOffset > 165 && !topScrolled) {
topScrolled = true
document.getElementById('mobile-bar').classList.remove('top')
} else if (window.pageYOffset <= offset && topScrolled) {
} else if (window.pageYOffset <= 165 && topScrolled) {
topScrolled = false
document.getElementById('mobile-bar').classList.add('top')
}
Expand Down
8 changes: 1 addition & 7 deletions themes/vue/layout/layout.ejs
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 hasVueSchoolBanner = true %>

<!DOCTYPE html>
<html lang="en" class="with-v3-banner">
Expand Down Expand Up @@ -55,7 +54,7 @@
<link href="https://fonts.gstatic.com" rel="preconnect" crossorigin>
<link href="https://maxcdn.bootstrapcdn.com" rel="preconnect" crossorigin>

<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600|Roboto|Roboto Mono&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600|Roboto Mono&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Dosis:500&text=Vue.js&display=swap" rel="stylesheet">

<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
Expand Down Expand Up @@ -91,11 +90,6 @@
<script type="text/javascript" defer="defer" src="https://extend.vimeocdn.com/ga/72160148.js"></script>
</head>
<body class="<%- isIndex ? '' : 'docs' -%>">

<% if (hasVueSchoolBanner) { %>
<%- partial('partials/vueschool_banner') %>
<% } %>

<div id="mobile-bar" <%- isIndex ? 'class="top"' : '' %>>
<a class="menu-button"></a>
<a class="logo" href="/"></a>
Expand Down
22 changes: 0 additions & 22 deletions themes/vue/layout/partials/vueschool_banner.ejs

This file was deleted.

15 changes: 9 additions & 6 deletions themes/vue/source/css/_header.styl
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,12 +12,10 @@ 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
box-sizing: border-box

#v3-banner
background-color: $green
Expand All @@ -43,11 +40,18 @@ body.docs
position: fixed
width: 100%
top: 0
#nav
position: fixed
top: $heading-padding-vertical

#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 @@ -143,7 +147,6 @@ body.docs
display: none
box-shadow: 0 0 2px rgba(0,0,0,.25)
pointer-events: none
transition: background-color 0.25s ease-in
> *
pointer-events: auto
.menu-button
Expand Down
2 changes: 1 addition & 1 deletion themes/vue/source/css/_sidebar.styl
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
position: fixed
background-color: #f9f9f9
height: 100%
top: 40px
top: 0
left: 0
box-shadow: 0 0 10px rgba(0,0,0,.2)
transition: all .4s cubic-bezier(0.4, 0, 0, 1)
Expand Down
142 changes: 0 additions & 142 deletions themes/vue/source/css/_vueschool.styl

This file was deleted.

1 change: 0 additions & 1 deletion themes/vue/source/css/index.styl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
@import "_sponsors-index"
@import "_modal"
@import "_themes"
@import "_vueschool.styl"

$width = 900px
$space = 40px
Expand Down
1 change: 0 additions & 1 deletion themes/vue/source/css/page.styl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@import "_scrimba"
@import "_vue-mastery"
@import "_themes"
@import "_vueschool.styl"

#header
box-shadow: 0 0 1px rgba(0,0,0,.25)
Expand Down
7 changes: 0 additions & 7 deletions themes/vue/source/images/banners/close.svg

This file was deleted.

Loading