Merge branch 'master' into master

Dockerfile

@@ -0,0 +1,9 @@
+FROM emberjs/website-dev:latest
+
+# Customizations for this project here.
+# e.g.: if you have dependencies in addition to what the base image provides:
+ADD Gemfile /src/Gemfile
+ADD Gemfile.lock /src/Gemfile.lock
+RUN bundle install
+
+ADD . /src

Gemfile

@@ -16,8 +16,12 @@ gem "underscore-rails"
 gem "gmaps4rails"
 gem "geocoder"
 gem "faraday"
-gem "bourbon"
-gem "neat"
+gem "bourbon", "~> 4.2.7"
+gem "neat", "~> 1.8.0"
+gem 'bootstrap-sass', '~> 3.3.7'
+gem 'sass-rails', '>= 3.2'
+gem 'middleman-bootstrap-navbar'
+gem 'eventmachine', '1.0.9.1'
 
 group :development, :test do
   gem 'pry'
@@ -31,5 +35,5 @@ group :test do
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin]
-gem 'wdm', '>= 0.1.0', platforms: [:mingw, :mswin]
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
+gem 'wdm', '>= 0.1.0', platforms: [:mingw, :mswin, :x64_mingw]

Gemfile.lock

@@ -16,12 +16,32 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
     activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
+    autoprefixer-rails (7.2.5)
+      execjs
+    bootstrap-navbar (3.0.0)
+      gem_config (~> 0.3)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     bourbon (4.2.7)
       sass (~> 3.4)
       thor (~> 0.19)
@@ -54,15 +74,19 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    crass (1.0.3)
     daemons (1.2.4)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.2.3)
+    eventmachine (1.0.9.1)
     execjs (2.6.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
+    ffi (1.9.10-x64-mingw32)
+    ffi (1.9.10-x86-mingw32)
+    gem_config (0.3.1)
     geocoder (1.2.12)
     gmaps4rails (2.1.2)
     haml (5.0.1)
@@ -78,6 +102,9 @@ GEM
     listen (3.0.4)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
     method_source (0.8.2)
     middleman (3.4.0)
       coffee-script (~> 2.2)
@@ -94,6 +121,9 @@ GEM
       addressable (~> 2.3.5)
       middleman-core (~> 3.2)
       tzinfo (>= 0.3.0)
+    middleman-bootstrap-navbar (4.0.0)
+      bootstrap-navbar (~> 3.0)
+      middleman (>= 3.1)
     middleman-core (3.4.0)
       activesupport (~> 4.1)
       bundler (~> 1.1)
@@ -112,15 +142,19 @@ GEM
       sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.3.0)
     mime-types (2.6.2)
-    mini_portile2 (2.2.0)
+    mini_portile2 (2.3.0)
     minitest (5.10.2)
     multi_json (1.11.2)
     multipart-post (2.0.0)
     neat (1.8.0)
       sass (>= 3.3)
       thor (~> 0.19)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.1-x64-mingw32)
+      mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.1-x86-mingw32)
+      mini_portile2 (~> 2.3.0)
     padrino-helpers (0.12.5)
       i18n (~> 0.6, >= 0.6.7)
       padrino-support (= 0.12.5)
@@ -136,12 +170,45 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry (0.9.12.6-i386-mingw32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    pry (0.9.12.6-i386-mswin32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    pry (0.9.12.6-x86-mingw32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    pry (0.9.12.6-x86-mswin32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
     pry-byebug (1.3.2)
       byebug (~> 2.7)
       pry (~> 0.9.12)
     rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
@@ -161,6 +228,12 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.0)
     sass (3.4.19)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     slop (3.6.0)
     sprockets (2.12.4)
       hike (~> 1.2)
@@ -169,6 +242,10 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
@@ -182,26 +259,36 @@ GEM
     tilt (1.4.1)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2017.3)
+      tzinfo (>= 1.0.0)
     uber (0.0.15)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.8.3)
+    wdm (0.1.1)
     websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
+    win32console (1.3.2-x86-mingw32)
+    win32console (1.3.2-x86-mswin32-60)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
+  x64-mingw32
+  x86-mingw32
+  x86-mswin32
 
 DEPENDENCIES
   activesupport
-  bourbon
+  bootstrap-sass (~> 3.3.7)
+  bourbon (~> 4.2.7)
   builder
   capybara
   coderay!
+  eventmachine (= 1.0.9.1)
   faraday
   geocoder
   gmaps4rails
@@ -210,18 +297,20 @@ DEPENDENCIES
   middleman (~> 3.0)
   middleman-alias!
   middleman-blog (~> 3.0)
-  neat
+  middleman-bootstrap-navbar
+  neat (~> 1.8.0)
   poltergeist
   pry
   pry-byebug
   rack
   rake
   redcarpet
   rspec
+  sass-rails (>= 3.2)
   thin
   tzinfo-data
   underscore-rails
   wdm (>= 0.1.0)
 
 BUNDLED WITH
-   1.15.1
+   1.16.1

README.md

@@ -1,12 +1,38 @@
 ## Ember Website
 [![Build Status](https://travis-ci.org/emberjs/website.svg?branch=master)](https://travis-ci.org/emberjs/website)
 
-The website for the Ember.js project.
+This repository contains the source code and content for the [Ember.js project main website](https://emberjs.com).
 
 ### Contributing
 
 To get started:
 
+## Running locally with Docker (recommended)
+
+This is the recommended method for new contributors.
+Although the website is built with Ruby, most work is done in Markdown files.
+You don't need to know Ruby or install its dependencies to help out. Follow
+the Docker container instructions below to install and run locally.
+
+First, install [Docker and Compose](https://store.docker.com/search?offering=community&type=edition) and leave it running.
+
+Next, the commands below will install all necessary dependencies for the website
+app and start a server. This will take a little while to run,
+possibly a few minutes. The dependencies will be installed inside a Docker
+container, and do not affect your normal developer environment. 
+
+```sh
+git clone git://github.com/emberjs/website.git
+cd website
+docker-compose build
+docker-compose up
+```
+Subsequent runs will be much faster once all the dependencies are installed. 
+
+You can view the site locally at [http://localhost:4567](http://localhost:4567)
+
+## Running locally with Ruby and Middleman
+
 ``` sh
 git clone https://github.com/emberjs/website.git
 cd website
@@ -36,7 +62,7 @@ API documentation has been moved to a separate repo, please see https://github.c
 
 ### Requirements
 
-If the `bundle` command is not found, you can install it with `gem install bundle`.
+If the `bundle` command is not found, you can install it with `gem install bundler`.
 
 If the `bundle` command fails to run, you may need to upgrade your Ruby version. Please check the current supported version that described at [.ruby-version](https://github.com/emberjs/website/blob/master/.ruby-version).
 You can use [RVM](https://rvm.io/) to install it:

config.rb

@@ -19,7 +19,9 @@
   'tomster-sm.png',
   'tomster-twitter-card.png'
 ]
-
+activate :bootstrap_navbar do |bootstrap_navbar|
+  bootstrap_navbar.bootstrap_version = '3.3.7'
+end
 activate :directory_indexes
 activate :toc
 activate :sponsors