From 84dfbdfac69b81ea9c74e181387f675b2d761a5a Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Fri, 3 Mar 2017 10:56:16 -0800 Subject: [PATCH 1/6] Add mega nav :zap: --- website/source/assets/javascripts/application.js | 2 ++ website/source/assets/stylesheets/application.scss | 3 +++ website/source/layouts/layout.erb | 1 + 3 files changed, 6 insertions(+) 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/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/layout.erb b/website/source/layouts/layout.erb index 0b46a4278..c91723a47 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -1,3 +1,4 @@ +<%= mega_nav :vagrant %> <%= partial "layouts/header" %> <%= partial "layouts/sidebar" %> <%= yield %> From 6a0470fdaa3cf7f3a8c4d4812efadc33be4fb531 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:15:40 -0800 Subject: [PATCH 2/6] Scope

color to avoid meganav conflict --- website/source/assets/stylesheets/_home.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/website/source/assets/stylesheets/_home.scss b/website/source/assets/stylesheets/_home.scss index 09aecc1d4..764861ca3 100644 --- a/website/source/assets/stylesheets/_home.scss +++ b/website/source/assets/stylesheets/_home.scss @@ -7,10 +7,6 @@ text-align: center; } - p { - color: $purple-text; - } - .hero { @include padded; background: $gray-background image-url("vagrant_header_background.png") no-repeat center -20px; @@ -67,6 +63,9 @@ font-size: 20px; line-height: $baseline * 1.5; } + p { + color: $purple-text; + } } } From 41223f9c18514eb9641949a964f98abb85c174d9 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:18:29 -0800 Subject: [PATCH 3/6] Remove 'by hashicorp' --- website/source/layouts/_header.erb | 1 - 1 file changed, 1 deletion(-) 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 @@

- by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>HashiCorp