From 3c6218bb8620525ed6d801aa5900b07268e23dc2 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 22 Dec 2018 22:18:28 -0500
Subject: [PATCH] merge conflict

---
 site/src/routes/guide/index.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/site/src/routes/guide/index.html b/site/src/routes/guide/index.html
index ff8bc20d73..09c3603f27 100644
--- a/site/src/routes/guide/index.html
+++ b/site/src/routes/guide/index.html
@@ -83,6 +83,17 @@
 		overflow: hidden;
 	}
 
+	aside::after {
+		content: '';
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: var(--top-offset);
+		background: linear-gradient(to bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,0.7) 50%, rgba(255,255,255,1) 100%);
+		pointer-events: none;
+	}
+
 	.sidebar {
 		padding: var(--top-offset) 3.2rem var(--top-offset) 0;
 		font-family: var(--font-ui);