luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Merge pull request #2461 from jasoncostello/website-add-meganav

Browse source 
Website add meganav
This commit is contained in:
Jack Pearkes 2017-03-08 17:38:50 -08:00 committed by GitHub
parent b066f1ff72 012c8f6c2f
commit 838dc4319c
8 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
website/Gemfile
View file

@ -1,3 +1,3 @@
source "https://rubygems.org"
gem "middleman-hashicorp", "0.3.12"
gem "middleman-hashicorp", "0.3.13"

4
website/Gemfile.lock
View file

@ -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

2
website/Makefile
View file

@ -1,4 +1,4 @@
VERSION?="0.3.12"
VERSION?="0.3.13"
website:
@echo "==> Starting website in Docker..."

2
website/packer.json
View file

@ -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"]
}

2
website/source/assets/javascripts/application.js
View file

@ -12,6 +12,8 @@
//= require lib/Chainable
//= require lib/dbg
//= require hashicorp/mega-nav
//= require app/Sidebar
//= require app/DotLockup
//= require app/Init

6
website/source/assets/stylesheets/application.scss
View file

@ -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';

2
website/source/layouts/inner.erb
View file

@ -1,7 +1,7 @@
<% wrap_layout :layout do %>
<div class="container">
<div class="row">
<div class="col-sm-3 col-md-offset-1 col-md-3 col-xs-12">
<div class="col-sm-3 col-md-3 col-xs-12">
<%= yield_content :sidebar %>
</div>

25
website/source/layouts/layout.erb
View file

@ -37,33 +37,16 @@
</head>
<body id="<%= body_id_for(current_page) %>" class="<%= body_classes_for(current_page) %>">
<div id="announcement-bnr" class="hidden-print">
<div class="container">
<div class="row">
<div class="col-md-offset-1 col-md-10 col-xs-12">
<p>
Announcing
<a class="enterprise-logo" href="https://www.hashicorp.com/vault.html?utm_source=oss&utm_medium=top-banner&utm_campaign=vault">
<%= partial "layouts/svg/svg-enterprise" %>
</a>
<span class="tagline">Secure Infrastructure Automation.</span>
<a class="link-blue" href="https://www.hashicorp.com/vault.html?utm_source=oss&utm_medium=top-banner&utm_campaign=vault">
Find out more <span class="hcaret"></span>
</a>
</p>
</div>
</div>
</div>
</div>
<%= mega_nav :vault %>
<div id="header" class="navigation navbar-static-top hidden-print">
<div class="container">
<div class="row">
<div class="col-md-offset-1 col-md-10 col-xs-12">
<div class="col-xs-12">
<div class="navbar-header">
<div class="navbar-brand">
<a class="logo" href="/">Vault</a>
<a class="by-hashicorp" href="https://hashicorp.com/"><span class="svg-wrap">by</span><%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp</a>
</div>
<button class="navbar-toggle" type="button">
<span class="sr-only">Toggle navigation</span>
@ -105,7 +88,7 @@
<div id="footer" class="navigation hidden-print">
<div class="container">
<div class="row">
<div class="col-md-offset-1 col-md-10 col-xs-12">
<div class="col-xs-12">
<% if current_page.url != '/' && current_page.url != '/index.html' %>
<div class="edit-page-link"><a href="<%= github_url :current_page %>">Edit this page</a></div>
<% end %>