From 6cbb137883ff0c2513d2845c29de3ea635bb38eb Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Mon, 27 Mar 2017 21:32:51 -0700 Subject: [PATCH] Bring my changes over to this branch --- .../source/assets/stylesheets/_buttons.scss | 9 ++++ website/source/assets/stylesheets/_home.scss | 53 +++++++++++++++++-- .../source/assets/stylesheets/_variables.scss | 33 +++++++++++- website/source/docs/builders/docker.html.md | 28 ++++++++++ website/source/index.html.erb | 26 ++++----- 5 files changed, 131 insertions(+), 18 deletions(-) diff --git a/website/source/assets/stylesheets/_buttons.scss b/website/source/assets/stylesheets/_buttons.scss index 882f95025..ee745256d 100644 --- a/website/source/assets/stylesheets/_buttons.scss +++ b/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; + } + } } diff --git a/website/source/assets/stylesheets/_home.scss b/website/source/assets/stylesheets/_home.scss index a474e0bfe..89ee7d9a3 100644 --- a/website/source/assets/stylesheets/_home.scss +++ b/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; } } diff --git a/website/source/assets/stylesheets/_variables.scss b/website/source/assets/stylesheets/_variables.scss index c8419af0e..2650ef594 100644 --- a/website/source/assets/stylesheets/_variables.scss +++ b/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; diff --git a/website/source/docs/builders/docker.html.md b/website/source/docs/builders/docker.html.md index ea37b66fc..faa791497 100644 --- a/website/source/docs/builders/docker.html.md +++ b/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 diff --git a/website/source/index.html.erb b/website/source/index.html.erb index 27df7ba8f..9afd11041 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -4,22 +4,22 @@ description: |- platforms from a single source configuration. --- -
-
-
-
-
- <%= image_tag "logo-text.svg", alt: "Packer by HashiCorp", height: 80 %> - -

A tool for building machine images

- Get Started - Download <%= latest_version %> - - <%= image_tag "hero-image.svg" %> +
+
+
+
+

+ Create platform specific machine images from a single source +

+ Get Started +
+

Packer V0.12.2 has been released

+ Download
-
+
+