status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-05 02:16:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2790 from hashicorp/website-add-meganav

Browse Source 
Website add meganav
This commit is contained in:
Jack Pearkes 2017-03-08 17:55:04 -08:00 committed by GitHub
commit f1f22757c8
9 changed files with 15 additions and 11 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"

4
website/Gemfile.lock
View File

@ -77,7 +77,7 @@ GEM
rack (>= 1.4.5, < 2.0) rack (>= 1.4.5, < 2.0)
thor (>= 0.15.2, < 2.0) thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0) tilt (~> 1.4.1, < 2.0)
middleman-hashicorp (0.3.12) middleman-hashicorp (0.3.13)
bootstrap-sass (~> 3.3) bootstrap-sass (~> 3.3)
builder (~> 3.2) builder (~> 3.2)
middleman (~> 3.4) middleman (~> 3.4)
@ -151,7 +151,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
middleman-hashicorp (= 0.3.12) middleman-hashicorp (= 0.3.13)
BUNDLED WITH BUNDLED WITH
1.14.6 1.14.6

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

2
website/source/assets/javascripts/application.coffee
View File

@ -9,3 +9,5 @@
#= require _app/app #= require _app/app
#= require _app/homepage #= require _app/homepage
#= require _app/util #= require _app/util
#= require hashicorp/mega-nav

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

@ -10,6 +10,7 @@ text-rendering: optimizeLegibility;
body { body {
font-size: 15px; font-size: 15px;
color: $black; color: $black;
font-family: $font-family-open-sans;
font-weight: 300; font-weight: 300;
} }
@ -32,7 +33,7 @@ h3{
} }
p, a, input, .alert { p, a, input, .alert {
font-family: $font-family-open-sans;
} }
//an alternative color for buttons in the doc body //an alternative color for buttons in the doc body

2
website/source/assets/stylesheets/_jumbotron.scss
View File

@ -47,7 +47,7 @@
-webkit-backface-visibility:hidden; -webkit-backface-visibility:hidden;
.jumbo-logo-wrap{ .jumbo-logo-wrap{
margin-top: 135px; margin-top: 155px;
.jumbo-logo{ .jumbo-logo{
width: 318px; width: 318px;

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

@ -3,7 +3,10 @@
@import "bootstrap"; @import "bootstrap";
// Remote fonts // 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");
// Mega Nav
@import 'hashicorp/mega-nav';
// Core variables and mixins // Core variables and mixins
@import "_variables"; @import "_variables";
@ -21,7 +24,6 @@
@import 'hashicorp-shared/_hashicorp-sidebar'; @import 'hashicorp-shared/_hashicorp-sidebar';
// Components // Components
@import '_announcement-bnr';
@import "_header"; @import "_header";
@import '_footer'; @import '_footer';
@import "_jumbotron"; @import "_jumbotron";

3
website/source/layouts/_header.erb
View File

@ -43,14 +43,13 @@
<!-- End Google Tag Manager (noscript) --> <!-- End Google Tag Manager (noscript) -->
<div id="header" class="navigation <%= current_page.data.page_title == "home" ? "" : "navbar-static-top" %>"> <div id="header" class="navigation <%= current_page.data.page_title == "home" ? "" : "navbar-static-top" %>">
<%= partial "layouts/announcement-bnr" %> <%= mega_nav :consul %>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="navbar-header"> <div class="navbar-header">
<div class="navbar-brand"> <div class="navbar-brand">
<a class="logo" href="/">Consul</a> <a class="logo" href="/">Consul</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>