Skip to content

Commit

Permalink
Redesign pages, remove layout nesting (#24)
Browse files Browse the repository at this point in the history 
* wip

* new svelte-style prop declaration is working

* got it working!

* revert h changes

* format

* style lang update
  • Loading branch information
@FredKSchott
FredKSchott committed Mar 24, 2021
1 parent 3c24faa commit a72ab10
Show file tree
Hide file tree
Showing 28 changed files with 769 additions and 732 deletions.
38 changes: 38 additions & 0 deletions examples/snowpack/astro/components/BaseHead.astro
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
import Banner from './Banner.astro';
import Nav from './Nav.astro';
export let title: string;
export let description: string;
export let permalink: string;
---

<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
<link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png" />
<link rel="manifest" href="/favicon/site.webmanifest" />

<!-- Primary Meta Tags -->
<title>{title}</title>
<meta name="title" content={title} />
<meta name="description" content="{description}" />

<!-- Open Graph / Facebook -->
<meta property="og:type" content="website" />
<meta property="og:url" content={permalink} />
<meta property="og:title" content={title} />
<meta property="og:description" content={description} />
<meta property="og:image" content="https://www.snowpack.dev/img/social-2.jpg" />

<!-- Twitter -->
<meta property="twitter:card" content="summary_large_image" />
<meta property="twitter:url" content={permalink} />
<meta property="twitter:title" content={title} />
<meta property="twitter:description" content={description} />
<meta property="twitter:image" content="https://www.snowpack.dev/img/social-2.jpg" />

<!-- Global Stylesheets -->
<link rel="stylesheet" href="/css/app.css" />
<link href="https://fonts.googleapis.com/css2?family=Overpass:wght@400;700;900&display=swap" rel="stylesheet" />
20 changes: 20 additions & 0 deletions examples/snowpack/astro/components/BaseLayout.astro
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
import Banner from './Banner.astro';
import Nav from './Nav.astro';
---

<Banner></Banner>
<Nav />

<slot></slot>

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async="async" src="https://www.googletagmanager.com/gtag/js?id=UA-130280175-9"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag('js', new Date());
gtag('config', 'UA-130280175-9', { page_path: location.pathname === '/' ? (location.pathname + location.hash) : (location.pathname) });
</script>
23 changes: 23 additions & 0 deletions examples/snowpack/astro/components/MainLayout.astro
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
import BaseLayout from './BaseLayout.astro';
import Menu from './Menu.astro';
export function setup({ context }) {
return {};
}
---

<BaseLayout>
<div class="container">
<section class="snow-view__docs is-full">

<aside id="nav-primary" class="snow-view-nav">
<Menu />
</aside>

<article class="snow-view-main">
<slot></slot>
</article>

</section>
</div>
</BaseLayout>
4 changes: 2 additions & 2 deletions examples/snowpack/astro/components/Nav.astro
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
export let props: { version: string };
export let version: string = '3.1.2';
---

<style lang="scss">
Expand Down Expand Up @@ -257,7 +257,7 @@
</div>
<div style="flex-grow: 1"></div>
<a href="https://github.com/snowpackjs/snowpack/releases" target="_blank" class="link version">
{`v${props.version}`}
{`v${version}`}
</a>
<a href="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/snowpackjs/snowpack" target="_blank" class="link link__desktop">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="snow-icon" role="img"
Expand Down
14 changes: 6 additions & 8 deletions examples/snowpack/astro/components/Subnav.astro
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
export let props: {
title: string,
inputPath: string,
headers: { text: string, slug: string }[]
};
export let title: string;
export let inputPath: string;
export let headers: string;
---

<style lang="scss">
Expand Down Expand Up @@ -59,12 +57,12 @@

<script type="module" defer src="/js/index.js"></script>
<aside class="subnav">
{props.headers.length > 0 && (
{headers.length > 0 && (
<div>
<h4 class="header">On this page</h4>
<nav class="toc">
<ol>
{props.headers.map((heading) => {
{headers.map((heading) => {
return <li><a href={"#" + heading.slug}>{heading.text}</a></li>
})}
</ol>
Expand All @@ -74,5 +72,5 @@
)}

<h4 class="header">Suggest a change</h4>
<a href="https://github.com/snowpackjs/snowpack/blob/main/www/{props.inputPath}">Edit this page on GitHub</a>
<a href="https://github.com/snowpackjs/snowpack/blob/main/www/{inputPath}">Edit this page on GitHub</a>
</aside>
62 changes: 0 additions & 62 deletions examples/snowpack/astro/layouts/base.astro
View file

This file was deleted.

134 changes: 72 additions & 62 deletions examples/snowpack/astro/layouts/content-with-cover.astro
View file
Original file line number Diff line number Diff line change
@@ -1,78 +1,88 @@
---
import Menu from '../components/Menu.astro';
import Subnav from '../components/Subnav.astro';
import Subnav from '../components/Subnav.astro';
import Menu from '../components/Menu.astro';
import BaseHead from '../components/BaseHead.astro';
import BaseLayout from '../components/BaseLayout.astro';
export const layout = 'layouts/base.astro';
export function setup({ context }) {
return {};
}
export let content: any;
---

<html>

<style>
.cover-wrapper {
width: 100%;
height: 44vh;
min-height: 20rem;
max-height: 30rem;
position: relative;
background: #2a85ca40;
overflow: hidden;
}
.cover,
.cover-blur {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
height: 100%;
width: 100%;
}
.cover-blur {
object-fit: cover;
filter: blur(3px) brightness(1.5);
transform: scale(1.1);
}
.cover {
object-fit: contain;
filter: brightness(1.5);
}
@media (max-width: 1200px) {
<head>
<style>
.cover-wrapper {
width: 100%;
height: 44vh;
min-height: 20rem;
max-height: 30rem;
position: relative;
background: #2a85ca40;
overflow: hidden;
}
.cover,
.cover-blur {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
height: 100%;
width: 100%;
}
.cover-blur {
object-fit: cover;
filter: blur(3px) brightness(1.5);
transform: scale(1.1);
}
.cover {
object-fit: cover;
object-fit: contain;
filter: brightness(1.5);
}
}
</style>
@media (max-width: 1200px) {
.cover-blur {
object-fit: cover;
}
.cover {
object-fit: cover;
}
}
</style>
<BaseHead title={content.title} description={content.description} permalink="TODO" />
</head>

<body>
<BaseLayout>

<div class="cover-wrapper">
<img class="cover-blur" src={context.cover} alt=""/>
<img class="cover" src={context.cover} alt=""/>
</div>
<div class="cover-wrapper">
<img class="cover-blur" src={content.cover} alt=""/>
<img class="cover" src={content.cover} alt=""/>
</div>

<div class="container">
<section class="snow-view__docs has-subnav">
<div class="container">
<section class="snow-view__docs has-subnav">

<aside id="nav-primary" class="snow-view-nav">
<Menu />
</aside>
<aside id="nav-primary" class="snow-view-nav">
<Menu />
</aside>

<article class="snow-view-main">
<div class="content">
<h2 class="content-title">
{context.title}
</h2>
<div class="content-layout">
<div class="content-body">
<slot></slot>
<article class="snow-view-main">
<div class="content">
<h2 class="content-title">
{content.title}
</h2>
<div class="content-layout">
<div class="content-body">
{content.body}
</div>
</div>
</div>
</div>
</div>
</article>
</article>

<Subnav title={content.title} headers={content.headers} />
</section>
</div>
</BaseLayout>
</body>

<Subnav title={context.title} headers={context.content.headers} />
</section>
</div>
</html>
Loading

0 comments on commit a72ab10

Please sign in to comment.