Merge pull request #3118 from katiebayes/master

Add enterprise badges and update middleman version

website/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "middleman-hashicorp", "0.3.22"
+gem "middleman-hashicorp", "0.3.26"

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.1)
+    autoprefixer-rails (7.1.1)
       execjs
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
@@ -42,14 +42,15 @@ GEM
     eventmachine (1.2.3)
     execjs (2.7.0)
     ffi (1.9.18)
-    haml (4.0.7)
+    haml (5.0.1)
+      temple (>= 0.8.0)
       tilt
     hike (1.2.3)
     hooks (0.4.1)
       uber (~> 0.0.14)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
-    json (2.0.3)
+    json (2.1.0)
     kramdown (1.13.2)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -77,7 +78,7 @@ GEM
       rack (>= 1.4.5, < 2.0)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
-    middleman-hashicorp (0.3.22)
+    middleman-hashicorp (0.3.26)
       bootstrap-sass (~> 3.3)
       builder (~> 3.2)
       middleman (~> 3.4)
@@ -100,18 +101,18 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
     multi_json (1.12.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     padrino-helpers (0.12.8.1)
       i18n (~> 0.6, >= 0.6.7)
       padrino-support (= 0.12.8.1)
       tilt (~> 1.4.1)
     padrino-support (0.12.8.1)
       activesupport (>= 3.1)
-    rack (1.6.5)
+    rack (1.6.8)
     rack-livereload (0.3.16)
       rack
     rack-test (0.6.3)
@@ -121,7 +122,7 @@ GEM
       ffi (>= 0.5.0)
     redcarpet (3.4.0)
     rouge (2.0.7)
-    sass (3.4.23)
+    sass (3.4.24)
     sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -132,26 +133,27 @@ GEM
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
+    temple (0.8.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (1.4.1)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
+    turbolinks-source (5.0.3)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uber (0.0.15)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    xpath (2.0.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman-hashicorp (= 0.3.22)
+  middleman-hashicorp (= 0.3.26)
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

website/source/assets/stylesheets/_variables.scss

@@ -47,6 +47,7 @@ $header-font-size: $font-size - 2;
 $header-height: 92px;
 $header-link-color: rgba($white, 0.85);
 $header-link-color-hover: $white;
+$header-font-family: $font-family-klavika;
 
 // Footer
 $footer-font-size: $font-size - 2;

website/source/assets/stylesheets/application.scss

@@ -9,6 +9,9 @@
 // Anchor links
 @import 'hashicorp/anchor-links';
 
+// Enterprise Badges
+@import 'hashicorp/enterprise-badges';
+
 // Core variables and mixins
 @import '_variables';
 
@@ -30,4 +33,4 @@
 @import "_community";
 @import "_docs";
 @import "_downloads";
-@import "_home";
+@import "_home";

website/source/docs/commands/operator/area.html.markdown.erb

@@ -10,8 +10,10 @@ description: >
 
 Command: `consul operator area`
 
-~> The network area functionality described here is available only in
-   [Consul Enterprise](https://www.hashicorp.com/products/consul/) version 0.8.0 and later.
+[//]: # ( ~> The network area functionality described here is available only in )
+[//]: # (   [Consul Enterprise](https://www.hashicorp.com/products/consul/) version 0.8.0 and later. )
+
+<%= enterprise_alert :consul %>
 
 Consul Enterprise version supports network areas, which are operator-defined relationships
 between servers in two different Consul datacenters. The operator area command is used to

website/source/docs/guides/areas.html.markdown.erb

@@ -9,8 +9,10 @@ description: |-
 # Multiple Datacenters
 ## Advanced Federation with Network Areas
 
-~> The network area functionality described here is available only in
-   [Consul Enterprise](https://www.hashicorp.com/products/consul/) version 0.8.0 and later.
+[//]: # ( ~> The network area functionality described here is available only in )
+[//]: # (   [Consul Enterprise](https://www.hashicorp.com/products/consul/) version 0.8.0 and later. )
+
+<%= enterprise_alert :consul %>
 
 One of the key features of Consul is its support for multiple datacenters.
 The [architecture](/docs/internals/architecture.html) of Consul is designed to