iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Website: Add Meganav
This commit is contained in:
Jack Pearkes 2017-03-08 17:53:15 -08:00 committed by GitHub
parent 9e8b602f28 4d34655bb9
commit b86aa8af3d
7 changed files with 14 additions and 10 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" source "https://rubygems.org"
gem "middleman-hashicorp", "0.3.12" gem "middleman-hashicorp", "0.3.13"

2
website/Makefile
View File

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

2
website/packer.json
View File

@ -8,7 +8,7 @@
"builders": [ "builders": [
{ {
"type": "docker", "type": "docker",
"image": "hashicorp/middleman-hashicorp:0.3.12", "image": "hashicorp/middleman-hashicorp:0.3.13",
"discard": "true", "discard": "true",
"run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"] "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"]
} }

3
website/source/assets/javascripts/application.js
View File

@ -1,7 +1,10 @@
//= require jquery //= require jquery
//= require bootstrap
//= require lib/Base //= require lib/Base
//= require hashicorp/mega-nav
//= require docs //= require docs
//= require app/Sidebar //= require app/Sidebar
////= require app/Init ////= require app/Init

4
website/source/assets/stylesheets/_styles.scss
View File

@ -95,10 +95,6 @@ p {
color: darken($green, 50%); color: darken($green, 50%);
} }
} }
img {
width: 100%;
}
} }
a { a {

3
website/source/assets/stylesheets/application.scss
View File

@ -3,6 +3,9 @@
@import url("//fonts.googleapis.com/css?family=Inconsolata|Open+Sans:300,400,600"); @import url("//fonts.googleapis.com/css?family=Inconsolata|Open+Sans:300,400,600");
// Mega Nav
@import 'hashicorp/mega-nav';
@import "_helpers"; @import "_helpers";
@import "_reset"; @import "_reset";

8
website/source/layouts/layout.erb
View File

@ -34,12 +34,14 @@
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NR2SD7C" <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NR2SD7C"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) --> <!-- End Google Tag Manager (noscript) -->
<%= mega_nav :packer %>
<div id="header" class="navigation white <%= current_page.data.page_title == "home" ? "" : "navbar-static-top" %>"> <div id="header" class="navigation white <%= current_page.data.page_title == "home" ? "" : "navbar-static-top" %>">
<div class="container-fluid"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<div class="navbar-brand"> <div class="navbar-brand">
<a class="logo" href="/">Packer</a> <a class="logo" href="/">Packer</a>
<a class="by-hashicorp white" href="https://www.hashicorp.com/"><span class="svg-wrap">by</span><%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp</a>
</div> </div>
<button class="navbar-toggle white" type="button"> <button class="navbar-toggle white" type="button">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
@ -72,7 +74,7 @@
<%= yield %> <%= yield %>
<div class="clearfix"></div> <div class="clearfix"></div>
<footer id="footer" class="navigation white"> <footer id="footer" class="navigation white">
<div class="container-fluid"> <div class="container">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<% # current_page.path does not have an extension, but <% # current_page.path does not have an extension, but