diff --git a/website/Gemfile b/website/Gemfile index 3b04441c6..405a8c992 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "middleman-hashicorp", "0.3.15" +gem "middleman-hashicorp", "0.3.22" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 6c816d6d5..229218ac9 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -6,7 +6,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - autoprefixer-rails (6.7.7) + autoprefixer-rails (6.7.7.1) execjs bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) @@ -77,7 +77,7 @@ GEM rack (>= 1.4.5, < 2.0) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-hashicorp (0.3.15) + middleman-hashicorp (0.3.22) bootstrap-sass (~> 3.3) builder (~> 3.2) middleman (~> 3.4) @@ -103,7 +103,7 @@ GEM mini_portile2 (2.1.0) minitest (5.10.1) multi_json (1.12.1) - nokogiri (1.7.0.1) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) padrino-helpers (0.12.8.1) i18n (~> 0.6, >= 0.6.7) @@ -138,7 +138,7 @@ GEM turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.0) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) uber (0.0.15) uglifier (2.7.2) @@ -151,7 +151,7 @@ PLATFORMS ruby DEPENDENCIES - middleman-hashicorp (= 0.3.15) + middleman-hashicorp (= 0.3.22) BUNDLED WITH 1.14.6 diff --git a/website/Makefile b/website/Makefile index e9a70a8fa..0e83eb946 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,4 +1,4 @@ -VERSION?="0.3.15" +VERSION?="0.3.22" website: @echo "==> Starting website in Docker..." diff --git a/website/config.rb b/website/config.rb index 78b35bf08..3453fff10 100644 --- a/website/config.rb +++ b/website/config.rb @@ -18,7 +18,7 @@ helpers do end "Nomad by HashiCorp" - end + end # Get the description for the page # @@ -26,7 +26,12 @@ helpers do # # @return [String] def description_for(page) - return escape_html(page.data.description || "") + description = (page.data.description || "") + .gsub('"', '') + .gsub(/\n+/, ' ') + .squeeze(' ') + + return escape_html(description) end # This helps by setting the "active" class for sidebar nav elements @@ -43,10 +48,22 @@ helpers do # Returns the id for this page. # @return [String] def body_id_for(page) - if name = page.data.sidebar_current && !name.blank? + if !(name = page.data.sidebar_current).blank? return "page-#{name.strip}" end - return "page-home" + if page.url == "/" || page.url == "/index.html" + return "page-home" + end + if !(title = page.data.page_title).blank? + return title + .downcase + .gsub('"', '') + .gsub(/[^\w]+/, '-') + .gsub(/_+/, '-') + .squeeze('-') + .squeeze(' ') + end + return "" end # Returns the list of classes for this page. @@ -54,10 +71,21 @@ helpers do def body_classes_for(page) classes = [] - if page && page.data.layout + if !(layout = page.data.layout).blank? classes << "layout-#{page.data.layout}" end + if !(title = page.data.page_title).blank? + title = title + .downcase + .gsub('"', '') + .gsub(/[^\w]+/, '-') + .gsub(/_+/, '-') + .squeeze('-') + .squeeze(' ') + classes << "page-#{title}" + end + return classes.join(" ") end end diff --git a/website/packer.json b/website/packer.json index d286e6ef5..35de63232 100644 --- a/website/packer.json +++ b/website/packer.json @@ -8,7 +8,7 @@ "builders": [ { "type": "docker", - "image": "hashicorp/middleman-hashicorp:0.3.15", + "image": "hashicorp/middleman-hashicorp:0.3.22", "discard": "true", "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"] } diff --git a/website/source/assets/images/caret-green.png b/website/source/assets/images/caret-green.png deleted file mode 100644 index a56cbf13b..000000000 Binary files a/website/source/assets/images/caret-green.png and /dev/null differ diff --git a/website/source/assets/images/caret-green@2x.png b/website/source/assets/images/caret-green@2x.png deleted file mode 100644 index f94fbd6c6..000000000 Binary files a/website/source/assets/images/caret-green@2x.png and /dev/null differ diff --git a/website/source/assets/images/caret-light.png b/website/source/assets/images/caret-light.png deleted file mode 100644 index d468d8022..000000000 Binary files a/website/source/assets/images/caret-light.png and /dev/null differ diff --git a/website/source/assets/images/caret-light@2x.png b/website/source/assets/images/caret-light@2x.png deleted file mode 100644 index ca8339dc2..000000000 Binary files a/website/source/assets/images/caret-light@2x.png and /dev/null differ diff --git a/website/source/assets/images/caret-white.png b/website/source/assets/images/caret-white.png deleted file mode 100644 index 2954ff95b..000000000 Binary files a/website/source/assets/images/caret-white.png and /dev/null differ diff --git a/website/source/assets/images/caret-white@2x.png b/website/source/assets/images/caret-white@2x.png deleted file mode 100644 index be8d4d31b..000000000 Binary files a/website/source/assets/images/caret-white@2x.png and /dev/null differ diff --git a/website/source/assets/images/favicon.png b/website/source/assets/images/favicon.png deleted file mode 100644 index 4e3185197..000000000 Binary files a/website/source/assets/images/favicon.png and /dev/null differ diff --git a/website/source/assets/images/favicon@2x.png b/website/source/assets/images/favicon@2x.png deleted file mode 100644 index 5791bc7ca..000000000 Binary files a/website/source/assets/images/favicon@2x.png and /dev/null differ diff --git a/website/source/assets/images/hashi-logo.png b/website/source/assets/images/hashi-logo.png deleted file mode 100644 index ba63515a7..000000000 Binary files a/website/source/assets/images/hashi-logo.png and /dev/null differ diff --git a/website/source/assets/images/hashi-logo@2x.png b/website/source/assets/images/hashi-logo@2x.png deleted file mode 100644 index 82fcd67f8..000000000 Binary files a/website/source/assets/images/hashi-logo@2x.png and /dev/null differ diff --git a/website/source/assets/images/icon-download.png b/website/source/assets/images/icon-download.png deleted file mode 100644 index eb32ebf93..000000000 Binary files a/website/source/assets/images/icon-download.png and /dev/null differ diff --git a/website/source/assets/images/icon-download@2x.png b/website/source/assets/images/icon-download@2x.png deleted file mode 100644 index 308dac588..000000000 Binary files a/website/source/assets/images/icon-download@2x.png and /dev/null differ diff --git a/website/source/assets/images/icon-github.png b/website/source/assets/images/icon-github.png deleted file mode 100644 index 997f47265..000000000 Binary files a/website/source/assets/images/icon-github.png and /dev/null differ diff --git a/website/source/assets/images/icon-github@2x.png b/website/source/assets/images/icon-github@2x.png deleted file mode 100644 index a2fb6d162..000000000 Binary files a/website/source/assets/images/icon-github@2x.png and /dev/null differ diff --git a/website/source/assets/images/logo-text.svg b/website/source/assets/images/logo-text.svg index 0f9b3a5bd..425ff6ed2 100644 --- a/website/source/assets/images/logo-text.svg +++ b/website/source/assets/images/logo-text.svg @@ -1,22 +1,9 @@ - -
-
+
- <%= image_tag "fastly_logo.png" %> + <%= inline_svg "fastly.svg", height: 50 %>
diff --git a/website/source/index.html.erb b/website/source/index.html.erb index 03ed66e0e..9179e4f2c 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -1,146 +1,144 @@ - -
-
-
-
-
-
-
- - - -
-
-
-
-
-
-

