diff --git a/css/style.css b/css/style.css index eebe65a1ac..c48160e8ce 100644 --- a/css/style.css +++ b/css/style.css @@ -1326,11 +1326,11 @@ i.fa.fa-indent, i.fa.fa-outdent { } .component-full { - padding: 15px 0 20px 20px; + padding: 10px 0 10px 20px; float: left; width: 100%; min-height: 120px; - margin: 20px 0 0; + margin: 15px 0 0; } .component, .component-full { @@ -1352,14 +1352,13 @@ i.fa.fa-indent, i.fa.fa-outdent { } .component img, .component-full-icon img { - width: 50px; - height: 50px; + width: 70px; + height: 70px; } .component-icon { - width: 50px; margin: 0 auto; - padding: 0 0 10px; + width: 70px; } .component-full-copy { @@ -1436,8 +1435,9 @@ code { .block { float: left; - padding: 18px 22px 0 15px; + padding: 0px 20px 20px 16px; max-width: 960px; + width: 460px; } /* * @@ -1762,6 +1762,21 @@ footer { float: left; padding: 5px 30px 5px 15px; } + .component-full { + padding: 10px 13px 10px 16px; + float: left; + width: 335px; + min-height: 120px; + margin: 15px 0 0; + text-align: center; + } + .component-full { + padding: 10px 0 10px 20px; + width: 94%; + } + .component-full-copy { + width: 100%; + } } /* diff --git a/images/UCP_48.svg b/images/UCP_48.svg new file mode 100644 index 0000000000..b6c5c9ff59 --- /dev/null +++ b/images/UCP_48.svg @@ -0,0 +1,18 @@ + + + + UCP_48 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/UCPn_48.svg b/images/UCPn_48.svg new file mode 100644 index 0000000000..afd1d2f2b8 --- /dev/null +++ b/images/UCPn_48.svg @@ -0,0 +1,18 @@ + + + + UCPn_48 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/apple_48.svg b/images/apple_48.svg new file mode 100644 index 0000000000..49143ccbd6 --- /dev/null +++ b/images/apple_48.svg @@ -0,0 +1,17 @@ + + + + apple_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/applen_48.svg b/images/applen_48.svg new file mode 100644 index 0000000000..8ca2f81ddc --- /dev/null +++ b/images/applen_48.svg @@ -0,0 +1,16 @@ + + + + applen_48 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/images/cloud_48.svg b/images/cloud_48.svg new file mode 100644 index 0000000000..34ed98be54 --- /dev/null +++ b/images/cloud_48.svg @@ -0,0 +1,17 @@ + + + + cloud_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/cloudn_48.svg b/images/cloudn_48.svg new file mode 100644 index 0000000000..16e014a30e --- /dev/null +++ b/images/cloudn_48.svg @@ -0,0 +1,17 @@ + + + + cloudn_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/compose_48.svg b/images/compose_48.svg new file mode 100644 index 0000000000..3922016822 --- /dev/null +++ b/images/compose_48.svg @@ -0,0 +1,18 @@ + + + + compose_48 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/composen_48.svg b/images/composen_48.svg new file mode 100644 index 0000000000..0d7eb86b43 --- /dev/null +++ b/images/composen_48.svg @@ -0,0 +1,18 @@ + + + + composen_48 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/dtr_48.svg b/images/dtr_48.svg new file mode 100644 index 0000000000..27c7a24d64 --- /dev/null +++ b/images/dtr_48.svg @@ -0,0 +1,17 @@ + + + + dtr_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/dtrn_48.svg b/images/dtrn_48.svg new file mode 100644 index 0000000000..ff95d431da --- /dev/null +++ b/images/dtrn_48.svg @@ -0,0 +1,17 @@ + + + + dtrn_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/engine_48.svg b/images/engine_48.svg new file mode 100644 index 0000000000..2bc993febd --- /dev/null +++ b/images/engine_48.svg @@ -0,0 +1,17 @@ + + + + engine_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/enginen_48.svg b/images/enginen_48.svg new file mode 100644 index 0000000000..d51e27474b --- /dev/null +++ b/images/enginen_48.svg @@ -0,0 +1,17 @@ + + + + enginen_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/linux_48.svg b/images/linux_48.svg new file mode 100644 index 0000000000..b722087326 --- /dev/null +++ b/images/linux_48.svg @@ -0,0 +1,17 @@ + + + + linux_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/linuxn_48.svg b/images/linuxn_48.svg new file mode 100644 index 0000000000..ce5167c39f --- /dev/null +++ b/images/linuxn_48.svg @@ -0,0 +1,17 @@ + + + + linuxn_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/machine_48.svg b/images/machine_48.svg new file mode 100644 index 0000000000..bd377952aa --- /dev/null +++ b/images/machine_48.svg @@ -0,0 +1,18 @@ + + + + machine_48 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/machinen_48.svg b/images/machinen_48.svg new file mode 100644 index 0000000000..3be8af212a --- /dev/null +++ b/images/machinen_48.svg @@ -0,0 +1,18 @@ + + + + machinen_48 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/windows_48.svg b/images/windows_48.svg new file mode 100644 index 0000000000..2d5cb4a9cd --- /dev/null +++ b/images/windows_48.svg @@ -0,0 +1,17 @@ + + + + windows_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/images/windowsn_48.svg b/images/windowsn_48.svg new file mode 100644 index 0000000000..918e98e76d --- /dev/null +++ b/images/windowsn_48.svg @@ -0,0 +1,17 @@ + + + + windowsn_48 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/index.md b/index.md index c875bdb721..db70ce31e7 100644 --- a/index.md +++ b/index.md @@ -36,111 +36,109 @@ production environment. Highlights [Compose Version 3 new features](/engine/gets ## Components -
-
-
-
-
-
- Docker for Mac -
-

Docker for Mac

-

A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.

-
-
-
-
-
- Docker for Mac -
-

Docker for Windows

-

A native Windows application which delivers all Docker tools to your Windows computer.

-
-
-
-
-
- Docker for Mac -
-

Docker for Linux

-

Install Docker on a computer which already has a Linux distribution installed.

-
-
- -
- -
-
- Docker Engine -
-
-

Docker Engine

-

Create Docker images and run Docker containers. As of v1.12.0, Engine includes swarm mode container orchestration features.

-
-
- -
-
- Docker Engine -
-
-

Docker Cloud

-

A hosted service for building, testing, and deploying Docker images to your hosts.

-
-
- -
-
- Docker Universal Control Plane -
-
-

Docker Universal Control Plane

-

(UCP) Manage a cluster of on-premises Docker hosts as if they were a single machine.

-
-
- -
-
- Docker Compose -
-
-

Docker Compose

-

Define applications built using multiple containers.

-
-
- -
-
- Docker Hub -
-
-

Docker Hub

-

A hosted registry service for managing and building images.

-
-
- -
-
- Docker Trusted Registry -
-
-

Docker Trusted Registry

-

(DTR) stores and signs your images.

-
-
- -
-
- Docker Machine -
-
-

Docker Machine

-

Automate container provisioning on your network or in the cloud. Available for Windows, macOS, or Linux.

-
-
- -
- -
-
+
+
+
+
+
+ Docker for Mac +
+

Docker for Mac

+

A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.

+
+
+
+
+
+ Docker for Mac +
+

Docker for Windows

+

A native Windows application which delivers all Docker tools to your Windows computer.

+
+
+
+
+
+ Docker for Mac +
+

Docker for Linux

+

Install Docker on a computer which already has a Linux distribution installed.

+
+
+ +
+ +
+
+ Docker Engine +
+
+

Docker Engine

+

Create Docker images and run Docker containers. As of v1.12.0, Engine includes swarm mode container orchestration features.

+
+
+ +
+
+ Docker Engine +
+
+

Docker Cloud

+

A hosted service for building, testing, and deploying Docker images to your hosts.

+
+
+ +
+
+ Docker Universal Control Plane +
+
+

Docker Universal Control Plane

+

(UCP) Manage a cluster of on-premises Docker hosts as if they were a single machine.

+
+
+ +
+
+ Docker Compose +
+
+

Docker Compose

+

Define applications built using multiple containers.

+
+
+ + + +
+
+ Docker Trusted Registry +
+
+

Docker Trusted Registry

+

(DTR) stores and signs your images.

+
+
+ +
+
+ Docker Machine +
+
+

Docker Machine

+

Automate container provisioning on your network or in the cloud. Available for Windows, macOS, or Linux.

+
+
+ +
+ +