diff --git a/website/Gemfile b/website/Gemfile deleted file mode 100644 index 405a8c992..000000000 --- a/website/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "middleman-hashicorp", "0.3.22" diff --git a/website/Gemfile.lock b/website/Gemfile.lock deleted file mode 100644 index 229218ac9..000000000 --- a/website/Gemfile.lock +++ /dev/null @@ -1,157 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (4.2.8) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - autoprefixer-rails (6.7.7.1) - execjs - bootstrap-sass (3.3.7) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - builder (3.2.3) - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - chunky_png (1.3.8) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - erubis (2.7.0) - eventmachine (1.2.3) - execjs (2.7.0) - ffi (1.9.18) - haml (4.0.7) - 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) - kramdown (1.13.2) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - middleman (3.4.1) - coffee-script (~> 2.2) - compass (>= 1.0.0, < 2.0.0) - compass-import-once (= 1.0.5) - execjs (~> 2.0) - haml (>= 4.0.5) - kramdown (~> 1.2) - middleman-core (= 3.4.1) - middleman-sprockets (>= 3.1.2) - sass (>= 3.4.0, < 4.0) - uglifier (~> 2.5) - middleman-core (3.4.1) - activesupport (~> 4.1) - bundler (~> 1.1) - capybara (~> 2.4.4) - erubis - hooks (~> 0.3) - i18n (~> 0.7.0) - listen (~> 3.0.3) - padrino-helpers (~> 0.12.3) - rack (>= 1.4.5, < 2.0) - thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1, < 2.0) - middleman-hashicorp (0.3.22) - bootstrap-sass (~> 3.3) - builder (~> 3.2) - middleman (~> 3.4) - middleman-livereload (~> 3.4) - middleman-syntax (~> 3.0) - redcarpet (~> 3.3) - turbolinks (~> 5.0) - middleman-livereload (3.4.6) - em-websocket (~> 0.5.1) - middleman-core (>= 3.3) - rack-livereload (~> 0.3.15) - middleman-sprockets (3.5.0) - middleman-core (>= 3.3) - sprockets (~> 2.12.1) - sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.3.0) - middleman-syntax (3.0.0) - middleman-core (>= 3.2) - rouge (~> 2.0) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) - minitest (5.10.1) - multi_json (1.12.1) - nokogiri (1.7.1) - mini_portile2 (~> 2.1.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-livereload (0.3.16) - rack - rack-test (0.6.3) - rack (>= 1.0) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) - redcarpet (3.4.0) - rouge (2.0.7) - sass (3.4.23) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.1.0) - sprockets (~> 2.0) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) - 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) - 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) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - middleman-hashicorp (= 0.3.22) - -BUNDLED WITH - 1.14.6 diff --git a/website/source/assets/stylesheets/_variables.scss b/website/source/assets/stylesheets/_variables.scss index c0e2889d9..e90216f95 100755 --- a/website/source/assets/stylesheets/_variables.scss +++ b/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; diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index abdc28f68..c5f439e34 100644 --- a/website/source/assets/stylesheets/application.scss +++ b/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"; \ No newline at end of file diff --git a/website/source/docs/commands/operator/area.html.markdown.erb b/website/source/docs/commands/operator/area.html.markdown.erb index c355995be..cb93d5957 100644 --- a/website/source/docs/commands/operator/area.html.markdown.erb +++ b/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 diff --git a/website/source/docs/guides/areas.html.md b/website/source/docs/guides/areas.html.markdown.erb similarity index 96% rename from website/source/docs/guides/areas.html.md rename to website/source/docs/guides/areas.html.markdown.erb index ff73ddd50..a10574495 100644 --- a/website/source/docs/guides/areas.html.md +++ b/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