diff --git a/_includes/landing-page/community-banner.html b/_includes/landing-page/community-banner.html index 0cc8b0e72a..ecc9ed62a2 100644 --- a/_includes/landing-page/community-banner.html +++ b/_includes/landing-page/community-banner.html @@ -1,19 +1,18 @@ -
+
-
+

Join the Docker Community Slack channel

+
Connect with Docker Captains and Docker enthusiasts through our - Community Slack channel. + Community Slack channel. It’s a great place to learn and ask questions + along your journey.
-

- It’s a great place to learn and ask questions along your journey. -

- - slack - Join the community + + slack + Join the community
diff --git a/_includes/landing-page/docker-aci.html b/_includes/landing-page/docker-aci.html index 9263727677..152fd1f3cd 100644 --- a/_includes/landing-page/docker-aci.html +++ b/_includes/landing-page/docker-aci.html @@ -1,4 +1,4 @@ -
+
diff --git a/_includes/landing-page/docker-hub-signup.html b/_includes/landing-page/docker-hub-signup.html index 6c121c67bc..7d49a95092 100644 --- a/_includes/landing-page/docker-hub-signup.html +++ b/_includes/landing-page/docker-hub-signup.html @@ -1,4 +1,4 @@ -
+
diff --git a/_includes/landing-page/docker-pricing.html b/_includes/landing-page/docker-pricing.html index 118c66a966..07b472d699 100644 --- a/_includes/landing-page/docker-pricing.html +++ b/_includes/landing-page/docker-pricing.html @@ -1,4 +1,4 @@ -
+
diff --git a/_includes/landing-page/dockercon-banner.html b/_includes/landing-page/dockercon-banner.html index 2fc26ae340..654cb33465 100644 --- a/_includes/landing-page/dockercon-banner.html +++ b/_includes/landing-page/dockercon-banner.html @@ -1,4 +1,4 @@ -
+
diff --git a/_includes/landing-page/dockercon-wrapup-banner.html b/_includes/landing-page/dockercon-wrapup-banner.html index 466e4b3a61..bec64e576d 100644 --- a/_includes/landing-page/dockercon-wrapup-banner.html +++ b/_includes/landing-page/dockercon-wrapup-banner.html @@ -1,4 +1,4 @@ -
+
diff --git a/_scss/_landing.scss b/_scss/_landing.scss index 83548be8a2..9c96a980bd 100644 --- a/_scss/_landing.scss +++ b/_scss/_landing.scss @@ -243,65 +243,46 @@ body.landing { } } - section.join-community { + section.cta-banner { background-color: $dark-blue; - padding: 75px 0; + padding: 75px 0; h2, h5, p { color: white; } - &.dockercon { - text-align: center; + text-align: center; - @include md-width { - text-align: left; - } - - img { - margin-bottom: 20px; - max-height: 100px; - } - - h2 { - color: white; - font-size: 32px; - line-height: 37px;; - } - - a.btn { - background-color: #FF3F73; - color: white; - font-family: 'Open Sans', sans-serif; - font-size: 17px; - font-weight: bold; - padding: 20px 60px; - margin-top: 50px; - } + @include md-width { + text-align: left; } - &.slack { - a.slack-button { - background: #FFFFFF; - border: 2px solid #FFFFFF; - box-sizing: border-box; - border-radius: 3px; - align-items: center; - display: inline-flex; - padding: 0 26px 0 2px; - text-transform: none; - margin-top: 2rem; + img { + margin-bottom: 20px; + max-height: 100px; + } - img { - height: 56px; - width: 56px; - } - span { - font-weight: bold; - font-size: 17px; - line-height: 24px; - color: $dark-blue; - } + h2 { + font-size: 32px; + line-height: 37px;; + } + + a.btn { + background: #FF3F73; + color: white; + font-size: 17px; + font-weight: bold; + margin-top: 50px; + padding: 20px 60px; + + img { + margin: 0; + } + + &.slack-button { + background: white; + color: $dark-blue; + padding: 2px 25px 2px 10px; } } } @@ -368,8 +349,8 @@ body.landing { } } - footer.footer { - background-color: $dark-blue; + footer { + background-color: $bg-footer-landing; margin-top: 130px; a, p { @@ -377,7 +358,3 @@ body.landing { } } } - -body.landing:not(.night) { - background-color: $bg-sidebar; -} diff --git a/_scss/_night-mode.scss b/_scss/_night-mode.scss index 069cd293e1..7bb509cf14 100755 --- a/_scss/_night-mode.scss +++ b/_scss/_night-mode.scss @@ -11,6 +11,9 @@ body.night { color: inherit; background-color: $bg-card-night; } + footer { + background-color: $bg-footer-landing-night; + } } .rating-nero-value, diff --git a/_scss/_variables.scss b/_scss/_variables.scss index 362e2fb1b0..6c662aa626 100755 --- a/_scss/_variables.scss +++ b/_scss/_variables.scss @@ -3,64 +3,64 @@ * global */ $headings: "Geomanist Book", sans-serif; -$headings-landing: 'Geomanist Regular', sans-serif; +$headings-landing: "Geomanist Regular", sans-serif; $buttons: "Geomanist Book", sans-serif; $font: "Open Sans", sans-serif; $body-text-size: 14px; -$global-header-height: 440px; -$bg-secondary-tabs: rgba(0, 0, 0, 0.05); -$white: #fff; -$black: #000; +$white: #fff; +$black: #000; /* * standard mode */ -$body-text: #33444c; -$primary-links: #2496ed; +$body-text: hsl(199, 20%, 25%); +$primary-links: hsl(206, 85%, 54%); -$bg-body: #ffffff; -$bg-body-landing: #fbfbfc; -$bg-header: #2496ed; -$bg-secondary: #2496ed; -$bg-sidebar: #fbfbfc; -$bg-footer: #ffffff; +$bg-body: hsl(206, 0%, 100%); +$bg-body-landing: hsl(206, 14%, 99%); +$bg-header: hsl(206, 85%, 54%); +$bg-secondary: hsl(206, 85%, 54%); +$bg-sidebar: hsl(206, 14%, 99%); +$bg-footer: hsl(206, 0%, 100%); +$bg-footer-landing: hsl(214, 100%, 20%); -$bg-component: #fbfbfc; -$bg-card: #ffffff; +$bg-component: hsl(240, 14%, 99%); +$bg-card: hsl( 0, 0%, 100%); // notes, warnings -$note-color: #1488C6; -$note-bg-color: #f4fafe; -$important-color: #aa6708; -$warning-color: #ce4844; +$note-color: hsl(206, 82%, 43%); +$note-bg-color: hsl(206, 83%, 98%); +$important-color: hsl( 35, 91%, 35%); +$warning-color: hsl( 2, 58%, 54%); -$slider-bg: #c3e4f7; -$slider-btn: #2496ed; +$slider-bg: hsl(206, 76%, 87%); +$slider-btn: hsl(206, 85%, 54%); -$table-head: #cfd2d4; +$table-head: hsl(206, 5%, 82%); /* * night mode */ -$body-text-night: #d3d4d4; -$primary-links-night: #9cd7f7; +$body-text-night: hsl(180, 1%, 83%); +$primary-links-night: hsl(203, 85%, 79%); -$bg-body-night: #061f2f; -$bg-body-landing-night: #061f2f; -$bg-header-night: #101c29; -$bg-secondary-night: #101c29; -$bg-sidebar-night: #101e26; -$bg-footer-night: #000000; +$bg-body-night: hsl(203, 90%, 10%); +$bg-body-landing-night: hsl(203, 90%, 10%); +$bg-header-night: hsl(203, 40%, 10%); +$bg-secondary-night: hsl(203, 40%, 10%); +$bg-sidebar-night: hsl(203, 40%, 10%); +$bg-footer-night: hsl(203, 0%, 0%); +$bg-footer-landing-night: hsl(214, 100%, 20%); -$bg-component-night: #101c29; -$bg-card-night: #0f161e; +$bg-component-night: hsl(203, 44%, 10%); +$bg-card-night: hsl(203, 33%, 8%); // notes, warnings -$note-color-night: #d3d4d4; -$note-bg-color-night: #1f3341; -$important-color-night: #f5ac45; -$warning-color-night: #ff7e7a; +$note-color-night: hsl(180, 1%, 83%); +$note-bg-color-night: hsl(203, 35%, 19%); +$important-color-night: hsl( 35, 90%, 62%); +$warning-color-night: hsl( 2, 100%, 74%); -$active-sidebar-night: #9cd7f7; +$active-sidebar-night: hsl(203, 85%, 79%); -$bg-search-results-night: rgba(10, 10, 10, 0.95); +$bg-search-results-night: hsla(0, 0%, 4%, 0.95); diff --git a/engine/faq.md b/engine/faq.md index 977082e288..5eb2198946 100644 --- a/engine/faq.md +++ b/engine/faq.md @@ -222,7 +222,7 @@ You need to tell Docker to talk to that machine. You can do this with the You can find more answers on: -- [Docker community Slack channel](http://dockr.ly/slack){: target="_blank" rel="noopener" class="_"} +- [Docker community Slack channel](https://dockr.ly/slack){: target="_blank" rel="noopener" class="_"} - [Docker Support Forums](https://forums.docker.com){: target="_blank" rel="noopener" class="_"} - [GitHub](https://github.com/moby/moby){: target="_blank" rel="noopener" class="_"} - [Ask questions on Stackoverflow](https://stackoverflow.com/search?q=docker){: target="_blank" rel="noopener" class="_"} diff --git a/opensource/ways.md b/opensource/ways.md index 3501b6f55e..41628ff99a 100644 --- a/opensource/ways.md +++ b/opensource/ways.md @@ -110,7 +110,7 @@ boost your own well being. Docker users are people using Docker in their daily work. To help Docker users, visit: -* the [Docker community Slack channel](http://dockr.ly/slack){: target="_blank" rel="noopener" class="_"} +* the [Docker community Slack channel](https://dockr.ly/slack){: target="_blank" rel="noopener" class="_"} * the [Docker Community Forum](https://forums.docker.com/){: target="_blank" rel="noopener" class="_"} * [StackOverflow](https://stackoverflow.com/questions/tagged/docker){: target="_blank" rel="noopener" class="_"} @@ -122,7 +122,7 @@ You can also check the lists of [open issues on the Docker docs](https://github. Docker contributors are people like you, interested in the open source projects and product documentation. Contributors may need help with IRC, Go programming, Markdown, or with other aspects of contributing. To help Docker contributors, -join the [Docker community Slack channel](http://dockr.ly/slack){: target="_blank" rel="noopener" class="_"}. +join the [Docker community Slack channel](https://dockr.ly/slack){: target="_blank" rel="noopener" class="_"}. ## Contribute to the Moby open source project diff --git a/registry/help.md b/registry/help.md index baa6a91d2f..3f3dd89a53 100644 --- a/registry/help.md +++ b/registry/help.md @@ -9,7 +9,7 @@ title: Get help If you need help, or just want to chat, you can reach us: - on the [Docker forums](https://forums.docker.com/c/open-source-projects/opensrcreg). -- on the [Docker community Slack channel](http://dockr.ly/slack){: target="_blank" rel="noopener" class="_"} +- on the [Docker community Slack channel](https://dockr.ly/slack){: target="_blank" rel="noopener" class="_"} - on the [mailing list](https://groups.google.com/a/dockerproject.org/forum/#!forum/distribution) (mail at ). If you want to report a bug: