diff --git a/website/source/assets/images/consul-connect/distributed-locks-and-semaphores.png b/website/source/assets/images/consul-connect/distributed-locks-and-semaphores.png deleted file mode 100644 index 61ce749b0b..0000000000 Binary files a/website/source/assets/images/consul-connect/distributed-locks-and-semaphores.png and /dev/null differ diff --git a/website/source/assets/images/consul-connect/feature.jpg b/website/source/assets/images/consul-connect/feature.jpg deleted file mode 100644 index 3a59d4364d..0000000000 Binary files a/website/source/assets/images/consul-connect/feature.jpg and /dev/null differ diff --git a/website/source/assets/images/consul-connect/grid_1.png b/website/source/assets/images/consul-connect/grid_1.png new file mode 100644 index 0000000000..cc8a4aed31 Binary files /dev/null and b/website/source/assets/images/consul-connect/grid_1.png differ diff --git a/website/source/assets/images/consul-connect/grid_2.png b/website/source/assets/images/consul-connect/grid_2.png new file mode 100644 index 0000000000..2bf64a4847 Binary files /dev/null and b/website/source/assets/images/consul-connect/grid_2.png differ diff --git a/website/source/assets/images/consul-connect/grid_3.png b/website/source/assets/images/consul-connect/grid_3.png new file mode 100644 index 0000000000..a47e0be471 Binary files /dev/null and b/website/source/assets/images/consul-connect/grid_3.png differ diff --git a/website/source/assets/images/consul-connect/logos/consul-enterprise-logo.svg b/website/source/assets/images/consul-connect/logos/consul-enterprise-logo.svg new file mode 100644 index 0000000000..c5bff249d0 --- /dev/null +++ b/website/source/assets/images/consul-connect/logos/consul-enterprise-logo.svg @@ -0,0 +1,7 @@ + + Consul Enterprise + + + + + diff --git a/website/source/assets/images/consul-connect/logos/consul-logo.svg b/website/source/assets/images/consul-connect/logos/consul-logo.svg new file mode 100644 index 0000000000..daef751a60 --- /dev/null +++ b/website/source/assets/images/consul-connect/logos/consul-logo.svg @@ -0,0 +1,7 @@ + + Consul + + + + + diff --git a/website/source/assets/images/consul-connect/open-and-extensible.png b/website/source/assets/images/consul-connect/open-and-extensible.png deleted file mode 100644 index 44f6ddd387..0000000000 Binary files a/website/source/assets/images/consul-connect/open-and-extensible.png and /dev/null differ diff --git a/website/source/assets/images/consul-connect/svgs/semaphores.svg b/website/source/assets/images/consul-connect/svgs/semaphores.svg new file mode 100644 index 0000000000..afefb803cb --- /dev/null +++ b/website/source/assets/images/consul-connect/svgs/semaphores.svg @@ -0,0 +1,55 @@ + + + Distributed Locks and Semaphores + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LEADER + + + FOLLOWER + + + FOLLOWER + + + + + diff --git a/website/source/assets/images/consul-connect/workflows-not-technologies.png b/website/source/assets/images/consul-connect/workflows-not-technologies.png deleted file mode 100644 index 7ad7d15b2a..0000000000 Binary files a/website/source/assets/images/consul-connect/workflows-not-technologies.png and /dev/null differ diff --git a/website/source/assets/stylesheets/consul-connect/components/_logo-grid.scss b/website/source/assets/stylesheets/consul-connect/components/_logo-grid.scss index b3f3c98b16..25b48531b7 100644 --- a/website/source/assets/stylesheets/consul-connect/components/_logo-grid.scss +++ b/website/source/assets/stylesheets/consul-connect/components/_logo-grid.scss @@ -14,13 +14,8 @@ width: 50%; @media (min-width: 768px) { - padding: 5px $site-gutter-padding; width: 33%; } - - @media (min-width: 992px) { - padding: 25px $site-gutter-padding; - } } img { diff --git a/website/source/assets/stylesheets/consul-connect/components/_text-asset.scss b/website/source/assets/stylesheets/consul-connect/components/_text-asset.scss index 7af8785d66..127df53be4 100644 --- a/website/source/assets/stylesheets/consul-connect/components/_text-asset.scss +++ b/website/source/assets/stylesheets/consul-connect/components/_text-asset.scss @@ -36,6 +36,10 @@ margin-bottom: -120px; } + & > div:last-child { + justify-content: unset; + } + img { width: 145%; } @@ -87,6 +91,10 @@ } } + &:last-child { + justify-content: center; + } + & > img { width: 100%; @@ -95,6 +103,10 @@ } } + & > svg { + max-width: 100%; + } + &.code-sample > div { box-shadow: 0 40px 48px -20px rgba(63, 68, 85, 0.4); color: $white; diff --git a/website/source/assets/stylesheets/consul-connect/pages/_home.scss b/website/source/assets/stylesheets/consul-connect/pages/_home.scss index c936b661a3..5e496cde63 100644 --- a/website/source/assets/stylesheets/consul-connect/pages/_home.scss +++ b/website/source/assets/stylesheets/consul-connect/pages/_home.scss @@ -174,6 +174,10 @@ width: 42vw; } + @media (min-width: 1725px) { + width: 725px; + } + & > div { align-items: center; color: #d2d4dc; @@ -248,6 +252,11 @@ width: 42vw; } + @media (min-width: 1725px) { + padding-top: calc((725px * 0.63569) + 38px); + width: 725px; + } + & > div { background: #0e1016; border-radius: 3px 3px 0 0; @@ -392,6 +401,10 @@ width: 50%; } + & > svg { + width: 135px; + } + &:first-child { background: $consul-red; position: relative; diff --git a/website/source/configuration.html.erb b/website/source/configuration.html.erb index c243843cf6..55eeb9e1a9 100644 --- a/website/source/configuration.html.erb +++ b/website/source/configuration.html.erb @@ -195,7 +195,7 @@ description: |-
- Service Registry + <%= inline_svg 'consul-connect/svgs/semaphores.svg', height: 383 %>
diff --git a/website/source/index.html.erb b/website/source/index.html.erb index 50512aa942..aed1f2b251 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -111,7 +111,7 @@ description: |-
- + Service Discovery

Service Discovery for connectivity

Service Registry enables services to register and discover each other.

@@ -121,7 +121,7 @@ description: |-
- + Service Segmentation

Service Segmentation for security

Secure service-to-service communication with automatic TLS encryption and identity-based authorization.

@@ -131,7 +131,7 @@ description: |-
- + Service Configuration

Service Configuration for runtime configuration

Feature rich Key/Value store to easily configure services.

@@ -189,7 +189,7 @@ description: |-
- Workflows, not Technologies + Run and Connect Anywhere
@@ -209,7 +209,7 @@ description: |-
- Open and Extensible + Extend and Integrate
@@ -247,7 +247,7 @@ description: |-
- Consul + <%= inline_svg 'consul-connect/logos/consul-logo.svg' %>

Consul Open Source addresses the technical complexity of connecting services across distributed infrastructure.

@@ -263,7 +263,7 @@ description: |-
- Consul Enterprise + <%= inline_svg 'consul-connect/logos/consul-enterprise-logo.svg' %>

Consul Enterprise addresses the organizational complexity of large user bases and compliance requirements with collaboration and governance features.

diff --git a/website/source/segmentation.html.erb b/website/source/segmentation.html.erb index 639aa3c4c8..da7c28bba3 100644 --- a/website/source/segmentation.html.erb +++ b/website/source/segmentation.html.erb @@ -96,24 +96,8 @@ description: |-

-
-
- -
$ consul connect proxy \ - -service web \ - -service-addr 127.0.0.1:80 \ - -listen 10.0.1.109:7200 -==> Consul Connect proxy starting... - Configuration mode: Flags - Service: web - Public listener: 10.0.1.109:7200 => 127.0.0.1:80 - -==> Log data will now stream in as it occurs: - - 2018/06/23 09:33:51 [INFO] public listener starting on 10.0.1.109:7200 - 2018/06/23 09:33:51 [INFO] proxy loaded config and ready to serve -
-
+
+ Secure services across any runtime platform