diff --git a/website/Gemfile b/website/Gemfile index f9b604b3c..08e6fe65e 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "middleman-hashicorp", "0.3.12" +gem "middleman-hashicorp", "0.3.13" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index ff3b5b7b0..0811f6d62 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -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.12) + middleman-hashicorp (0.3.13) bootstrap-sass (~> 3.3) builder (~> 3.2) middleman (~> 3.4) @@ -151,7 +151,7 @@ PLATFORMS ruby DEPENDENCIES - middleman-hashicorp (= 0.3.12) + middleman-hashicorp (= 0.3.13) BUNDLED WITH 1.14.6 diff --git a/website/Makefile b/website/Makefile index 91a898c3a..41fcf114e 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,4 +1,4 @@ -VERSION?="0.3.12" +VERSION?="0.3.13" website: @echo "==> Starting website in Docker..." diff --git a/website/packer.json b/website/packer.json index b8068d9f4..b51f63801 100644 --- a/website/packer.json +++ b/website/packer.json @@ -8,7 +8,7 @@ "builders": [ { "type": "docker", - "image": "hashicorp/middleman-hashicorp:0.3.12", + "image": "hashicorp/middleman-hashicorp:0.3.13", "discard": "true", "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"] } diff --git a/website/source/assets/javascripts/application.js b/website/source/assets/javascripts/application.js index 1e3f2f03e..ae13f1620 100644 --- a/website/source/assets/javascripts/application.js +++ b/website/source/assets/javascripts/application.js @@ -3,6 +3,8 @@ //= require lib/_Base +//= require hashicorp/mega-nav + //= require app/_app //= require app/_docs //= require app/_sidebar diff --git a/website/source/assets/stylesheets/_global.scss b/website/source/assets/stylesheets/_global.scss index 0cb5abbf7..0c075ed01 100644 --- a/website/source/assets/stylesheets/_global.scss +++ b/website/source/assets/stylesheets/_global.scss @@ -8,8 +8,9 @@ text-rendering: optimizeLegibility; }*/ body { - font-size: 18px; color: $black; + font-family: $font-family-open-sans; + font-size: 18px; font-weight: 400; } @@ -34,10 +35,6 @@ h3 { line-height: 1.2; } -p, a { - font-family: $font-family-open-sans; -} - .highlight{ margin-bottom: 18px; } diff --git a/website/source/assets/stylesheets/_home.scss b/website/source/assets/stylesheets/_home.scss index 09aecc1d4..1fdf6d4f8 100644 --- a/website/source/assets/stylesheets/_home.scss +++ b/website/source/assets/stylesheets/_home.scss @@ -4,11 +4,6 @@ color: $purple-text; font-family: $font-family-klavika; text-transform: uppercase; - text-align: center; - } - - p { - color: $purple-text; } .hero { @@ -52,6 +47,8 @@ h2 { color: $blue-text; + text-align: center; + } hgroup { @@ -61,12 +58,17 @@ h3 { font-weight: bold; margin-bottom: $baseline; + text-align: center; } h4 { font-size: 20px; + text-align: center; line-height: $baseline * 1.5; } + p { + color: $purple-text; + } } } @@ -76,6 +78,7 @@ h2 { color: $white; + text-align: center; } pre { @@ -93,6 +96,7 @@ h2 { color: $dark-gray-text; + text-align: center; } .customer-logos { diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index 43d7006ea..dc2ac3bdb 100644 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -6,6 +6,9 @@ @import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,600"); @import url("//fonts.googleapis.com/css?family=Inconsolata:400,700"); +// Mega Nav +@import 'hashicorp/mega-nav'; + // Core variables and mixins @import "_variables"; diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index e68944c37..4579217d3 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -49,7 +49,6 @@