From 8d9e90a6cd7a6a1f8fc2b0aa1fa0a8ac460debef Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Thu, 2 Mar 2017 15:47:22 -0800 Subject: [PATCH] Lots of formatting fixes to do with buttons --- _includes/d4a_buttons.md | 12 ++++++------ css/temp.css | 22 +++++----------------- docker-for-aws/index.md | 7 ++----- docker-for-azure/index.md | 4 ++-- docker-for-mac/install.md | 10 ++++++---- docker-for-windows/install.md | 10 ++++++---- engine/getstarted/step_one.md | 19 ++++++++++++------- test.md | 4 ++-- toolbox/overview.md | 4 ++-- toolbox/toolbox_install_mac.md | 8 +------- toolbox/toolbox_install_windows.md | 8 +------- 11 files changed, 45 insertions(+), 63 deletions(-) diff --git a/_includes/d4a_buttons.md b/_includes/d4a_buttons.md index 12ca726f5f..0e88e97b58 100644 --- a/_includes/d4a_buttons.md +++ b/_includes/d4a_buttons.md @@ -4,27 +4,27 @@ {% capture aws_blue_latest %} -Deploy Docker Community Edition (CE) for AWS (stable) +Deploy Docker Community Edition (CE) for AWS (stable) {% endcapture %} {% capture aws_blue_edge %} -Deploy Docker Community Edition (CE) for AWS (edge) +Deploy Docker Community Edition (CE) for AWS (edge) {% endcapture %} {% capture aws_blue_vpc_latest %} -Deploy Docker Community Edition (CE) for AWS (stable)
uses your existing VPC +Deploy Docker Community Edition (CE) for AWS (stable)
uses your existing VPC {% endcapture %} {% capture aws_blue_vpc_edge %} -Deploy Docker Community Edition (CE) for AWS (edge)
uses your existing VPC +Deploy Docker Community Edition (CE) for AWS (edge)
uses your existing VPC {% endcapture %} {% capture azure_blue_latest %} -Deploy Docker Community Edition (CE) for Azure (stable) +Deploy Docker Community Edition (CE) for Azure (stable) {% endcapture %} {% capture azure_blue_edge %} -Deploy Docker Community Edition (CE) for Azure (edge) +Deploy Docker Community Edition (CE) for Azure (edge) {% endcapture %} {% capture azure_button_latest %} diff --git a/css/temp.css b/css/temp.css index 0088b8e46f..5c27d2bbf0 100644 --- a/css/temp.css +++ b/css/temp.css @@ -94,23 +94,6 @@ input.gsc-search-button-v2 { margin-top: 2px; } -/* CTA button for downloads and stuff */ - -.darkblue-btn, -.cta-btn { - background-color: #1488C6; - padding: 12px 15px 10px 15px; - margin: 20px 20px 20px 0; - display: inline-block; -} - -/* In case you want a row of them */ - -.darkblue-btn.right, -.cta-btn.right { - margin: 20px 0 20px 20px; -} - /* Make table headings bold, give tables some breathing room */ th, td.th { @@ -133,3 +116,8 @@ h5, h6 { clear: both; } + +/* This needs some space at the bottom */ +.button.outline-btn { + margin-bottom: 20px; +} diff --git a/docker-for-aws/index.md b/docker-for-aws/index.md index 4505eea1ec..a489f1e2a5 100644 --- a/docker-for-aws/index.md +++ b/docker-for-aws/index.md @@ -12,7 +12,7 @@ redirect_from: ## Docker Enterprise Edition (EE) for AWS This deployment is fully baked and tested, and comes with the latest Enterprise Edition version of Docker.
This release is maintained and receives security and critical bugfixes for one year. -Deploy Docker Enterprise Edition (EE) for AWS +Deploy Docker Enterprise Edition (EE) for AWS ## Docker Community Edition (CE) for AWS @@ -40,13 +40,10 @@ using CloudFormation. For more about stable and edge channels, see the {{aws_blue_edge}} + {{aws_blue_vpc_edge}} - - - - {{aws_blue_vpc_edge}} diff --git a/docker-for-azure/index.md b/docker-for-azure/index.md index a67d7bb5ee..d082a2b1df 100644 --- a/docker-for-azure/index.md +++ b/docker-for-azure/index.md @@ -11,7 +11,7 @@ redirect_from: ## Docker Enterprise Edition (EE) for Azure This deployment is fully baked and tested, and comes with the latest Enterprise Edition version of Docker.
This release is maintained and receives security and critical bugfixes for one year. -Deploy Docker Enterprise Edition (EE) for Azure +Deploy Docker Enterprise Edition (EE) for Azure ## Docker Community Edition (CE) for Azure @@ -19,7 +19,7 @@ This deployment is fully baked and tested, and comes with the latest Enterprise ### Quickstart If your account has the [proper permissions](#prerequisites), you can generate the [Service Principal](#service-principal) and -then choose from the stable or edge channel to bootstrap Docker for Azure using Azure Resource Manager. +then choose from the stable or edge channel to bootstrap Docker for Azure using Azure Resource Manager. For more about stable and edge channels, see the [FAQs](/docker-for-azure/faqs.md#stable-and-edge-channels) diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md index 6bca43a099..bef56ae71b 100644 --- a/docker-for-mac/install.md +++ b/docker-for-mac/install.md @@ -46,14 +46,16 @@ channels, see the [FAQs](/docker-for-mac/faqs.md#stable-and-edge-channels). + + + +
- Get Docker for Mac (Stable)

- Download checksum: Docker.dmg SHA256 + Get Docker for Mac (Stable) 		- Get Docker for Mac (Edge)

- Download checksum: Docker.dmg SHA256 + Get Docker for Mac (Edge)
Download checksum: Docker.dmg SHA256Download checksum: Docker.dmg SHA256
>**Important Notes**: diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index b7ac4d0e16..3c85851791 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -50,14 +50,16 @@ Edge channels, see the - Get Docker for Windows (Stable)

- Download checksum: InstallDocker.msi SHA256 + Get Docker for Windows (Stable) - Get Docker for Windows (Edge)

- Download checksum: InstallDocker.msi SHA256 + Get Docker for Windows (Edge) + + Download checksum: InstallDocker.msi SHA256 + Download checksum: InstallDocker.msi SHA256 + >**Important Notes:** diff --git a/engine/getstarted/step_one.md b/engine/getstarted/step_one.md index 2d40dd1026..f10f38bc25 100644 --- a/engine/getstarted/step_one.md +++ b/engine/getstarted/step_one.md @@ -23,11 +23,13 @@ title: Install Docker and run hello-world ### Docker for Mac -Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses xhyve to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. +Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses +[xhyve](https://github.com/mist64/xhyve/){: target="_blank" class="_" } to virtualize +the Docker Engine environment and Linux kernel-specific features for the Docker daemon. -Get Docker for Mac +Get Docker for Mac -**Requirements** +#### Requirements - Mac must be a 2010 or newer model, with Intel's hardware support for memory management unit (MMU) virtualization; i.e., Extended Page Tables (EPT) @@ -39,7 +41,9 @@ Docker for Mac is our newest offering for the Mac. It runs as a native Mac appli #### Docker Toolbox for the Mac -If you have an earlier Mac that doesn't meet the Docker for Mac prerequisites, get Docker Toolbox for the Mac. +If you have an earlier Mac that doesn't meet the Docker for Mac prerequisites, +[get Docker Toolbox](https://www.docker.com/products/docker-toolbox){: target="_blank" class="_" } +for the Mac. See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docker with Toolbox. @@ -47,9 +51,9 @@ See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docke Docker for Windows is our newest offering for PCs. It runs as a native Windows application and uses Hyper-V to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. -Get Docker for Windows +Get Docker for Windows -**Requirements** +#### Requirements * 64bit Windows 10 Pro, Enterprise and Education (1511 November update, Build 10586 or later). In the future we will support more versions of Windows 10. @@ -57,7 +61,8 @@ Docker for Windows is our newest offering for PCs. It runs as a native Windows a #### Docker Toolbox for Windows -If you have an earlier Windows system that doesn't meet the Docker for Windows prerequisites, get Docker Toolbox. +If you have an earlier Windows system that doesn't meet the Docker for Windows prerequisites, +[get Docker Toolbox](https://www.docker.com/products/docker-toolbox){: target="_blank" class="_" }. See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docker with Toolbox. diff --git a/test.md b/test.md index ae1d0a8cd4..bd0bce34ab 100644 --- a/test.md +++ b/test.md @@ -158,11 +158,11 @@ Some tables in markdown and html. - Go to the docs!

+ Go to the docs!

It is dark here. You are likely to be eaten by a grue. - Go to the docs!

+ Go to the docs!

It is dark here. You are likely to be eaten by a grue. diff --git a/toolbox/overview.md b/toolbox/overview.md index 83390d6f41..b17b5de06f 100644 --- a/toolbox/overview.md +++ b/toolbox/overview.md @@ -39,10 +39,10 @@ Toolbox includes these Docker tools: - Get Docker Toolbox for Mac + Get Docker Toolbox for Mac - Get Docker Toolbox for Windows + Get Docker Toolbox for Windows diff --git a/toolbox/toolbox_install_mac.md b/toolbox/toolbox_install_mac.md index 2593a17291..ba98765e52 100644 --- a/toolbox/toolbox_install_mac.md +++ b/toolbox/toolbox_install_mac.md @@ -11,13 +11,7 @@ minimal system requirements for [Docker for Mac](/docker-for-mac/index.md). If you have not done so already, download the installer here: - - - - -
- Get Docker Toolbox for Mac -
+[Get Docker Toolbox for Mac](https://download.docker.com/mac/stable/DockerToolbox.pkg){: class="button outline-btn" } ## What you get and how it works diff --git a/toolbox/toolbox_install_windows.md b/toolbox/toolbox_install_windows.md index 071c290012..7223ba2e79 100644 --- a/toolbox/toolbox_install_windows.md +++ b/toolbox/toolbox_install_windows.md @@ -12,13 +12,7 @@ Windows](/docker-for-windows/index.md) app. If you have not done so already, download the installer here: - - - - -
- Get Docker Toolbox for Windows -
+[Get Docker Toolbox for Windows](href="https://download.docker.com/win/stable/DockerToolbox.exe"){: class="button outline-btn" } ## What you get and how it works