From 6ea766545188925bdb8814976b0da96d595ae791 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Fri, 3 Mar 2017 08:26:24 -0800 Subject: [PATCH 1/9] Remove unnecessary font --- website/source/assets/stylesheets/application.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index a4ce07f3e..b4a889f4d 100644 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -3,7 +3,7 @@ @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"); // Core variables and mixins @import "_variables"; From fd05c1826c8a6b6743eea33319453fb97ceceaa3 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Fri, 3 Mar 2017 08:39:55 -0800 Subject: [PATCH 2/9] Add meganav --- website/source/assets/javascripts/application.coffee | 2 ++ website/source/assets/stylesheets/application.scss | 3 +++ website/source/layouts/_header.erb | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/website/source/assets/javascripts/application.coffee b/website/source/assets/javascripts/application.coffee index 8221cd501..9f94cfd04 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/application.scss b/website/source/assets/stylesheets/application.scss index b4a889f4d..a3bcb6917 100644 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -5,6 +5,9 @@ // Remote fonts @import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,600"); +// 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 cb9095215..222fa6f1d 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -43,7 +43,8 @@
"> - <%= partial "layouts/announcement-bnr" %> + <%= mega_nav :consul %> +
From 2de9f8a80b5fdacb69ae7fce6e5aa118cafdd8e8 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:01:13 -0800 Subject: [PATCH 3/9] Update middleman-hashicorp --- website/Gemfile.lock | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/website/Gemfile.lock b/website/Gemfile.lock index ff3b5b7b0..45bb4f553 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,3 +1,15 @@ +GIT + remote: https://github.com/hashicorp/middleman-hashicorp.git + revision: 8a95c5854a4497fdb81ebf9f82103010691a1fa2 + specs: + middleman-hashicorp (0.3.10) + bootstrap-sass (~> 3.3) + builder (~> 3.2) + middleman (~> 3.4) + middleman-livereload (~> 3.4) + middleman-syntax (~> 3.0) + redcarpet (~> 3.3) + GEM remote: https://rubygems.org/ specs: From cb2dd2a90775049b92a19f686b3da1edcd8bbd30 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:03:00 -0800 Subject: [PATCH 4/9] Remove announcement banner --- website/source/assets/stylesheets/application.scss | 1 - website/source/layouts/_header.erb | 1 - 2 files changed, 2 deletions(-) diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index a3bcb6917..ad1c17c4a 100644 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -24,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 222fa6f1d..9bdb228e0 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -44,7 +44,6 @@
"> <%= mega_nav :consul %> -
From bed54f332fb5971e164d1dc47980141e6cbfe98c Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:04:50 -0800 Subject: [PATCH 5/9] 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 9bdb228e0..1e3a97c61 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -50,7 +50,6 @@
- by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp