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 new file mode 100644 index 0000000000..61ce749b0b Binary files /dev/null and b/website/source/assets/images/consul-connect/distributed-locks-and-semaphores.png differ diff --git a/website/source/assets/images/consul-connect/logos/spiffe.png b/website/source/assets/images/consul-connect/logos/spiffe.png new file mode 100644 index 0000000000..68df72ac9c Binary files /dev/null and b/website/source/assets/images/consul-connect/logos/spiffe.png differ diff --git a/website/source/assets/images/consul-connect/logos/vault.png b/website/source/assets/images/consul-connect/logos/vault.png new file mode 100644 index 0000000000..5e4f4e8c67 Binary files /dev/null and b/website/source/assets/images/consul-connect/logos/vault.png differ diff --git a/website/source/assets/stylesheets/consul-connect/_index.scss b/website/source/assets/stylesheets/consul-connect/_index.scss index 4d6b38e480..cf0e7f5970 100644 --- a/website/source/assets/stylesheets/consul-connect/_index.scss +++ b/website/source/assets/stylesheets/consul-connect/_index.scss @@ -7,7 +7,7 @@ @import 'components/_hero'; @import 'components/_logo-grid'; @import 'components/_section'; -@import 'components/_text-image'; +@import 'components/_text-asset'; @import 'components/_timeline'; @import 'components/_use-cases'; diff --git a/website/source/assets/stylesheets/consul-connect/components/_section.scss b/website/source/assets/stylesheets/consul-connect/components/_section.scss index c5154906b4..5696f762a5 100644 --- a/website/source/assets/stylesheets/consul-connect/components/_section.scss +++ b/website/source/assets/stylesheets/consul-connect/components/_section.scss @@ -17,6 +17,11 @@ background: #f7f8fa !important; //TODO - !important is to override the `#page-home section` #fff background; } + &.bg-dark { + background: #252937 !important; //TODO - !important is to override the `#page-home section` #fff background; + color: #fff; + } + &.border-top { border-top: 1px solid #e5e6eb; } diff --git a/website/source/assets/stylesheets/consul-connect/components/_text-asset.scss b/website/source/assets/stylesheets/consul-connect/components/_text-asset.scss new file mode 100644 index 0000000000..143c9e0bcd --- /dev/null +++ b/website/source/assets/stylesheets/consul-connect/components/_text-asset.scss @@ -0,0 +1,103 @@ +.g-text-asset { + align-content: space-between; + display: flex; + justify-content: center; + margin: 0 (-$site-gutter-padding); + + &.reverse { + flex-direction: row-reverse; + + & > div:first-child > div { + margin-left: auto; + padding: 0 32px 0 0; + } + } + + &.large { + margin-bottom: -96px; + + img { + width: auto; + } + } + + & > div { + align-items: center; + display: flex; + padding: 0 $site-gutter-padding; + width: 50%; + + &:first-child > div { + margin-left: 0; + padding: 0 0 0 32px; + max-width: 454px; + + & a { + color: #1563ff; + } + + & svg { + margin-left: 10px; + } + } + + &.code-sample > div { + box-shadow: 0 40px 48px -20px rgba(63, 68, 85, 0.4); + color: $white; + margin: 0; + width: 100%; + + span { + background: #252937; + border-bottom: 1px solid rgba(255, 255, 255, 0.15); + display: block; + font-size: 1.6rem; + padding: 13px 0 11px 24px; + } + + .code { + background: #1e212a; + font-size: 1.4rem; + padding: 16px 24px 32px; + width: 100%; + + code { + background: #1e212a; + border-radius: 0; + color: $white; + white-space: pre; + + &.keyword { + color: #be5580; + } + } + } + } + + &.logos { + justify-content: center; + + & > div { + align-items: center; + display: flex; + flex-direction: column; + + & img { + margin: 29px 0; + } + } + } + } + + h3 { + margin: 16px 0; + } + + & > img { + width: 100%; + + &.shadow { + box-shadow: 0 40px 48px -20px rgba(63, 68, 85, 0.4); + } + } +} diff --git a/website/source/assets/stylesheets/consul-connect/components/_text-image.scss b/website/source/assets/stylesheets/consul-connect/components/_text-image.scss deleted file mode 100644 index f5292a4a13..0000000000 --- a/website/source/assets/stylesheets/consul-connect/components/_text-image.scss +++ /dev/null @@ -1,56 +0,0 @@ -.g-text-image { - align-content: space-between; - display: flex; - justify-content: center; - margin: 0 (-$site-gutter-padding); - - &.reverse { - flex-direction: row-reverse; - - & > div > div:last-child { - margin-left: 0; - padding: 0 0 0 32px; - } - } - - &.large { - margin-bottom: -96px; - - img { - width: auto; - } - } - - img { - width: 100%; - - &.shadow { - box-shadow: 0 40px 48px -20px rgba(63, 68, 85, 0.4); - } - } - - h3 { - margin: 16px 0; - } - - & > div { - align-items: center; - display: flex; - padding: 0 $site-gutter-padding; - width: 50%; - - & > div:last-child { - margin-left: auto; - padding: 0 32px 0 0; - max-width: 454px; - - & a { - color: #1563ff; - } - - & svg { - margin-left: 10px; - } - } - } -} diff --git a/website/source/configuration.html.erb b/website/source/configuration.html.erb index 7d0377eab0..6fd856c40d 100644 --- a/website/source/configuration.html.erb +++ b/website/source/configuration.html.erb @@ -46,10 +46,7 @@ description: |-