Easily deploy applications at any scale

-

A Distributed, Highly Available, Datacenter-Aware Scheduler

- -
-
-
-
-
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+

Easily deploy applications at any scale

+

A Distributed, Highly Available, Datacenter-Aware Scheduler

+ +
+
+
+
+
-
-
-
-

Overview

+
+
+
+

Overview

-
-
-

Easily Deploy

-

- Users submit simple high-level jobs and Nomad handles - scheduling, deploying and upgrading applications. -

-
-
-
-

Nomad makes it easy to deploy one container or thousands.

- -
-
+
+
+

Easily Deploy

+

+ Users submit simple high-level jobs and Nomad handles + scheduling, deploying and upgrading applications. +

+
+
+
+

Nomad makes it easy to deploy one container or thousands.

+ +
+
-
-
-
-

Any Cloud or Every Cloud

-
-
-

- Multi-Datacenter and Multi-Region support enables running applications - on any cloud, public or private. -

-
-
-
-
-
- -
-
- - - - -
-
-
-
+
+
+
+

Any Cloud or Every Cloud

+
+
+

+ Multi-Datacenter and Multi-Region support enables running applications + on any cloud, public or private. +

+
+
+
+
+
+ +
+
+ + + + +
+
+
+
-
-
-

Flexible Workloads

