diff --git a/website/Gemfile b/website/Gemfile index f9b604b3c6..08e6fe65e5 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 ff3b5b7b0b..0811f6d62e 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 91a898c3a7..41fcf114ed 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 b8068d9f4e..b51f638015 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.coffee b/website/source/assets/javascripts/application.coffee index 8221cd501a..9f94cfd047 100644 --- a/website/source/assets/javascripts/application.coffee +++ b/website/source/assets/javascripts/application.coffee @@ -9,3 +9,5 @@ #= require _app/app #= require _app/homepage #= require _app/util + +#= require hashicorp/mega-nav diff --git a/website/source/assets/stylesheets/_global.scss b/website/source/assets/stylesheets/_global.scss index 46319707b3..c719032b6a 100755 --- a/website/source/assets/stylesheets/_global.scss +++ b/website/source/assets/stylesheets/_global.scss @@ -10,6 +10,7 @@ text-rendering: optimizeLegibility; body { font-size: 15px; color: $black; + font-family: $font-family-open-sans; font-weight: 300; } @@ -32,7 +33,7 @@ h3{ } p, a, input, .alert { - font-family: $font-family-open-sans; + } //an alternative color for buttons in the doc body diff --git a/website/source/assets/stylesheets/_jumbotron.scss b/website/source/assets/stylesheets/_jumbotron.scss index 309746185c..c2d3004d60 100755 --- a/website/source/assets/stylesheets/_jumbotron.scss +++ b/website/source/assets/stylesheets/_jumbotron.scss @@ -47,7 +47,7 @@ -webkit-backface-visibility:hidden; .jumbo-logo-wrap{ - margin-top: 135px; + margin-top: 155px; .jumbo-logo{ width: 318px; diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index a4ce07f3e6..ad1c17c4a9 100644 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -3,7 +3,10 @@ @import "bootstrap"; // Remote fonts -@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Open+Sans:300,400,600"); +@import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,600"); + +// Mega Nav +@import 'hashicorp/mega-nav'; // Core variables and mixins @import "_variables"; @@ -21,7 +24,6 @@ @import 'hashicorp-shared/_hashicorp-sidebar'; // Components -@import '_announcement-bnr'; @import "_header"; @import '_footer'; @import "_jumbotron"; diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index cb90952152..1e3a97c616 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -43,14 +43,13 @@