You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/10/26 04:17:46 UTC

[1/4] incubator-beam-site git commit: Updated website instructions to use Bundler correctly for managing ruby gems.

Repository: incubator-beam-site
Updated Branches:
  refs/heads/asf-site 4beee9c97 -> 03542e8b7


Updated website instructions to use Bundler correctly for managing ruby gems.


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/commit/b73878c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/b73878c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/b73878c2

Branch: refs/heads/asf-site
Commit: b73878c2b7fd64af4047d97b71420794668a1786
Parents: 4beee9c
Author: Frances Perry <fj...@google.com>
Authored: Thu Oct 20 21:47:11 2016 -0700
Committer: Frances Perry <fj...@google.com>
Committed: Fri Oct 21 15:38:21 2016 -0700

----------------------------------------------------------------------
 .gitattributes                   | 23 +++++++++
 .gitignore                       |  3 +-
 .travis.yml                      |  3 +-
 Gemfile                          | 18 +++++--
 Gemfile.lock                     | 83 +++++++++++++++++++++++++++++++
 README.md                        | 94 +++++++++++++++++++++--------------
 _config.yml                      |  7 ++-
 contribute/contribution-guide.md | 13 ++---
 8 files changed, 188 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/b73878c2/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..939c0bd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+# The default behavior, which overrides 'core.autocrlf', is to use Git's
+# built-in heuristics to determine whether a particular file is text or binary.
+# Text files are automatically normalized to the user's platforms.
+* text=auto
+
+# Explicitly declare text files that should always be normalized and converted
+# to native line endings.
+*.css text
+.gitattributes text
+.gitignore text
+LICENSE text
+*.html text
+*.md text
+*.properties text
+*.sh text
+*.xml text
+*.yml text
+
+# Declare files that will always have CRLF line endings on checkout.
+# *.sln text eol=crlf
+
+# Explicitly denote all files that are truly binary and should not be modified.
+# *.jpg binary
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/b73878c2/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 666de10..1cabae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 _site
 .sass-cache
 .jekyll-metadata
-Gemfile.lock
+vendor/
+.bundle/

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/b73878c2/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 0bab318..7d321a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,7 @@ language: ruby
 rvm:
   - 2.1
 script:
-  - bundle exec jekyll build
-  - bundle exec htmlproofer ./content --allow-hash-href --check-html --file-ignore /javadoc/ --url-ignore "/repository.apache.org/"
+  - bundle exec rake test
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/b73878c2/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
index 09a5cfc..9f15c06 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,19 @@
+# Updates to this file should include a corresponding change to Gemfile.lock.
+# See README.md for more info.
+
 source 'https://rubygems.org'
