Merge pull request hashicorp#411 from hashicorp/sethvargo/more_websit…

…e_updates SEO and latest middleman goodness
erikdubbelboer · Oct 20, 2014 · 11ef616 · 11ef616
2 parents 3761867 + a623b43
commit 11ef616
Show file tree

Hide file tree

Showing 82 changed files with 1,570 additions and 1,709 deletions.
diff --git a/website/Gemfile.lock b/website/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/hashicorp/middleman-hashicorp.git
-  revision: fe7d5bb4b04c408857dbe94345341cafcbc02de4
+  revision: dc9f2d6b986842622796a569bf9358f6f3e3f634
   specs:
     middleman-hashicorp (0.1.0)
       bootstrap-sass (~> 3.2)
@@ -29,7 +29,7 @@ GEM
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chunky_png (1.3.1)
+    chunky_png (1.3.2)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
@@ -53,8 +53,8 @@ GEM
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (2.2.1)
-    ffi (1.9.5)
+    execjs (2.2.2)
+    ffi (1.9.6)
     haml (4.0.5)
       tilt
     hike (1.2.3)
@@ -113,11 +113,11 @@ GEM
       rouge (~> 1.0)
     minitest (5.4.2)
     multi_json (1.10.1)
-    padrino-helpers (0.12.3)
+    padrino-helpers (0.12.4)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.3)
+      padrino-support (= 0.12.4)
       tilt (~> 1.4.1)
-    padrino-support (0.12.3)
+    padrino-support (0.12.4)
       activesupport (>= 3.1)
     rack (1.5.2)
     rack-contrib (1.1.0)
@@ -129,10 +129,10 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.1.2)
+    redcarpet (3.2.0)
     ref (1.0.5)
     rouge (1.7.2)
-    sass (3.4.5)
+    sass (3.4.6)
     sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -157,7 +157,7 @@ GEM
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uber (0.0.8)
+    uber (0.0.9)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)

diff --git a/website/config.rb b/website/config.rb
@@ -2,6 +2,8 @@
 # Configure Middleman
 #-------------------------------------------------------------------------
 
+set :base_url, "https://www.consul.io/"
+
 activate :hashicorp do |h|
   h.version      = '0.4.0'
   h.bintray_repo = 'mitchellh/consul'

diff --git a/website/source/404.html.erb b/website/source/404.html.erb
@@ -1 +1,5 @@
+---
+noindex: true
+---
+
 <h2>Page Not Found</h2>
diff --git a/website/source/assets/fonts/league_gothic-webfont.eot b/website/source/assets/fonts/league_gothic-webfont.eot
diff --git a/website/source/assets/fonts/league_gothic-webfont.svg b/website/source/assets/fonts/league_gothic-webfont.svg
diff --git a/website/source/assets/fonts/league_gothic-webfont.ttf b/website/source/assets/fonts/league_gothic-webfont.ttf
diff --git a/website/source/assets/fonts/league_gothic-webfont.woff b/website/source/assets/fonts/league_gothic-webfont.woff
diff --git a/website/source/assets/javascripts/lang-go.js b/website/source/assets/javascripts/lang-go.js
diff --git a/website/source/assets/javascripts/prettify.js b/website/source/assets/javascripts/prettify.js
diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss
@@ -159,6 +159,15 @@ body.layout-intro{
         -webkit-font-smoothing: antialiased;
 	}
 
+  li p a, li a {
+    text-decoration: none;
+
+    &:hover {
+      cursor: default;
+      text-decoration: none;
+    }
+  }
+
     pre{
         margin: 0 0 18px;
     }
@@ -192,6 +201,10 @@ body.layout-intro{
     #graph {
         margin-top: 30px;
     }
+
+  .alert p {
+    margin-bottom: 0;
+  }
 }
 
 

diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss
@@ -2,6 +2,9 @@
 @import "bootstrap-sprockets";
 @import "bootstrap";
 
+// Remote fonts
+@import url("http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700");
+
 // Core variables and mixins
 @import "_variables";
 @import "_mixins";
@@ -25,6 +28,3 @@
 @import "_community";
 @import "_docs";
 @import "_downloads";
-
-// Components w/ JavaScript
-/*@import "modals.less";*/