Features

-
-
- Automation through Codification -
+

Key/Value Store

@@ -59,16 +56,16 @@ description: |-

+
+ Service Registry +
-
-
- Workflows, not Technologies -
+

Transaction Support

@@ -78,16 +75,30 @@ description: |-

+
+
+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
+
+
-
-
- Open and Extensible -
+

Blocking Queries / Edge-Triggered Requests

@@ -97,16 +108,30 @@ description: |-

+
+
+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
+
+
-
-
- Workflows, not Technologies -
+

Watches

@@ -116,16 +141,30 @@ description: |-

+
+
+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
+
+
-
-
- Service Registry -
+

Distributed Locks and Semaphores

@@ -135,6 +174,9 @@ description: |-

+
+ Service Registry +
diff --git a/website/source/discovery.html.erb b/website/source/discovery.html.erb index b781225bc7..7da3e28a0e 100644 --- a/website/source/discovery.html.erb +++ b/website/source/discovery.html.erb @@ -41,15 +41,18 @@ description: |- + +

Features

-
-
- Service Registry -
+

Service Registry

@@ -59,16 +62,16 @@ description: |-

+
+ Service Registry +
-
-
- DNS Query Interface -
+

DNS Query Interface

@@ -78,16 +81,30 @@ description: |-

+
+
+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
+
+
-
-
- HTTP API with Edge Triggers -
+

HTTP API with Edge Triggers

@@ -97,16 +114,30 @@ description: |-

+
+
+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
+
+
-
-
- Multi Datacenter -
+

Multi Datacenter

@@ -116,16 +147,30 @@ description: |-

+
+
+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
+
+
-
-
- Service Registry -
+

Health Checks

@@ -135,6 +180,9 @@ description: |-

+
+ Service Registry +
diff --git a/website/source/index.html.erb b/website/source/index.html.erb index 141ee8f006..881952c092 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -74,30 +74,28 @@ description: |-

Principles of Consul

-
-
- Automation through Codification -
+

Automation through Codification

Codify and automate service authorization policy.

-
-
- - -
-
-
-
- Workflows, not Technologies -
-
+
-

Workflows, not Technologies

-

Connect services across any runtime platform and public or private cloud. Connect services from Kubernetes to VMs, Containers to Serverless functions.

+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
@@ -106,10 +104,23 @@ description: |-
-
+
- Open and Extensible +
+

Workflows, not Technologies

+

Connect services across any runtime platform and public or private cloud. Connect services from Kubernetes to VMs, Containers to Serverless functions.

+
+
+ Workflows, not Technologies +
+
+
+
+ +
+
+

Open and Extensible

@@ -120,6 +131,9 @@ description: |-
+
+ Open and Extensible +
diff --git a/website/source/segmentation.html.erb b/website/source/segmentation.html.erb index 8ad888b685..6e11866070 100644 --- a/website/source/segmentation.html.erb +++ b/website/source/segmentation.html.erb @@ -47,10 +47,7 @@ description: |-

Features

-
-
- Service Access Graph -
+

Service Access Graph

@@ -60,16 +57,16 @@ description: |-

+
+ Service Access Graph +
-
-
- DNS Query Interface -
+

Secure services across any runtime platform

@@ -79,16 +76,30 @@ description: |-

+
+
+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
+
+
-
-
- DNS Query Interface -
+

Certificate-Based Service Identity

@@ -98,16 +109,19 @@ description: |-

+
+
+ Vault + Spiffe +
+
-
-
- DNS Query Interface -
+

Encrypted communication

@@ -117,6 +131,23 @@ description: |-

+
+
+ Code Sample +
+ $ curl \ + --request POST \ + --data \ +'{ + "Name": "api", + "Service": { + "Service": "api", + "Tags": ["v1.2.3"], + "Failover": { + "Datacenters": ["dc1", "dc2"] +
+
+