From d12154311bd98dfab7681fe3d86b8624c4cf92ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Drouet?= Date: Mon, 8 Jun 2020 14:28:35 +0200 Subject: [PATCH] landing-page: display docker-con videos section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Drouet --- _includes/body-landing.html | 95 +++++++++---------- .../landing-page/develop-with-docker.html | 37 ++++++++ _includes/landing-page/popular-videos.html | 30 ++++++ _scss/_landing.scss | 16 ++++ images/video.svg | 6 ++ 5 files changed, 133 insertions(+), 51 deletions(-) create mode 100644 _includes/landing-page/develop-with-docker.html create mode 100644 _includes/landing-page/popular-videos.html create mode 100644 images/video.svg diff --git a/_includes/body-landing.html b/_includes/body-landing.html index 779170d8d5..abcd111a60 100644 --- a/_includes/body-landing.html +++ b/_includes/body-landing.html @@ -139,7 +139,7 @@
-
+
How do I?
@@ -199,43 +199,7 @@
-
-
-
-
-
Develop with Docker
-

Learn how to develop language-specific apps using Docker.

-
-
-
-
- - Docker for Java developers - -
-
- - Port a node.js app to Docker - -
-
- - Ruby on Rails app on Docker - -
-
- - Dockerize a .Net Core application - -
-
- - Dockerize an ASP.NET Core application with SQL Server on Linux - -
-
-
-
+ {% include landing-page/popular-videos.html %}
@@ -649,29 +613,31 @@

-

Troubleshooting

+

Develop with Docker

+

Learn how to develop language-specific apps using Docker.

- Refer to our troubleshooting topics to learn how to diagnose and - troubleshoot common issues. -

-

- - Troubleshoot the Docker daemon + + Docker for Java developers

- - Troubleshoot volumes or bind mount errors + + Port a node.js app to Docker

- - Troubleshoot container networking errors + + Ruby on Rails app on Docker

- - Docker Desktop logs and troubleshooting + + Dockerize a .Net Core application + +

+

+ + Dockerize an ASP.NET Core application with SQL Server on Linux

@@ -727,6 +693,33 @@

+
+

Troubleshooting

+

+ Refer to our troubleshooting topics to learn how to diagnose and + troubleshoot common issues. +

+

+ + Troubleshoot the Docker daemon + +

+

+ + Troubleshoot volumes or bind mount errors + +

+

+ + Troubleshoot container networking errors + +

+

+ + Docker Desktop logs and troubleshooting + +

+
diff --git a/_includes/landing-page/develop-with-docker.html b/_includes/landing-page/develop-with-docker.html new file mode 100644 index 0000000000..79d13413cb --- /dev/null +++ b/_includes/landing-page/develop-with-docker.html @@ -0,0 +1,37 @@ +
+
+
+
+
Develop with Docker
+

Learn how to develop language-specific apps using Docker.

+
+
+
+
+ + Docker for Java developers + +
+
+ + Port a node.js app to Docker + +
+
+ + Ruby on Rails app on Docker + +
+
+ + Dockerize a .Net Core application + +
+
+ + Dockerize an ASP.NET Core application with SQL Server on Linux + +
+
+
+
diff --git a/_includes/landing-page/popular-videos.html b/_includes/landing-page/popular-videos.html new file mode 100644 index 0000000000..04cb169256 --- /dev/null +++ b/_includes/landing-page/popular-videos.html @@ -0,0 +1,30 @@ +
+
+
+
+
Popular videos
+

Watch the most popular videos from DockerCon.

+
+
+
+
+ + +
How to get started with Docker
+ +
+
+ + +
How to build and test your Docker images in the Cloud
+ +
+
+ + +
Simplify all the things with Docker Compose
+ +
+
+
+
diff --git a/_scss/_landing.scss b/_scss/_landing.scss index 17c097781c..fadc243cbd 100644 --- a/_scss/_landing.scss +++ b/_scss/_landing.scss @@ -127,6 +127,22 @@ body#landing { padding: 7.5px; } + .video-item { + display: flex; + flex-direction: row; + align-items: center; + margin-top: 6.5px; + margin-bottom: 6.5px; + + .video-image { + margin-right: 13px; + } + + .video-title { + flex: 1; + } + } + %icon-card { background-image: none; background-origin: content-box; diff --git a/images/video.svg b/images/video.svg new file mode 100644 index 0000000000..fc5351862e --- /dev/null +++ b/images/video.svg @@ -0,0 +1,6 @@ + + + + + +