-gem 'jekyll'
-gem 'jekyll-redirect-from'
-gem 'html-proofer'
+
+gem 'jekyll', '3.2'
+
+# Jekyll plugins
+group :jekyll_plugins do
+	gem 'jekyll-redirect-from'
+	gem 'jekyll-sass-converter'
+	gem 'html-proofer'
+end
+
+# Used by Travis tests.
+gem 'rake'
 
 # Force a version lower than 5.0.0.0, which requires a newer ruby than Travis
 # supports.

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/b73878c2/Gemfile.lock
----------------------------------------------------------------------
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..8d64708
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,83 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    colorator (1.1.0)
+    colored (1.2)
+    ethon (0.9.1)
+      ffi (>= 1.3.0)
+    ffi (1.9.14)
+    forwardable-extended (2.6.0)
+    html-proofer (3.3.1)
+      activesupport (>= 4.2, < 6.0)
+      addressable (~> 2.3)
+      colored (~> 1.2)
+      mercenary (~> 0.3.2)
+      nokogiri (~> 1.5)
+      parallel (~> 1.3)
+      typhoeus (~> 0.7)
+      yell (~> 2.0)
+    i18n (0.7.0)
+    jekyll (3.2.0)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-redirect-from (0.11.0)
+      jekyll (>= 2.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    json (1.8.3)
+    kramdown (1.12.0)
+    liquid (3.0.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.1.0)
+    minitest (5.9.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    parallel (1.9.0)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    rake (11.3.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.22)
+    thread_safe (0.3.5)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    yell (2.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (< 5.0.0.0)
+  html-proofer
+  jekyll (= 3.2)
+  jekyll-redirect-from
+  jekyll-sass-converter
+  rake
+
+BUNDLED WITH
+   1.13.5

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/b73878c2/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 40172ac..a5c1826 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Apache Beam (incubating) website
 
-This is the website for [Apache Beam](http://beam.incubator.apache.org)
-(incubating).
+This is the website for [Apache Beam](http://beam.incubator.apache.org) (incubating).
+
+## About this site
 
-### About this site
 The Beam website is built using [Jekyll](http://jekyllrb.com/). Additionally,
 for additional formatting capabilities, this website uses
 [Twitter Bootstrap](http://getbootstrap.com/).
@@ -12,56 +12,78 @@ This website is hosted at:
 
     http://beam.incubator.apache.org
 
-It is important to note there are two sets of "website code"  with respect to
-the Apache Beam website.
 
-1. The **Jekyll code** which contains all of the resources for building,
-testing, styling, and tinkering with the website. Think of it as a website SDK.
-1. The **static website** content which contains the content for the
-website. This is the static content is what is actually hosted on the Apache 
-Beam website.
+### Repository Structure
+    
+This repository contains:
+
+1. `_<directory>`: the infrastructure for building, testing, and styling the website
+1. `use/`, `learn/`, and `contribute/`: markdown files containing the bulk of the content
+1. `content/`: html generated from the markdown (which is what is actually hosted on the website)
+
+
+## Development Workflow
+
+### Setup
+
+Install [Ruby Gems](https://rubygems.org/pages/download), a package management framework for Ruby.
+
+Install [Bundler](http://bundler.io/v1.3/rationale.html), which  we use to specify dependencies and ensure
+a consistent environment for building the website, even across multiple developers on different machines:
+
+	$ gem install bundler
+
+Use Bundler to download the versions of each dependency specified in the website's `Gemfile.lock`, 
+including [Jekyll](https://jekyllrb.com/):
 
-### Development setup
-Before working with the Jekyll code, you will need to install Jekyll:
+	$ bundle install --deployment
+	
+This will install a number of gems in a local `./vendor` directory.
 
-    $ gem install jekyll
-    $ gem install jekyll-redirect-from
-    $ gem install html-proofer
-    $ gem install bundler
 
-*If you are on a Mac, you may need to install
-[Ruby Gems](https://rubygems.org/pages/download).*
+### Active development
 
-### Live development
-While you are working with the website, you can test and develop live. Run the
-following command in the root folder of the website:
+Launch Jekyll via Bundler in order to guarantee that the appropriate versions of the dependencies are used:
 
-    $ jekyll serve
+	$ bundle exec jekyll serve
 
 Jekyll will start a webserver on port `4000`. As you make changes to the
 content, Jekyll will rebuild it automatically. This is helpful if you want to see
 how your changes will render in realtime.
 
-In addition, you can run the tests via:
+In addition, check for dead links and the like by running the tests via:
+
+    $ bundle exec rake test
+
+Both of these commands will cause the `content/` directory to be generated. Merging autogenerated content can
+get tricky, so please leave this directory out of your commits and pull request by doing:
+
+	$ git checkout -- content
+
+The committer doing the final merge will generate the `content/` directory at that time.
+
+
+## Additional Information
+
+### Writing blog posts
+
+Blog posts are created in the `_posts` directory.
 
-    $ rake test
+If this is your first post, make sure to add yourself to `_data\authors.yml`.
 
-### Generating the static website
-Once you are done with your changes, you need to compile the static
-content for the website. This is what is actually hosted 
-on the Apache Beam website.
+While you a working on your post before the publishing time listed in its header,
+add `--future` when running Jekyll in order to view your draft on your local copy of
+the site.
 
-You can build the static content by running the following command in the root
-website directory:
+### Adding Jekyll plugins
 
-    $ jekyll build
+If you modify the site to use additional Jekyll plugins, add them in `Gemfile`
+and then run `bundle update`, which will regenerate the complete `Gemfile.lock`.
+Make sure that the updated `Gemfile.lock` is included in your pull request. For more information,
+see the Bundler [documentation](http://bundler.io/v1.3/rationale.html).
 
-Once built, it will be placed in the folder `content` inside of the root directory. 
-This directory will include images, HTML, CSS, and so on. In a typical Jekyll install
-this content would live in `_site` - it has been changed for the Apache Beam website
-to work with the ASF Incubator publishing system.
 
-### Apache License
+## Apache License
 ---
 Except as otherwise noted this software is licensed under the
 [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/b73878c2/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 39cf260..579fcd2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -31,12 +31,11 @@ twitter_username: apachebeam
 # Build settings
 markdown: kramdown
 
-
 collections:
 - beam_team
 
 # Things to ignore in the build
-exclude: ['README.md', 'Gemfile.lock', 'Gemfile', 'Rakefile']
+exclude: ['README.md', 'Gemfile.lock', 'Gemfile', 'Rakefile', 'vendor/']
 
 # Downloads directory
 downloads: downloads
@@ -44,7 +43,7 @@ downloads: downloads
 # Don't use the page title in the table of contents
 kramdown:
   toc_levels:     2..6
+  
+# Plugins are configured in the Gemfile.
 
-gems:
-  - jekyll-redirect-from
   
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/b73878c2/contribute/contribution-guide.md
----------------------------------------------------------------------
diff --git a/contribute/contribution-guide.md b/contribute/contribution-guide.md
index 61c762b..dae324e 100644
--- a/contribute/contribution-guide.md
+++ b/contribute/contribution-guide.md
@@ -282,18 +282,11 @@ A new SDK should:
 
 The Beam website is in the [Beam Site GitHub mirror](https://github.com/apache/incubator-beam-site) repository in the `asf-site` branch (_not_ `master`). 
 
-The repository contains:
-
-1. `_<directory>`: the infrastructure for building, testing, and styling the website
-1. `_posts`: blog post entries
-2. `use/`, `learn/`, and `contribute/`: markdown files containing the bulk of the content
-3. `content/`: html generated from the markdown by jekyll (which is what is actually hosted on the website)
-
 Issues are tracked in the [website](https://issues.apache.org/jira/browse/BEAM/component/12328906) component in JIRA.
 
 #### One-time Setup
 
-The website uses [Jekyll](http://jekyllrb.com), a ruby-based development framework. The [README file](https://github.com/apache/incubator-beam-site/blob/asf-site/README.md) in the website repository has more information on how to set up the required dependencies for your development environment.
+The [README file](https://github.com/apache/incubator-beam-site/blob/asf-site/README.md) in the website repository has more information on how to set up the required dependencies for your development environment.
 
 The general guidelines for cloning a repository can be adjusted to use the `asf-site` branch of `incubator-beam-site`:
 
@@ -307,13 +300,13 @@ The general guidelines for cloning a repository can be adjusted to use the `asf-
 
 While you are working on your pull request, you can test and develop live by running the following command in the root folder of the website:
 
-	$ jekyll serve
+	$ bundle exec jekyll serve
 
 Jekyll will start a webserver on port 4000. As you make changes to the content, Jekyll will rebuild it automatically. 
 
 In addition, you can run the tests to valid your links using:
 
-	$ rake test
+	$ bundle exec rake test
 	
 Both of these commands will cause the `content/` directory to be generated. Merging autogenerated content can get tricky, so please leave this directory out of your commits and pull request by doing:
 


[4/4] incubator-beam-site git commit: This closes #50

Posted by da...@apache.org.
This closes #50


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/commit/03542e8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/03542e8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/03542e8b

Branch: refs/heads/asf-site
Commit: 03542e8b79572a416c838ffdbd64851084b7e85f
Parents: 4beee9c f030e2f
Author: Davor Bonaci <da...@google.com>
Authored: Tue Oct 25 21:17:30 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue Oct 25 21:17:30 2016 -0700

----------------------------------------------------------------------
 .gitattributes                   | 23 +++++++++
 .gitignore                       |  3 +-
 .travis.yml                      |  3 +-
 Gemfile                          | 18 +++++--
 Gemfile.lock                     | 83 +++++++++++++++++++++++++++++++
 README.md                        | 94 +++++++++++++++++++++--------------
 _config.yml                      |  7 ++-
 _posts/2016-10-20-test-stream.md | 20 ++++----
 _sass/_syntax-highlighting.scss  |  3 +-
 contribute/contribution-guide.md | 13 ++---
 styles/site.scss                 |  1 +
 11 files changed, 200 insertions(+), 68 deletions(-)
----------------------------------------------------------------------



[3/4] incubator-beam-site git commit: Enable syntax highlighting in @tgroh's blog.

Posted by da...@apache.org.
Enable syntax highlighting in @tgroh's blog.


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/commit/f030e2f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/f030e2f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/f030e2f3

Branch: refs/heads/asf-site
Commit: f030e2f34e906d8d3b165d23cf5119a73ddf1f8d
Parents: c99312a
Author: Frances Perry <fj...@google.com>
Authored: Thu Oct 20 22:06:38 2016 -0700
Committer: Frances Perry <fj...@google.com>
Committed: Fri Oct 21 15:38:22 2016 -0700

----------------------------------------------------------------------
 _posts/2016-10-20-test-stream.md | 20 ++++++++++----------
 _sass/_syntax-highlighting.scss  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/f030e2f3/_posts/2016-10-20-test-stream.md
----------------------------------------------------------------------
diff --git a/_posts/2016-10-20-test-stream.md b/_posts/2016-10-20-test-stream.md
index 2bd3e79..8b7eee7 100644
--- a/_posts/2016-10-20-test-stream.md
+++ b/_posts/2016-10-20-test-stream.md
@@ -111,7 +111,7 @@ For example, if we create a TestStream where all the data arrives before the
 watermark and provide the result PCollection as input to the CalculateTeamScores
 PTransform:
 
-```
+```java
 TestStream<GameActionInfo> infos = TestStream.create(AvroCoder.of(GameActionInfo.class))
     .addElements(new GameActionInfo("sky", "blue", 12, new Instant(0L)),
  ����������������new GameActionInfo("navy", "blue", 3, new Instant(0L)),
@@ -129,7 +129,7 @@ we can then assert that the result PCollection contains elements that arrived:
 
 <img class="center-block" src="{{ "/images/blog/test-stream/elements-all-on-time.png" | prepend: site.baseurl }}" alt="Elements all arrive before the watermark, and are produced in the on-time pane" width="442">
 
-```
+```java
 // Only one value is emitted for the blue team
 PAssert.that(teamScores)
        .inWindow(window)
@@ -145,7 +145,7 @@ of the window (shown below to the left of the red watermark), which demonstrates
 the system to be on time, as it arrives before the watermark passes the end of
 the window
 
-```
+```java
 TestStream<GameActionInfo> infos = TestStream.create(AvroCoder.of(GameActionInfo.class))
     .addElements(new GameActionInfo("sky", "blue", 3, new Instant(0L)),
  �������         new GameActionInfo("navy", "blue", 3, new Instant(0L).plus(Duration.standardMinutes(3))))
@@ -161,7 +161,7 @@ PCollection<KV<String, Integer>> teamScores = p.apply(createEvents)
 
 <img class="center-block" src="{{ "/images/blog/test-stream/elements-unobservably-late.png" | prepend: site.baseurl }}" alt="An element arrives late, but before the watermark passes the end of the window, and is produced in the on-time pane" width="442">
 
-```
+```java
 // Only one value is emitted for the blue team
 PAssert.that(teamScores)
        .inWindow(window)
@@ -175,7 +175,7 @@ By advancing the watermark farther in time before adding the late data, we can
 demonstrate the triggering behavior that causes the system to emit an on-time
 pane, and then after the late data arrives, a pane that refines the result.
 
-```
+```java
 TestStream<GameActionInfo> infos = TestStream.create(AvroCoder.of(GameActionInfo.class))
     .addElements(new GameActionInfo("sky", "blue", 3, new Instant(0L)),
        ����������new GameActionInfo("navy", "blue", 3, new Instant(0L).plus(Duration.standardMinutes(3))))
@@ -191,7 +191,7 @@ PCollection<KV<String, Integer>> teamScores = p.apply(createEvents)
 
 <img class="center-block" src="{{ "/images/blog/test-stream/elements-observably-late.png" | prepend: site.baseurl }}" alt="Elements all arrive before the watermark, and are produced in the on-time pane" width="442">
 
-```
+```java
 // An on-time pane is emitted with the events that arrived before the window closed
 PAssert.that(teamScores)
        .inOnTimePane(window)
@@ -209,7 +209,7 @@ If we push the watermark even further into the future, beyond the maximum
 configured allowed lateness, we can demonstrate that the late element is dropped
 by the system.
 
-```
+```java
 TestStream<GameActionInfo> infos = TestStream.create(AvroCoder.of(GameActionInfo.class))
     .addElements(new GameActionInfo("sky", "blue", 3, Duration.ZERO),
         ���������new GameActionInfo("navy", "blue", 3, Duration.standardMinutes(3)))
@@ -230,7 +230,7 @@ PCollection<KV<String, Integer>> teamScores = p.apply(createEvents)
 
 <img class="center-block" src="{{ "/images/blog/test-stream/elements-droppably-late.png" | prepend: site.baseurl }}" alt="Elements all arrive before the watermark, and are produced in the on-time pane" width="442">
 
-```
+```java
 // An on-time pane is emitted with the events that arrived before the window closed
 PAssert.that(teamScores)
        .inWindow(window)
@@ -245,7 +245,7 @@ triggers by advancing the processing time of the TestStream. If we add elements
 to an input PCollection, occasionally advancing the processing time clock, and
 apply `CalculateUserScores`
 
-```
+```java
 TestStream.create(AvroCoder.of(GameActionInfo.class))
  ���.addElements(new GameActionInfo("scarlet", "red", 3, new Instant(0L)),
  ��������������  new GameActionInfo("scarlet", "red", 2, new Instant(0L).plus(Duration.standardMinutes(1))))
@@ -261,7 +261,7 @@ PCollection<KV<String, Integer>> userScores =
 
 <img class="center-block" src="{{ "/images/blog/test-stream/elements-processing-speculative.png" | prepend: site.baseurl }}" alt="Elements all arrive before the watermark, and are produced in the on-time pane" width="442">
 
-```
+```java
 PAssert.that(userScores)
        .inEarlyGlobalWindowPanes()
        .containsInAnyOrder(KV.of("scarlet", 5),

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/f030e2f3/_sass/_syntax-highlighting.scss
----------------------------------------------------------------------
diff --git a/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss
index a6233bc..b5cd813 100644
--- a/_sass/_syntax-highlighting.scss
+++ b/_sass/_syntax-highlighting.scss
@@ -9,7 +9,7 @@
     }
 
     .c     { color: #998; font-style: italic } // Comment
-    .err   { color: #a61717; background-color: #e3d2d2 } // Error
+    .err   { color: #a61717 } // Error
     .k     { font-weight: bold } // Keyword
     .o     { font-weight: bold } // Operator
     .cm    { color: #998; font-style: italic } // Comment.Multiline


[2/4] incubator-beam-site git commit: Turn on existing syntax highlighting styles.

Posted by da...@apache.org.
Turn on existing syntax highlighting styles.


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/commit/c99312aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/c99312aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/c99312aa

Branch: refs/heads/asf-site
Commit: c99312aab31cb7319d8583cd81a7abd8cc8bdf7a
Parents: b73878c
Author: Frances Perry <fj...@google.com>
Authored: Thu Oct 20 22:01:36 2016 -0700
Committer: Frances Perry <fj...@google.com>
Committed: Fri Oct 21 15:38:22 2016 -0700

----------------------------------------------------------------------
 _sass/_syntax-highlighting.scss | 1 -
 styles/site.scss                | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/c99312aa/_sass/_syntax-highlighting.scss
----------------------------------------------------------------------
diff --git a/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss
index 8fac597..a6233bc 100644
--- a/_sass/_syntax-highlighting.scss
+++ b/_sass/_syntax-highlighting.scss
@@ -3,7 +3,6 @@
  */
 .highlight {
     background: #fff;
-    @extend %vertical-rhythm;
 
     .highlighter-rouge & {
       background: #eef;

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/c99312aa/styles/site.scss
----------------------------------------------------------------------
diff --git a/styles/site.scss b/styles/site.scss
index 2a64459..621be0c 100644
--- a/styles/site.scss
+++ b/styles/site.scss
@@ -2,4 +2,5 @@
 ---
 
 @import "bootstrap";
+@import "_syntax-highlighting";
 @import "capability-matrix";