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/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 09cc5d6e1..73472f521 100644 --- a/website/source/assets/javascripts/application.js +++ b/website/source/assets/javascripts/application.js @@ -1,7 +1,10 @@ //= require jquery +//= require bootstrap //= require lib/Base +//= require hashicorp/mega-nav + //= require docs //= require app/Sidebar ////= require app/Init diff --git a/website/source/assets/stylesheets/_styles.scss b/website/source/assets/stylesheets/_styles.scss index beac0f638..b82a58a6a 100644 --- a/website/source/assets/stylesheets/_styles.scss +++ b/website/source/assets/stylesheets/_styles.scss @@ -95,10 +95,6 @@ p { color: darken($green, 50%); } } - - img { - width: 100%; - } } a { diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index adf278595..b774fab2d 100644 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -3,6 +3,9 @@ @import url("//fonts.googleapis.com/css?family=Inconsolata|Open+Sans:300,400,600"); +// Mega Nav +@import 'hashicorp/mega-nav'; + @import "_helpers"; @import "_reset"; diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index db61fc82e..6ae7d7262 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -34,12 +34,14 @@ + + <%= mega_nav :packer %> +