diff --git a/src/docs/markdown/caddyfile/concepts.md b/src/docs/markdown/caddyfile/concepts.md index f820ebf..528cb24 100644 --- a/src/docs/markdown/caddyfile/concepts.md +++ b/src/docs/markdown/caddyfile/concepts.md @@ -77,6 +77,9 @@ example2.com { } ``` +If a request matches multiple site blocks, the first matching site is chosen. Requests don't cascade into to other site blocks. + + ### Directives **Directives** are keywords which customize how the site is served. For example, a complete file server config might look like this: diff --git a/src/index.html b/src/index.html index a18d468..773f88e 100644 --- a/src/index.html +++ b/src/index.html @@ -1,7 +1,7 @@ - Caddy 2 - The Ultimate Server with Automatic HTTPS + Caddy - The Ultimate Server with Automatic HTTPS {{include "/includes/head.html"}} diff --git a/src/resources/css/common.css b/src/resources/css/common.css index e110120..9f537cc 100644 --- a/src/resources/css/common.css +++ b/src/resources/css/common.css @@ -57,12 +57,15 @@ header { height: 40px; } +#search { + margin-top: 4px; +} + header nav { text-align: right; line-height: 40px; } - header nav > a { display: inline-block; padding-left: 10px; @@ -193,6 +196,18 @@ footer > div { } @media (max-width: 900px) { + header { + flex-direction: column; + } + + #logo-container { + text-align: center; + } + + header nav { + text-align: center; + } + footer { flex-direction: column; margin-top: 0; diff --git a/src/resources/css/docs.css b/src/resources/css/docs.css index ad66926..9582d70 100644 --- a/src/resources/css/docs.css +++ b/src/resources/css/docs.css @@ -27,6 +27,10 @@ header { font-size: 12px; } +#search { + margin-top: 0; +} + header nav { font-size: 16px; line-height: 2em; @@ -767,7 +771,11 @@ td code { } } -@media (max-width: 700px) { +@media (max-width: 900px) { + #logo-container { + display: block; + } + #logo-docs { display: none; } diff --git a/src/resources/css/home.css b/src/resources/css/home.css index b0646c4..48dc220 100644 --- a/src/resources/css/home.css +++ b/src/resources/css/home.css @@ -2,10 +2,6 @@ body { font-family: 'Inter', sans-serif; } -#search { - margin-top: 4px; -} - .hero { background-image: url('/resources/images/bg-teal.jpg'); background-repeat: no-repeat; @@ -171,18 +167,6 @@ iframe.github-stars { } @media (max-width: 900px) { - header { - flex-direction: column; - } - - #logo-container { - text-align: center; - } - - header nav { - text-align: center; - } - h1 { font-size: 50px; word-wrap: break-word;