-

- Nomad has extensible support for task drivers, allowing it to run - containerized, virtualized, and standalone applications. Users can easily - start Docker containers, VMs, or application runtimes like Java. Nomad - supports Linux, Windows, BSD and OSX, providing the flexibility to run - any workload. -

-
-
-
+
+
+

Flexible Workloads

+

+ Nomad has extensible support for task drivers, allowing it to run + containerized, virtualized, and standalone applications. Users can easily + start Docker containers, VMs, or application runtimes like Java. Nomad + supports Linux, Windows, BSD and OSX, providing the flexibility to run + any workload. +

+
+
+
-
-
-
-
-

Simplify Operations

-
-
-
-
-

- Nomad simplifies operations by supporting blue/green deployments, - automatically handling machine failures, and providing a single workflow - to deploy applications. -

-
-
-
-
-
+
+
+
+
+

Simplify Operations

+
+
+
+
+

+ Nomad simplifies operations by supporting blue/green deployments, + automatically handling machine failures, and providing a single workflow + to deploy applications. +

+
+
+
+
+
-
-
-

Increase Density, Reduce Cost

-

Nomad packs applications onto servers to maximize resource utilization, increase density, and reduce costs.

-
-
-
- -
-
-
-
+
+
+

Increase Density, Reduce Cost

+

Nomad packs applications onto servers to maximize resource utilization, increase density, and reduce costs.

+
+
+
+
+
+
+
diff --git a/website/source/layouts/_announcement-bnr.erb b/website/source/layouts/_announcement-bnr.erb deleted file mode 100644 index b24fd71ad..000000000 --- a/website/source/layouts/_announcement-bnr.erb +++ /dev/null @@ -1,14 +0,0 @@ -
-
-
-
-

- Nomad scheduled 1 million containers on 5,000 hosts in under 5 minutes. - - Find out more - -

-
-
-
-
diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb deleted file mode 100644 index 6bd649e88..000000000 --- a/website/source/layouts/_footer.erb +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - -<%= javascript_include_tag "application" %> - - - - - diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb deleted file mode 100644 index 54d13202d..000000000 --- a/website/source/layouts/_header.erb +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/website/source/layouts/_meta.erb b/website/source/layouts/_meta.erb deleted file mode 100644 index c27b1f82c..000000000 --- a/website/source/layouts/_meta.erb +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - <%= title_for(current_page) %> - - <%= stylesheet_link_tag "application" %> - - - - - - - - - - - - <%= yield_content :head %> - - - - - - diff --git a/website/source/layouts/_sidebar.erb b/website/source/layouts/_sidebar.erb index 4387a153d..aadd63fca 100644 --- a/website/source/layouts/_sidebar.erb +++ b/website/source/layouts/_sidebar.erb @@ -1,20 +1,30 @@
-