diff --git a/website/css/bootstrap.css b/website/css/bootstrap.css index a9c9e9dfed9..92e98ef2c66 100644 --- a/website/css/bootstrap.css +++ b/website/css/bootstrap.css @@ -438,56 +438,56 @@ h6, .h6 { } .lead { - font-size: 1.5rem; + font-size: 1.375rem; font-weight: 400; } @media (max-width: 1200px) { .lead { - font-size: calc(1.275rem + 0.3vw); + font-size: calc(1.2625rem + 0.15vw); } } .display-1 { - font-size: 5rem; + font-size: 4rem; font-weight: 600; line-height: 1.125; } @media (max-width: 1200px) { .display-1 { - font-size: calc(1.625rem + 4.5vw); + font-size: calc(1.525rem + 3.3vw); } } .display-2 { - font-size: 3rem; + font-size: 2.5rem; font-weight: 600; line-height: 1.125; } @media (max-width: 1200px) { .display-2 { - font-size: calc(1.425rem + 2.1vw); + font-size: calc(1.375rem + 1.5vw); } } .display-3 { - font-size: 2.25rem; + font-size: 2rem; font-weight: 500; line-height: 1.125; } @media (max-width: 1200px) { .display-3 { - font-size: calc(1.35rem + 1.2vw); + font-size: calc(1.325rem + 0.9vw); } } .display-4 { - font-size: 1.875rem; + font-size: 1.75rem; font-weight: 500; line-height: 1.125; } @media (max-width: 1200px) { .display-4 { - font-size: calc(1.3125rem + 0.75vw); + font-size: calc(1.3rem + 0.6vw); } } @@ -631,12 +631,12 @@ pre code { } @media (min-width: 768px) { .container { - max-width: 748px; + max-width: 958px; } } @media (min-width: 980px) { .container { - max-width: 948px; + max-width: 1008px; } } @media (min-width: 1240px) { @@ -665,12 +665,12 @@ pre code { } @media (min-width: 768px) { .container-md, .container-sm, .container-xs, .container { - max-width: 748px; + max-width: 958px; } } @media (min-width: 980px) { .container-lg, .container-md, .container-sm, .container-xs, .container { - max-width: 948px; + max-width: 1008px; } } @media (min-width: 1240px) { diff --git a/website/css/main.css b/website/css/main.css index ee5b5def065..6c4005f6034 100644 --- a/website/css/main.css +++ b/website/css/main.css @@ -236,15 +236,25 @@ a.card:hover:after, position: absolute; right: 0; top: 40px; + transform: translateX(30%); transition: 0.4s transform; transition-delay: 0.6s; width: 100%; z-index: 1; } +} +@media screen and (min-width: 980px) and (min-width: 1240px) { + .case-study-card:before { + transform: translateX(10%); + } +} +@media screen and (min-width: 980px) { .case-study-card.is-open:before { transform: translateX(60%); transition-delay: 0s; } +} +@media screen and (min-width: 980px) { .case-study-card-wrap { align-items: stretch; display: flex; @@ -256,18 +266,24 @@ a.card:hover:after, width: calc(200% + 42px); z-index: 2; } +} +@media screen and (min-width: 980px) { .case-study-card.is-open .case-study-card-wrap { transition-delay: 0s; width: 100%; } +} +@media screen and (min-width: 980px) { .case-study-card-body { display: flex; flex-direction: column; - padding-right: 112px !important; + padding-right: 80px !important; } .case-study-card-body > .row { align-self: stretch; } +} +@media screen and (min-width: 980px) { .case-study-card-toggle { background: #fff; box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2); @@ -291,33 +307,55 @@ a.card:hover:after, .case-study-card-toggle:after { transform: rotate(90deg); } +} +@media screen and (min-width: 980px) { .case-study-card.is-open .case-study-card-toggle:before { opacity: 0; transform: rotate(-90deg); } +} +@media screen and (min-width: 980px) { .case-study-card.is-open .case-study-card-toggle:after { transform: rotate(0); } - .case-study-card .col-lg-4, -.case-study-card .col-lg-6 { +} +@media screen and (min-width: 980px) { + .case-study-card .col-lg-3, +.case-study-card .col-lg-auto { opacity: 0; transform: translateX(24px); transition: 0.4s opacity, 0.4s transform; } - .case-study-card .col-lg-4 { +} +@media screen and (min-width: 980px) { + .case-study-card .col-lg-3 { transition-delay: 0s; } - .case-study-card .col-lg-6 { +} +@media screen and (min-width: 980px) { + .case-study-card .col-lg-auto { transition-delay: 0.2s; } - .case-study-card.is-open .col-lg-4, .case-study-card.is-open .col-lg-6 { +} +@media screen and (min-width: 980px) and (min-width: 980px) { + .case-study-card .col-lg-auto { + max-width: 605px; + width: calc(100% - 319px); + } +} +@media screen and (min-width: 980px) { + .case-study-card.is-open .col-lg-3, .case-study-card.is-open .col-lg-auto { opacity: 1; transform: none; } - .case-study-card.is-open .col-lg-4 { +} +@media screen and (min-width: 980px) { + .case-study-card.is-open .col-lg-3 { transition-delay: 0.4s; } - .case-study-card.is-open .col-lg-6 { +} +@media screen and (min-width: 980px) { + .case-study-card.is-open .col-lg-auto { transition-delay: 0.2s; } } @@ -326,6 +364,41 @@ a.card:hover:after, white-space: nowrap; } +.form-control { + border: 1px solid #6c757d; + border-radius: 6px; + box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2); + color: #212529; + height: auto; + min-height: 48px; + padding: 12px 16px; + width: 100%; +} +.form-control:focus { + border-color: #212529; + box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2); + color: #212529; +} +.form-control::-moz-placeholder { + color: #6c757d; +} +.form-control:-ms-input-placeholder { + color: #6c757d; +} +.form-control::placeholder { + color: #6c757d; +} + +select.form-control { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} + +select.form-control:not([data-chosen]) { + color: #6c757d; +} + .hero { background-repeat: no-repeat; background-position: center; @@ -387,6 +460,10 @@ hr.is-yellow { display: block; height: 48px; margin-bottom: 24px; + -o-object-fit: contain; + object-fit: contain; + -o-object-position: center; + object-position: center; } @media screen and (min-width: 576px) { .icon { @@ -537,10 +614,10 @@ img { } .photo-frame { - background: #fff; - border: 6px solid #257af4; + background: rgba(255, 255, 255, 0.6); border-radius: 100%; box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2); + display: block; margin-bottom: 24px; max-width: 160px; overflow: hidden; @@ -696,9 +773,14 @@ img { left: 1px; position: absolute; right: 1px; - top: 76px; + top: 68px; z-index: 10; } +@media screen and (min-width: 1240px) { + .tabs:before { + top: 76px; + } +} .tabs-body { background: #fff; border-color: #6c757d; @@ -706,21 +788,41 @@ img { border-style: solid; border-width: 1px; box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2); - padding: 40px; + padding: 24px; +} +@media screen and (min-width: 980px) { + .tabs-body { + padding: 32px; + } +} +@media screen and (min-width: 1240px) { + .tabs-body { + padding: 40px; + } } .tabs .nav-tabs { border-bottom: 0; flex-wrap: nowrap; - height: 84px; + height: 76px; margin: -20px -20px -9px; -webkit-mask-image: linear-gradient(90deg, transparent 0%, #000 20px, #000 calc(100% - 20px), transparent 100%); mask-image: linear-gradient(90deg, transparent 0%, #000 20px, #000 calc(100% - 20px), transparent 100%); - overflow: auto; - overflow-x: auto; + overflow: scroll; + overflow-x: scroll; overflow-y: visible; padding: 20px 20px 0; position: relative; } +@media screen and (min-width: 940px) { + .tabs .nav-tabs { + overflow: visible; + } +} +@media screen and (min-width: 1240px) { + .tabs .nav-tabs { + height: 84px; + } +} .tabs .nav-link { align-items: center; border-bottom: 0; @@ -728,24 +830,45 @@ img { display: flex; font-size: 0.875rem; flex-shrink: 0; - height: 64px; + height: 56px; justify-content: center; - padding: 0 16px 8px; + padding: 0 12px 8px; text-align: center; white-space: nowrap; } +@media screen and (min-width: 1240px) { + .tabs .nav-link { + height: 64px; + padding: 0 16px 8px; + } +} .tabs .nav-link.active { background: #fff; box-shadow: 0 -4px 8px rgba(108, 117, 125, 0.1); font-weight: 700; - padding: 0 32px 8px; + padding: 0 16px 8px; +} +@media screen and (min-width: 980px) { + .tabs .nav-link.active { + padding: 0 24px 8px; + } +} +@media screen and (min-width: 1240px) { + .tabs .nav-link.active { + padding: 0 32px 8px; + } } .tab-pane pre { background: #212529; border-radius: 16px; color: #fff; - padding: 32px 24px; + padding: 24px 16px; +} +@media screen and (min-width: 1240px) { + .tab-pane pre { + padding: 32px 24px; + } } .trailing-link { @@ -807,15 +930,32 @@ ul.has-separators li:not(:last-child) { } .bg-offset-right { + bottom: 0; + left: -24px; + position: absolute; + top: 0; + width: calc(100vw + 24px); + z-index: -1; +} +@media screen and (min-width: 1240px) { + .bg-offset-right { + left: -96px; + width: calc(100vw + 96px); + } +} + +.bg-inset-right { bottom: 0; left: 40px; position: absolute; top: 0; - width: 100vw; + width: calc(100vw - 40px); + z-index: -1; } @media screen and (min-width: 980px) { - .bg-offset-right { + .bg-inset-right { left: 96px; + width: calc(100vw - 96px); } } diff --git a/website/images/logos/logo-cloudflare.png b/website/images/logos/logo-cloudflare.png deleted file mode 100644 index 84b81dd2215..00000000000 Binary files a/website/images/logos/logo-cloudflare.png and /dev/null differ diff --git a/website/images/logos/logo-cloudflare.svg b/website/images/logos/logo-cloudflare.svg new file mode 100644 index 00000000000..e4bf4f2f803 --- /dev/null +++ b/website/images/logos/logo-cloudflare.svg @@ -0,0 +1,25 @@ + + \ No newline at end of file diff --git a/website/images/photos/photo-aaron-katz.jpg b/website/images/photos/photo-aaron-katz.jpg index 0bbd61112ff..44902da70ea 100644 Binary files a/website/images/photos/photo-aaron-katz.jpg and b/website/images/photos/photo-aaron-katz.jpg differ diff --git a/website/images/photos/photo-alexey-milovidov.jpg b/website/images/photos/photo-alexey-milovidov.jpg index 12c9ba082f4..2e54d134feb 100644 Binary files a/website/images/photos/photo-alexey-milovidov.jpg and b/website/images/photos/photo-alexey-milovidov.jpg differ diff --git a/website/images/photos/photo-arno-van-driel.jpg b/website/images/photos/photo-arno-van-driel.jpg index 70e97a58d46..9a7855491aa 100644 Binary files a/website/images/photos/photo-arno-van-driel.jpg and b/website/images/photos/photo-arno-van-driel.jpg differ diff --git a/website/images/photos/photo-brian-hunter.jpg b/website/images/photos/photo-brian-hunter.jpg new file mode 100644 index 00000000000..d0672bb3cfb Binary files /dev/null and b/website/images/photos/photo-brian-hunter.jpg differ diff --git a/website/images/photos/photo-dorota-szeremeta.jpg b/website/images/photos/photo-dorota-szeremeta.jpg index d5847fa310b..70e427a1154 100644 Binary files a/website/images/photos/photo-dorota-szeremeta.jpg and b/website/images/photos/photo-dorota-szeremeta.jpg differ diff --git a/website/images/photos/photo-ivan-blinkov.jpg b/website/images/photos/photo-ivan-blinkov.jpg index 0546f3107e4..23a469c277d 100644 Binary files a/website/images/photos/photo-ivan-blinkov.jpg and b/website/images/photos/photo-ivan-blinkov.jpg differ diff --git a/website/images/photos/photo-jason-chan.jpg b/website/images/photos/photo-jason-chan.jpg index 34cc4b84ba2..6ce0b524cb2 100644 Binary files a/website/images/photos/photo-jason-chan.jpg and b/website/images/photos/photo-jason-chan.jpg differ diff --git a/website/images/photos/photo-kristina-frost.jpg b/website/images/photos/photo-kristina-frost.jpg new file mode 100644 index 00000000000..f15206e51e0 Binary files /dev/null and b/website/images/photos/photo-kristina-frost.jpg differ diff --git a/website/images/photos/photo-mike-hayes.jpg b/website/images/photos/photo-mike-hayes.jpg index 1015a6053a8..c976866fc45 100644 Binary files a/website/images/photos/photo-mike-hayes.jpg and b/website/images/photos/photo-mike-hayes.jpg differ diff --git a/website/images/photos/photo-placeholder.png b/website/images/photos/photo-placeholder.png new file mode 100644 index 00000000000..820802d67a2 Binary files /dev/null and b/website/images/photos/photo-placeholder.png differ diff --git a/website/images/photos/photo-richard-raposa.jpg b/website/images/photos/photo-richard-raposa.jpg new file mode 100644 index 00000000000..f8338d6e3df Binary files /dev/null and b/website/images/photos/photo-richard-raposa.jpg differ diff --git a/website/images/photos/photo-thom-oconner.jpg b/website/images/photos/photo-thom-oconner.jpg index fc0b37afaf1..23d2d10382b 100644 Binary files a/website/images/photos/photo-thom-oconner.jpg and b/website/images/photos/photo-thom-oconner.jpg differ diff --git a/website/images/photos/photo-yury-izrailevsky.jpg b/website/images/photos/photo-yury-izrailevsky.jpg index 79e2f2665d4..9209ca1607d 100644 Binary files a/website/images/photos/photo-yury-izrailevsky.jpg and b/website/images/photos/photo-yury-izrailevsky.jpg differ diff --git a/website/src/scss/_variables.scss b/website/src/scss/_variables.scss index 9391a12a43a..4d5ef4f4667 100644 --- a/website/src/scss/_variables.scss +++ b/website/src/scss/_variables.scss @@ -139,8 +139,8 @@ $grid-breakpoints: ( $container-max-widths: ( xs: 576px, sm: 576px, - md: 748px, - lg: 948px, + md: 958px, + lg: 1008px, xl: 1118px ); @@ -206,10 +206,10 @@ $headings-font-weight: 500; $headings-line-height: 1.125; $headings-color: null; -$display1-size: 80px; -$display2-size: 48px; -$display3-size: 36px; -$display4-size: 30px; +$display1-size: 64px; +$display2-size: 40px; +$display3-size: 32px; +$display4-size: 28px; $display5-size: 20px; $display6-size: 14px; @@ -221,7 +221,7 @@ $display5-weight: 500; $display6-weight: 700; $display-line-height: $headings-line-height; -$lead-font-size: $font-size-base * 1.5; +$lead-font-size: 22px; $lead-font-weight: 400; $text-muted: $gray-700; diff --git a/website/src/scss/components/_case-study-card.scss b/website/src/scss/components/_case-study-card.scss index d39ecea2b2c..bb2eb53abd1 100644 --- a/website/src/scss/components/_case-study-card.scss +++ b/website/src/scss/components/_case-study-card.scss @@ -88,10 +88,15 @@ position: absolute; right: 0; top: 40px; + transform: translateX(30%); transition: 0.4s transform; transition-delay: 0.6s; width: 100%; z-index: 1; + + @media screen and (min-width: 1240px) { + transform: translateX(10%); + } } &.is-open:before { @@ -119,7 +124,7 @@ &-body { display: flex; flex-direction: column; - padding-right: 112px !important; + padding-right: 80px !important; > .row { align-self: stretch; @@ -162,32 +167,37 @@ transform: rotate(0); } - .col-lg-4, - .col-lg-6 { + .col-lg-3, + .col-lg-auto { opacity: 0; transform: translateX(24px); transition: 0.4s opacity, 0.4s transform; } - .col-lg-4 { + .col-lg-3 { transition-delay: 0s; } - .col-lg-6 { + .col-lg-auto { transition-delay: 0.2s; + + @media screen and (min-width: 980px) { + max-width: 605px; + width: calc(100% - 319px); + } } - &.is-open .col-lg-4, - &.is-open .col-lg-6 { + &.is-open .col-lg-3, + &.is-open .col-lg-auto { opacity: 1; transform: none; } - &.is-open .col-lg-4 { + &.is-open .col-lg-3 { transition-delay: 0.4s; } - &.is-open .col-lg-6 { + &.is-open .col-lg-auto { transition-delay: 0.2s; } } diff --git a/website/src/scss/components/_form.scss b/website/src/scss/components/_form.scss new file mode 100644 index 00000000000..69fa422f51f --- /dev/null +++ b/website/src/scss/components/_form.scss @@ -0,0 +1,28 @@ +.form-control { + border: 1px solid $gray-700; + border-radius: 6px; + box-shadow: $box-shadow; + color: $black; + height: auto; + min-height: 48px; + padding: 12px 16px; + width: 100%; + + &:focus { + border-color: $black; + box-shadow: $box-shadow; + color: $black; + } + + &::placeholder { + color: $gray-700; + } +} + +select.form-control { + appearance: none; +} + +select.form-control:not([data-chosen]) { + color: $gray-700; +} diff --git a/website/src/scss/components/_icon.scss b/website/src/scss/components/_icon.scss index 47f8f88bbf0..090720b049a 100644 --- a/website/src/scss/components/_icon.scss +++ b/website/src/scss/components/_icon.scss @@ -2,6 +2,8 @@ display: block; height: 48px; margin-bottom: $spacer * 3; + object-fit: contain; + object-position: center; @media screen and (min-width: 576px) { height: 64px; diff --git a/website/src/scss/components/_photo-frame.scss b/website/src/scss/components/_photo-frame.scss index 3275a54b294..6f8407fe6c3 100644 --- a/website/src/scss/components/_photo-frame.scss +++ b/website/src/scss/components/_photo-frame.scss @@ -1,8 +1,9 @@ .photo-frame { - background: $white; - border: 6px solid $color-primary-accent-blue; + background: rgba($white, 0.6); + //border: 6px solid $color-primary-accent-blue; border-radius: 100%; box-shadow: $box-shadow; + display: block; margin-bottom: $spacer * 3; max-width: 160px; overflow: hidden; diff --git a/website/src/scss/components/_tabs.scss b/website/src/scss/components/_tabs.scss index 70ce6355b14..620b86e7d00 100644 --- a/website/src/scss/components/_tabs.scss +++ b/website/src/scss/components/_tabs.scss @@ -10,8 +10,12 @@ left: 1px; position: absolute; right: 1px; - top: 76px; + top: 68px; z-index: 10; + + @media screen and (min-width: 1240px) { + top: 76px; + } } &-body { @@ -21,20 +25,36 @@ border-style: solid; border-width: $border-width; box-shadow: $box-shadow; - padding: 40px; + padding: $spacer * 3; + + @media screen and (min-width: 980px) { + padding: $spacer * 4; + } + + @media screen and (min-width: 1240px) { + padding: $spacer * 5; + } } .nav-tabs { border-bottom: 0; flex-wrap: nowrap; - height: 76px + $border-radius; + height: 68px + $border-radius; margin: -20px -20px #{-($border-radius + $border-width)}; mask-image: linear-gradient(90deg, transparent 0%, #000 20px, #000 calc(100% - 20px), transparent 100%); - overflow: auto; - overflow-x: auto; + overflow: scroll; + overflow-x: scroll; overflow-y: visible; padding: 20px 20px 0; position: relative; + + @media screen and (min-width: 940px) { + overflow: visible; + } + + @media screen and (min-width: 1240px) { + height: 76px + $border-radius; + } } .nav-link { @@ -44,18 +64,31 @@ display: flex; font-size: $font-size-sm; flex-shrink: 0; - height: 56px + $border-radius; + height: 48px + $border-radius; justify-content: center; - padding: 0 16px $border-radius; + padding: 0 12px $border-radius; text-align: center; white-space: nowrap; + + @media screen and (min-width: 1240px) { + height: 56px + $border-radius; + padding: 0 16px $border-radius; + } } .nav-link.active { background: $white; box-shadow: 0 -4px 8px rgba($gray-700, .1); font-weight: $font-weight-bold; - padding: 0 32px $border-radius; + padding: 0 16px $border-radius; + + @media screen and (min-width: 980px) { + padding: 0 24px $border-radius; + } + + @media screen and (min-width: 1240px) { + padding: 0 32px $border-radius; + } } } @@ -64,6 +97,10 @@ background: $black; border-radius: 16px; color: $white; - padding: ($spacer * 4) ($spacer * 3); + padding: ($spacer * 3) ($spacer * 2); + + @media screen and (min-width: 1240px) { + padding: ($spacer * 4) ($spacer * 3); + } } } diff --git a/website/src/scss/utilities/_bg.scss b/website/src/scss/utilities/_bg.scss index c00cd4e8921..0b8f63e298f 100644 --- a/website/src/scss/utilities/_bg.scss +++ b/website/src/scss/utilities/_bg.scss @@ -7,13 +7,29 @@ } .bg-offset-right { + bottom: 0; + left: -24px; + position: absolute; + top: 0; + width: calc(100vw + 24px); + z-index: -1; + + @media screen and (min-width: 1240px) { + left: -96px; + width: calc(100vw + 96px); + } +} + +.bg-inset-right { bottom: 0; left: 40px; position: absolute; top: 0; - width: 100vw; + width: calc(100vw - 40px); + z-index: -1; @media screen and (min-width: 980px) { left: 96px; + width: calc(100vw - 96px); } } diff --git a/website/templates/common_meta.html b/website/templates/common_meta.html index 0c4f5c30785..6fa00d9825d 100644 --- a/website/templates/common_meta.html +++ b/website/templates/common_meta.html @@ -1,5 +1,6 @@ {% set description = description or _('ClickHouse is a fast open-source column-oriented database management system that allows generating analytical data reports in real-time using SQL queries') %} + diff --git a/website/templates/company/contact.html b/website/templates/company/contact.html index d99bc526cc2..ba2bab60c26 100644 --- a/website/templates/company/contact.html +++ b/website/templates/company/contact.html @@ -1,4 +1,4 @@ -
diff --git a/website/templates/company/hero.html b/website/templates/company/hero.html index 39076af289b..762bbe85c0a 100644 --- a/website/templates/company/hero.html +++ b/website/templates/company/hero.html @@ -3,7 +3,7 @@
+
{{ _('VP, Support & Services') }}
-- {{ _('We are primarily looking for Support Engineers and Software Engineers at this time! For more information, contact us at') }} - careers@clickhouse.com -
-