Bring my changes over to this branch

website/source/assets/stylesheets/_buttons.scss

@@ -42,4 +42,13 @@ $button-primary-font-color: $white;
       background: lighten($button-primary-background, 5%);
     }
   }
+
+  &.secondary {
+    color: $button-font-color;
+
+    &:hover {
+      color: $white;
+      background-color: $black;
+    }
+  }
 }

website/source/assets/stylesheets/_home.scss

@@ -22,11 +22,58 @@
   }
 
   .hero {
-    margin-top: 140px;
-    text-align: center;
+    height: $hero-height + 100px;
+    margin-bottom: ($baseline * 4);
+    background: image-url('hero-image.svg') no-repeat;
+    background-position: top right;
+
+    h1 { color: $black;}
+
+    @media (min-width: 1200px) {
+      h1 {
+        margin-top: 100px;
+      }
+    }
+
+    @media (max-width: $screen-md-max) {
+      height: $hero-height;
+
+      h1 {
+        font-size: 36px;
+        padding-top: 1em;
+        padding-bottom: 1em;
+      }
+    }
+
+    @media (max-width: $screen-sm-max) {
+      height: auto;
+      background: none;
+
+      h1 {
+        margin: 0;
+        padding-top: 1em;
+        margin-bottom: 1em;
+      }
+    }
+  }
+
+  .download-module {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin: $baseline*6 0 $baseline 0;
+    padding: $baseline;
+    background-color: $white;
+    border: 1px solid $gray-light;
+
+    p {
+      padding-top: 7px;
+    }
 
     .button {
-      margin: 5px;
+      display: block;
+      margin: 0 0 0 $baseline;
+      background-color: $white;
     }
   }
 

website/source/assets/stylesheets/_variables.scss

@@ -9,15 +9,32 @@ $vagrant-blue: #1563FF;
 $vagrant-blue-dark: #104EB2;
 $vault-black: #000000;
 $vault-blue: #00ABE0;
+$green: #7bc6b1;
 
 // Typography
 $font-family-klavika:   'klavika-web', 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-open-sans: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
-$font-family-monospace: 'Menlo', 'Monaco', 'Consolas', "Courier New", monospace;
-$font-size:             15px;
+$font-family-mono: 'Inconsolata', 'Monaco', 'courier new', courier, monospace;
+$font-size:             16px;
 $font-weight-reg:       400;
 $font-weight-bold:      600;
 
+
+.open-sans { font-family: $font-family-open-sans;}
+.klavika { font-family: $font-family-klavika; }
+.mono { font-family: $font-family-mono; }
+
+.text-center { text-align: center !important; }
+.text-left { text-align: left !important; }
+.text-right { text-align: right !important; }
+
+// helper class to add additional weight and subtle spacing
+// to improve legibility of light text on dark backgrounds
+.rev-out { font-weight: 600; letter-spacing: 0.01em; }
+
+.uppercase { text-transform: uppercase !important; }
+.letterspaced { letter-spacing: 0.05em; }
+
 // Body
 $body-font-color: $gray-darker;
 $body-link-color: $packer-blue-dark;
@@ -46,3 +63,15 @@ $footer-link-color-hover: $black;
 $button-font-family: $font-family-klavika;
 $button-font-size: $font-size - 2;
 $button-font-weight: $font-weight-bold;
+
+// components
+$nav-height: 100px;
+$hero-height: 350px;
+$docs-top-margin: 40px;
+$sidebar-width: 250px;
+
+// base measures
+$baseline: 20px;
+$base-font-size: 16px;
+$base-line-height: 1.8;
+$button-height: 60px;

website/source/docs/builders/docker.html.md

@@ -83,6 +83,7 @@ Example uses of all of the options, assuming one is building an NGINX image from
 
 Allowed metadata fields that can be changed are:
 
+<<<<<<< HEAD
 - `CMD`
   - String, supports both array (escaped) and string form
   - EX: `”CMD [\"nginx\", \"-g\", \"daemon off;\"]"`
@@ -108,6 +109,33 @@ Allowed metadata fields that can be changed are:
 - `WORKDIR`
   - String
   - EX: `“WORKDIR PATH”`
+=======
+- CMD
+	- String, supports both array (escaped) and string form
+	- EX: `"CMD [\"nginx\", \"-g\", \"daemon off;\"]"`
+	- EX: `"CMD nginx -g daemon off;"`
+- ENTRYPOINT
+	- String 
+	- EX: `"ENTRYPOINT /var/www/start.sh"`
+- ENV
+	- String, note there is no equal sign: 
+	- EX: `"ENV HOSTNAME www.example.com"` not `"ENV HOSTNAME=www.example.com"`
+- EXPOSE
+	- String, space separated ports 
+	- EX: `"EXPOSE 80 443"`
+- MAINTAINER
+	- String 
+	- EX: `"MAINTAINER NAME"`
+- USER
+	- String 
+	- EX: `"USER USERNAME"`
+- VOLUME
+	- String 
+	- EX: `"VOLUME FROM TO"`
+- WORKDIR
+	- String
+	- EX: `"WORKDIR PATH"`
+>>>>>>> mitchellh/master
 
 ## Configuration Reference
 

website/source/index.html.erb

@@ -4,22 +4,22 @@ description: |-
   platforms from a single source configuration.
 ---
 
-<div class="home">
-  <header>
-    <div class="container hero">
-      <div class="row">
-        <div class="col-md-offset-2 col-md-8">
-          <%= image_tag "logo-text.svg", alt: "Packer by HashiCorp", height: 80 %>
-
-          <h1>A tool for building machine images</h1>
-          <a class="button primary" href="/intro">Get Started</a>
-          <a class="button" href="/downloads.html">Download <%= latest_version %></a>
-
-          <%= image_tag "hero-image.svg" %>
+<header class="hero">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-6">
+        <h1>
+          Create platform specific machine images from a single source
+        </h1>
+        <a class="button primary" href="/intro.html">Get Started</a>
+        <div class="download-module">
+          <p>Packer V0.12.2 has been released</p>
+          <a class="button secondary klavika" href="/downloads.html">Download</a>
         </div>
       </div>
     </div>
-  </header>
+  </div>
+</header>
 
   <section id="automated" class="marketing">
     <div class="container">