From 508e25b6d6e9a81edb6ddf8738450b79898b446a Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Mon, 27 Apr 2020 22:24:58 -0700
Subject: Adapt website to use g3doc sources and bazel.

This adapts the merged website repository to use the image and bazel
build framework. It explicitly avoids the container_image rules provided
by bazel, opting instead to build with direct docker commands when
necessary.

The relevant build commands are incorporated into the top-level
Makefile.
---
 website/blog/index.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 website/blog/index.html

(limited to 'website/blog/index.html')

diff --git a/website/blog/index.html b/website/blog/index.html
new file mode 100644
index 000000000..57051c6fe
--- /dev/null
+++ b/website/blog/index.html
@@ -0,0 +1,21 @@
+---
+title: Blog
+layout: blog
+pagination:
+  enabled: true
+---
+
+{% for post in paginator.posts %}
+<div>
+  <h2><a href="{{ post.url }}">{{ post.title }}</a></h2>
+  <div class="blog-meta">
+    {% include byline.html authors=post.authors date=post.date %}
+  </div>
+  <p>{{ post.excerpt | strip_html }}</p>
+  <p><a href="{{ post.url }}">Full Post &raquo;</a></p>
+</div>
+{% endfor %}
+
+{% if paginator.total_pages > 1 %}
+{% include paginator.html %}
+{% endif %}
-- 
cgit v1.2.3


From a10d5ed9691d341c60dc8590d19302332120d365 Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Wed, 29 Apr 2020 18:00:21 -0700
Subject: Add atom feed (at previous URL).

---
 images/jekyll/Dockerfile   | 3 ++-
 website/_config.yml        | 3 +++
 website/_layouts/blog.html | 5 ++++-
 website/_sass/front.scss   | 8 --------
 website/_sass/style.scss   | 8 +++++++-
 website/blog/index.html    | 1 +
 6 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'website/blog/index.html')

diff --git a/images/jekyll/Dockerfile b/images/jekyll/Dockerfile
index d0ec7f933..db8fec95c 100644
--- a/images/jekyll/Dockerfile
+++ b/images/jekyll/Dockerfile
@@ -7,5 +7,6 @@ RUN gem install \
 	jekyll-inline-svg:1.1.4 \
 	jekyll-paginate:1.1.0 \
 	kramdown-parser-gfm:1.1.0 \
-	jekyll-relative-links:0.6.1
+	jekyll-relative-links:0.6.1 \
+	jekyll-feed:0.13.0
 CMD ["/usr/gem/gems/jekyll-4.0.0/exe/jekyll", "build", "-t", "-s", "/input", "-d", "/output"]
diff --git a/website/_config.yml b/website/_config.yml
index bcbc94eda..3241e458c 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -11,7 +11,10 @@ plugins:
   - jekyll-autoprefixer
   - jekyll-inline-svg
   - jekyll-relative-links
+  - jekyll-feed
 site_url: https://gvisor.dev
+feed:
+  path: blog/index.xml
 svg:
   optimize: true
 defaults:
diff --git a/website/_layouts/blog.html b/website/_layouts/blog.html
index e6b880225..6c371ab50 100644
--- a/website/_layouts/blog.html
+++ b/website/_layouts/blog.html
@@ -6,7 +6,10 @@ layout: base
   <div class="row">
     <div class="col-lg-2"></div>
     <div class="col-lg-8">
-    <h1>{{ page.title }}</h1>
+      <h1>{{ page.title }}</h1>
+      {% if page.feed %}
+      <a class="btn-inverse" href="/blog/index.xml">Feed&nbsp;<i class="fas fa-rss ml-2"></i></a>
+      {% endif %}
       {{ content }}
     </div>
     <div class="col-lg-2"></div>
diff --git a/website/_sass/front.scss b/website/_sass/front.scss
index 1c7f58ecb..3cd87ce40 100644
--- a/website/_sass/front.scss
+++ b/website/_sass/front.scss
@@ -13,12 +13,4 @@
     margin-bottom: 0;
     font-weight: 300;
   }
-  .btn {
-    color: $text-color;
-    background-color: $inverse-link-color;
-  }
-  .btn-inverse {
-    color: $text-color;
-    background-color: #ffffff;
-  }
 }
diff --git a/website/_sass/style.scss b/website/_sass/style.scss
index e9cc54d24..e34e21448 100644
--- a/website/_sass/style.scss
+++ b/website/_sass/style.scss
@@ -104,7 +104,13 @@ code {
 }
 
 .btn {
-  background-color: $primary;
+  color: $text-color;
+  background-color: $inverse-link-color;
+}
+
+.btn-inverse {
+  color: $text-color;
+  background-color: #ffffff;
 }
 
 .well {
diff --git a/website/blog/index.html b/website/blog/index.html
index 57051c6fe..5c67c95fc 100644
--- a/website/blog/index.html
+++ b/website/blog/index.html
@@ -1,6 +1,7 @@
 ---
 title: Blog
 layout: blog
+feed: true
 pagination:
   enabled: true
 ---
-- 
cgit v1.2.3