From 2c3736bbe2a17216d1b8b0689fb4dfa27ee843ab Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Wed, 8 Mar 2017 17:25:55 -0800 Subject: [PATCH 1/3] website: add squashed mega-nav work --- website/Gemfile | 2 +- website/Gemfile.lock | 4 ++-- website/Makefile | 2 +- website/packer.json | 2 +- .../source/assets/javascripts/application.js | 2 ++ .../assets/stylesheets/application.scss | 6 ++++-- website/source/layouts/inner.erb | 2 +- website/source/layouts/layout.erb | 21 ++----------------- 8 files changed, 14 insertions(+), 27 deletions(-) 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 b33ed96f0..7cdd54c36 100644 --- a/website/source/assets/javascripts/application.js +++ b/website/source/assets/javascripts/application.js @@ -12,6 +12,8 @@ //= require lib/Chainable //= require lib/dbg +//= require hashicorp/mega-nav + //= require app/Sidebar //= require app/DotLockup //= require app/Init diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index 3548a0ccb..6f972dbe7 100755 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -1,8 +1,7 @@ @import 'bootstrap-sprockets'; @import 'bootstrap'; -// Remote fonts -@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600'); +@import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,700|Open+Sans:300,600,400|Ubuntu+Mono"); // Core variables and mixins @import '_variables'; @@ -10,6 +9,9 @@ //Global Site @import '_global'; +//Mega Nav +@import 'hashicorp/mega-nav'; + // Hashicorp Shared Project Styles @import 'hashicorp-shared/_hashicorp-utility'; @import 'hashicorp-shared/_project-utility'; diff --git a/website/source/layouts/inner.erb b/website/source/layouts/inner.erb index 55f71bbaf..d25e1bc5d 100644 --- a/website/source/layouts/inner.erb +++ b/website/source/layouts/inner.erb @@ -1,7 +1,7 @@ <% wrap_layout :layout do %>
-
+
<%= yield_content :sidebar %>
diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index 488bce8fc..6a9ebc978 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -37,24 +37,8 @@ -
-
-
-
-

- Announcing - - Secure Infrastructure Automation. - - Find out more - -

-
-
-
-
+ + <%= mega_nav :vault %>