diff --git a/_scss/_DS-colors.scss b/_scss/_DS-colors.scss new file mode 100644 index 0000000000..246f1f919f --- /dev/null +++ b/_scss/_DS-colors.scss @@ -0,0 +1,99 @@ +// This file defines two palettes and is taken from Docker's Design System. The light palette should only be used +// in light mode, and vice versa. In general, if you use one of the colors +// in light mode, you should the same-named color in the dark palette in +// dark mode. + +$white: #FFFFFF; +$light-page-background: #F9F9FA; +$dark-palette-background: #1C262D; +$grey-100: #EFEFF2; +$black: #000000; + + +// light palette contrast colors: + +$light-grey-200: #E1E2E6; +$light-grey-300: #C4C8D1; +$light-grey-400: #8993A5; +$light-grey-500: #677285; +$light-grey-600: #505968; +$light-grey-700: #393F49; +$light-grey-800: #17191E; +$light-red-300: #EEA3A5; +$light-red-400: #E25D68; +$light-red-500: #D52536; +$light-red-600: #B72132; +$light-red-700: #8B1924; +$light-viole-200: #E9D4FF; +$light-viole-300: #C9A6FF; +$light-viole-400: #9860FF; +$light-viole-500: #7D2EFF; +$light-viole-600: #6D00EB; +$light-viole-700: #5700BB; +$light-viole-800: #220041; +$light-blue-100: #E5F2FC; +$light-blue-200: #C0E0FA; +$light-blue-300: #8BC7F5; +$light-blue-400: #1C90ED; +$light-blue-500: #086DD7; +$light-blue-600: #0055BD; +$light-blue-700: #1144A6; +$light-blue-800: #00084D; +$light-green-200: #C6EAE1; +$light-green-300: #88D5C0; +$light-green-400: #3BA08D; +$light-green-500: #2E7F74; +$light-green-600: #1E6C5F; +$light-green-700: #185A51; +$light-amber-100: #FFF4DC; +$light-amber-200: #FCE1A9; +$light-amber-300: #FBB552; +$light-amber-400: #DD7805; +$light-amber-500: #B85504; + +// dark palette contrast colors: + +$dark-grey-100: #141B1F; +$dark-grey-200: #27343E; +$dark-grey-300: #364754; +$dark-grey-400: #465C6E; +$dark-grey-500: #7794AB; +$dark-grey-600: #94ABBC; +$dark-grey-700: #ADBECB; +$dark-grey-800: #C4D0DA; +$dark-red-200: #951C2F; +$dark-red-300: #BC233C; +$dark-red-400: #D1334C; +$dark-red-500: #ED5669; +$dark-red-600: #E96C7C; +$dark-red-700: #EA8E9A; +$dark-red-800: #F0AAB4; +$dark-viole-100: #491D7B; +$dark-viole-200: #5F25A0; +$dark-viole-300: #7835D3; +$dark-viole-400: #8A53EC; +$dark-viole-500: #A371FC; +$dark-viole-600: #B38BFC; +$dark-viole-700: #C5A6FD; +$dark-viole-800: #D4BDFE; +$dark-blue-100: #06326D; +$dark-blue-200: #08489B; +$dark-blue-300: #1760CA; +$dark-blue-400: #2673E3; +$dark-blue-500: #3391EE; +$dark-blue-600: #55A4F1; +$dark-blue-700: #7CB9F4; +$dark-blue-800: #98C8F6; +$dark-green-200: #155048; +$dark-green-300: #176254; +$dark-green-400: #228375; +$dark-green-500: #2AA391; +$dark-green-600: #3CC1AD; +$dark-green-700: #7ACCC3; +$dark-green-800: #A5DDD6; +$dark-amber-300: #AF560A; +$dark-amber-400: #CD6A0A; +$dark-amber-500: #ED8D25; +$dark-amber-600: #F6A650; +$dark-amber-700: #F8B974; +$dark-amber-800: #FAC892; diff --git a/_scss/_buttons.scss b/_scss/_buttons.scss index 3a6799276a..ca13c7c012 100755 --- a/_scss/_buttons.scss +++ b/_scss/_buttons.scss @@ -57,10 +57,10 @@ a.button.outline-btn.min-hgt { .outline-btn { background: #fff; - border: 1px solid #0087C8; + border: 1px solid $light-blue-400; margin: 0; &:hover { - color: #1488C6; + color: $light-blue-400; } } diff --git a/_scss/_color-palette-v3.scss b/_scss/_color-palette-v3.scss index a4fbce7650..f4f0040e69 100644 --- a/_scss/_color-palette-v3.scss +++ b/_scss/_color-palette-v3.scss @@ -1,3 +1,5 @@ +//This has now been deprecated. See DS-colors instead// + // This file defines two palettes. The light palette should only be used // in light mode, and vice versa. In general, if you use one of the colors // in light mode, you should the same-named color in the dark palette in diff --git a/_scss/_content.scss b/_scss/_content.scss index f76f338f40..225ef9595f 100755 --- a/_scss/_content.scss +++ b/_scss/_content.scss @@ -14,8 +14,8 @@ * Code formatting ************************************************************* */ pre, code { - background-color: #f5f8fa!important; - color: #0c5176 !important; + background-color: $light-page-background!important; + color: $light-blue-600 !important; } pre { diff --git a/_scss/_landing.scss b/_scss/_landing.scss index e88071225c..49ca5143cb 100644 --- a/_scss/_landing.scss +++ b/_scss/_landing.scss @@ -210,11 +210,11 @@ body.landing { } .cardlet { - background-color: $white-25; + background-color: $grey-100; padding: 24px 36px; .title { - font-family: "Open Sans", sans-serif; + font-family: "Roboto", sans-serif; line-height: 22px; font-size: 22px; } @@ -250,8 +250,8 @@ body.landing { } a.btn { - background: #FF3F73; - color: white; + background: $white; + color: $dark-blue-400; font-size: 17px; margin-top: 20px; padding: 15px 30px; @@ -270,12 +270,12 @@ body.landing { .tab-section { .title { - font-family: "Open Sans", sans-serif; + font-family: "Roboto", sans-serif; font-size: 22px; } ul.nav.nav-tabs li a, h5, h6 { - font-family: 'Open Sans', sans-serif; + font-family: 'Roboto', sans-serif; font-size: 18px; } @@ -291,7 +291,7 @@ body.landing { li.active a { background-color: inherit; border: none; - border-bottom: 5px solid $dark-blue; + border-bottom: 5px solid $dark-blue-500; } } diff --git a/_scss/_layout.scss b/_scss/_layout.scss index 00be47d4f8..5563f0d6fc 100755 --- a/_scss/_layout.scss +++ b/_scss/_layout.scss @@ -124,7 +124,7 @@ border-right: 1px solid #ddd; footer { background: $white; - border-top: 1px solid #E0E4E7; + border-top: 1px solid $light-grey-200; position: relative; } @@ -138,7 +138,7 @@ footer { li { margin-bottom: 10px; a { - color: #637986; + color: $black; font-size: 12px; line-height: 16px; } @@ -157,7 +157,7 @@ footer { margin-left: 10px; padding-bottom: 6px; a { - color: #637986; + color: $white; font-size: 12px; } } @@ -167,7 +167,7 @@ footer { .bottom_footer { clear: both; padding: 30px 0 20px; - border-top: 1px solid #E0E4E7; + border-top: 1px solid $light-grey-200; float: left; width: 100%; } @@ -179,7 +179,7 @@ footer { .footer-copyright p { font-size: 12px; line-height: 17px; - color: #637986; + color: $light-grey-500; margin-bottom: 0; padding: 0 0 15px; } @@ -214,7 +214,7 @@ footer { .footer_social_nav ul li a { width: 32px; height: 32px; - background-color: #82949E; + background-color: $light-grey-400; border-radius: 50px; color: $white; display: block; diff --git a/_scss/_navigation.scss b/_scss/_navigation.scss index f50eb5192a..7f82ae1f56 100755 --- a/_scss/_navigation.scss +++ b/_scss/_navigation.scss @@ -42,7 +42,7 @@ // Some links don't have 'href' attr, hence no mouse pointer .nav-sidebar li a { cursor: pointer; - color: $light-palette-grey-800; + color: $light-grey-800; } .nav-sidebar>li>a { @@ -53,8 +53,8 @@ .nav-sidebar>.active>a, .nav-sidebar>.active>a:focus, .nav-sidebar>.active>a:hover { - color: #2089C4; - background-color: #428bca; + color: $light-blue-600; + background-color: $light-blue-500; } .nav-sidebar ul { @@ -79,7 +79,7 @@ .nav-sidebar ul li a, .nav-sidebar ul li a:focus { border-bottom: none; - border-left: 1px solid $light-palette-grey-200; + // border-left: 1px solid $light-grey-200; } .nav-sidebar .nav > li > a { @@ -95,9 +95,9 @@ .nav-sidebar ul li a.active, .nav-sidebar.nav > li > a:focus { background: $bg-sidebar-active; - border-left: 4px solid $primary-links; + border-left: 4px solid $light-blue-500; font-weight: 600; - color: #2089C4; + color: $light-blue-500; } .nav-sidebar ul li ul li a { @@ -139,34 +139,35 @@ display: inline-block; font-size: 12px; padding: 2px 10px 2px 10px; - color: #677285; + color: $light-grey-500; } .slider{ - background-color: #e0e4e7; - border: 1px solid #e0e4e7; + background-color: $light-grey-200; + border: 1px solid $light-grey-200; } .slider:before{ - background-color: #677285; + background-color: $light-grey-500; } } } .toc-nav li a.active { - border-left: 4px solid #677285; + border-left: 4px solid $light-grey-500; font-weight: bold; - color: #677285; + color: $light-grey-500; } .toc-nav i.fa { font-size: 14px; margin: 0 8px 0 0; - color: #677285; + color: $light-grey-500; } div.side-toc-title { font-size: 12px; font-weight: bold; margin: 11px 0 10px 13px; + color: $light-grey-500; } .edit { @@ -184,7 +185,7 @@ div.side-toc-title { .icon { width: 25px; float: left; - font-size: 1.5rem; + font-size: 1rem; } } @@ -215,7 +216,7 @@ div.side-toc-title { right: 0; bottom: 0; background-color: $slider-bg; - border: 1px solid #c3e4f7; + border: 1px solid $light-blue-200; } .slider:before { @@ -271,13 +272,13 @@ input:checked+.slider:before { &:hover { background-color: rgba(0, 0, 0, 0.17); - border-bottom: 4px solid rgba($white, 0.75); + border-bottom: 4px solid $white; } } .navbar-nav > li.active > a { cursor: default; border-left: none; - border-bottom: 4px solid rgba($white, 0.5); + border-bottom: 4px solid $white; } } diff --git a/_scss/_night-mode.scss b/_scss/_night-mode.scss index 771b4b7749..07f667d7a7 100755 --- a/_scss/_night-mode.scss +++ b/_scss/_night-mode.scss @@ -1,6 +1,8 @@ html.night { color-scheme: dark; + $icons: rocket, download-docker, guides, language-guides, whats-new, manuals, reference; + body { background-color: $bg-body-night; color: $body-text-night; @@ -13,13 +15,33 @@ html.night { .card, .cardlet { color: inherit; background-color: $bg-card-night; + &.rocket { + background-image: url(/assets/images/rocket-dark.svg) } + &.download-docker { + background-image: url(/assets/images/download-docker-dark.svg) + } + &.guides { + background-image: url(/assets/images/guides-dark.svg) + } + &.language-guides { + background-image: url(/assets/images/language-guides-dark.svg) + } + &.manuals { + background-image: url(/assets/images/manuals-dark.svg) + } + &.reference { + background-image: url(/assets/images/reference-dark.svg) + } + } footer { background-color: $bg-footer-landing-night; } } } - +a { + color: $dark-blue-600; +} .rating-nero-value, .reading-time, .release-date { @@ -31,16 +53,17 @@ html.night { color: $white; } a:not(.btn):not(.button) { - color: $primary-links-night; + //color: $primary-links-night; } .header { background-color: $bg-header-night; + color: $white; } hr { border-top: 1px solid #4f6071; } .nav-secondary { - background-color: $bg-secondary-night; + background-color: $bg-header-night; .search-form input[type=search] { background-color: rgba(76, 76, 76, 0.47); @@ -52,22 +75,35 @@ html.night { } } .breadcrumb { - background-color: $bg-sidebar-night-active; - border-bottom: 0.1px solid $primary-links; + background-color: $dark-grey-100; + border-bottom: 0.1px solid $dark-grey-700; } .sidebar, .col-nav { background-color: $bg-sidebar-night; border: none; + color: $dark-grey-700; + } + .nav-sidebar li a { + cursor: pointer; + color: $dark-grey-700; + } + .toc-nav ul li a { + color: $dark-grey-700; } .nav-sidebar ul li a.active, .nav-sidebar.nav > li > a:focus, .toc-nav li a.active { - background: $bg-sidebar-night-active; - border-left: 4px solid $primary-links; + background: $dark-palette-background; + //border-left: 4px solid $dark-blue-800; + color: $white; + } + div.side-toc-title { + color: $dark-grey-700; } .navbar-nav > li.active > a { - border-color: $primary-links; + border-color: $dark-blue-600; + border-bottom: 4px solid $white; } .slider { background-color: #344658; @@ -89,7 +125,7 @@ html.night { border: 1px solid $black; } code { - color: #c1f1f0 !important; + color: $dark-grey-700 !important; background: #0a121b !important; } .nav-secondary .dropdown-btn { @@ -134,14 +170,14 @@ html.night { background-color: #192837!important; } a.gs-title { - color: #cccccc !important; + color: $dark-grey-700 !important; text-decoration: none; } .gs-webResult .gs-snippet, .gs-imageResult .gs-snippet, .gs-fileFormatType { color: #a8b0b7!important; } .gs-webResult.gs-result a.gs-title:link, .gs-webResult.gs-result a.gs-title:link b, .gs-imageResult a.gs-title:link, .gs-imageResult a.gs-title:link b { - color: #a9e4ff!important; + color: $dark-blue-700!important; } .component { background: $bg-component-night; @@ -156,12 +192,15 @@ html.night { border: 1px solid rgba(0, 0, 0, 0.1); text-shadow: 0 1px rgba(0, 0, 0, 0.2); } + .primary-btn{ + background: $dark-blue-100; + } .footer { background-color: $bg-footer-night; border-top: 1px solid rgb(31, 52, 66); } .footer_links li a { - color: #b2b2b2; + color: $white; } .bottom_footer { border-top: 1px solid rgb(78, 93, 106); @@ -169,6 +208,12 @@ html.night { .footer_social_nav ul li a { background-color: #2f2f2f; } + .footer_sub_nav ul li a { + color: $white; + } + .footer-copyright p { + color: $white; + } /* syntax highlighting */ .highlight { @@ -217,10 +262,14 @@ html.night { /* tabs */ .nav-tabs { border-bottom: 1px solid #4f6071; + color: $dark-grey-700; + } + .nav-tabs>li>a { + color: $dark-grey-700; } .nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover { color: $white; - background-color: #4e6071; + background-color: $dark-grey-200; border: 1px solid transparent; } .popover { @@ -235,3 +284,5 @@ html.night { color: $white!important; } } + + diff --git a/_scss/_notes.scss b/_scss/_notes.scss index a40fe8b25c..bd138aa6db 100644 --- a/_scss/_notes.scss +++ b/_scss/_notes.scss @@ -59,54 +59,57 @@ blockquote { &:not(.important):not(.warning):not(.restricted):not(.experimental):not(.tip) { @include notification( - $bg-color: $dark-palette-blue-200, - $header-color: $white-0, - $body-text-color: $white-0, + $bg-color: $dark-blue-200, + $header-color: $white, + $body-text-color: $white, $icon: "\f06a" ); + a { + color: $dark-blue-800; + }; } &.important { @include notification( - $bg-color: $dark-palette-amber-200, - $header-color: $white-0, - $body-text-color: $white-0, + $bg-color: $dark-amber-300, + $header-color: $white, + $body-text-color: $white, $icon: "\f06a" ); } &.warning { @include notification( - $bg-color: $dark-palette-red-200, - $header-color: $white-0, - $body-text-color: $white-0, + $bg-color: $dark-red-200, + $header-color: $white, + $body-text-color: $white, $icon: "\f06a" ); } &.restricted { @include notification( - $bg-color: $dark-palette-violet-200, - $header-color: $white-0, - $body-text-color: $white-0, + $bg-color: $dark-viole-200, + $header-color: $white, + $body-text-color: $white, $icon: "\f135" ); } &.experimental { @include notification( - $bg-color: $dark-palette-blue-200, - $header-color: $white-0, - $body-text-color: $white-0, + $bg-color: $dark-blue-200, + $header-color: $white, + $body-text-color: $white, $icon: "\f492" ); } &.tip { @include notification( - $bg-color: $dark-palette-green-200, - $header-color: $white-0, - $body-text-color: $white-0, + $bg-color: $dark-green-200, + $header-color: $white, + $body-text-color: $white, $icon: "\f164" ); } @@ -117,8 +120,8 @@ blockquote { &:not(.important):not(.warning):not(.restricted):not(.experimental):not(.tip) { @include notification( - $bg-color: $light-palette-blue-100, - $header-color: $light-palette-blue-500, + $bg-color: $light-blue-100, + $header-color: $light-blue-600, $body-text-color: inherit, $icon: "\f05a" ); @@ -126,8 +129,8 @@ blockquote { &.important { @include notification( - $bg-color: $light-palette-amber-100, - $header-color: $light-palette-amber-500, + $bg-color: $light-amber-100, + $header-color: $dark-amber-300, $body-text-color: inherit, $icon: "\f06a" ); @@ -135,8 +138,8 @@ blockquote { &.warning { @include notification( - $bg-color: $light-palette-red-100, - $header-color: $light-palette-red-500, + $bg-color: $light-red-300, + $header-color: $light-red-700, $body-text-color: inherit, $icon: "\f06a" ); @@ -144,8 +147,8 @@ blockquote { &.restricted { @include notification( - $bg-color: $light-palette-violet-100, - $header-color: $light-palette-violet-500, + $bg-color: $light-viole-200, + $header-color: $light-viole-600, $body-text-color: inherit, $icon: "\f135" ); @@ -153,8 +156,8 @@ blockquote { &.experimental { @include notification( - $bg-color: $light-palette-blue-100, - $header-color: $light-palette-blue-500, + $bg-color: $light-blue-100, + $header-color: $light-blue-500, $body-text-color: inherit, $icon: "\f492" ); @@ -162,8 +165,8 @@ blockquote { &.tip { @include notification( - $bg-color: $light-palette-green-100, - $header-color: $light-palette-green-500, + $bg-color: $light-green-200, + $header-color: $light-green-600, $body-text-color: inherit, $icon: "\f164" ) diff --git a/_scss/_overrides.scss b/_scss/_overrides.scss index 1cc216fa3b..3a552094b4 100755 --- a/_scss/_overrides.scss +++ b/_scss/_overrides.scss @@ -24,7 +24,7 @@ .dropdown-menu>li>a { font-size: 13.5px; line-height: 16px; - color: #1488c6; + color: $light-blue-400; padding: 5px 15px; display: block; } @@ -38,14 +38,14 @@ font-family: $buttons; } .btn-primary { - background-color: $marine-50; + background-color: $light-blue-500; border: 1px solid rgba(0, 0, 0, 0.1); &:hover { opacity: 0.8; // override default bootstrap behaviour - background-color: $marine-50; + background-color: $light-blue-500; border: 1px solid rgba(0, 0, 0, 0.1); } } @@ -86,7 +86,7 @@ .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover { color: #ffffff; - background-color: #0c5176; + background-color: $light-blue-700; } /* @@ -109,7 +109,7 @@ * override google results +++++++++++++++++++++++++++++++++++++++++++++++++++++ */ .gs-webResult .gs-snippet, .gs-imageResult .gs-snippet, .gs-fileFormatType { - color: #27343B!important; + color: $light-blue-700!important; line-height: 23px!important; } .gsc-webResult .gsc-result { @@ -117,15 +117,15 @@ } a.gs-title { - color: #2089C4!important; + color: $light-blue-500!important; text-decoration: none; } .gs-webResult.gs-result a.gs-title:visited, .gs-webResult.gs-result a.gs-title:visited b, .gs-imageResult a.gs-title:visited, .gs-imageResult a.gs-title:visited b { - color: #F993A6!important; + color: $light-red-400!important; } .gs-webResult div.gs-visibleUrl, .gs-imageResult div.gs-visibleUrl { - color: #82949E!important; + color: $light-grey-500!important; } .gs-webResult .gs-snippet, .gs-imageResult .gs-snippet, .gs-fileFormatType { @@ -136,6 +136,9 @@ a.gs-title { border-color: #f7f7f761 !important; background: transparent; } +.gsc-tabHeader.gsc-tabActive, .gsc-refinementHeader.gscrefinementActive{ + color: $dark-grey-700!important; +} input.gsc-search-button, input.gsc-search-button:hover, input.gsc-search-button:focus { display: none!important; diff --git a/_scss/_perldoc.scss b/_scss/_perldoc.scss index e812e56f9e..930ab0f801 100755 --- a/_scss/_perldoc.scss +++ b/_scss/_perldoc.scss @@ -1,14 +1,14 @@ /* .highlight .hll { background-color: #ffffcc } .highlight { background: #eeeedd } */ -.highlight .c { color: #228B22 } /* Comment */ +.highlight .c { color: #3BA08D } /* Comment */ .highlight .err { color: #a61717 } /* Error */ .highlight .k { color: #8B008B } /* Keyword */ -.highlight .ch { color: #228B22 } /* Comment.Hashbang */ -.highlight .cm { color: #228B22 } /* Comment.Multiline */ +.highlight .ch { color: #3BA08D } /* Comment.Hashbang */ +.highlight .cm { color: #3BA08D } /* Comment.Multiline */ .highlight .cp { color: #1e889b } /* Comment.Preproc */ -.highlight .cpf { color: #228B22 } /* Comment.PreprocFile */ -.highlight .c1 { color: #228B22 } /* Comment.Single */ +.highlight .cpf { color: #3BA08D } /* Comment.PreprocFile */ +.highlight .c1 { color: #3BA08D } /* Comment.Single */ .highlight .cs { color: #8B008B } /* Comment.Special */ .highlight .gd { color: #aa0000 } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ diff --git a/_scss/_typography.scss b/_scss/_typography.scss index e5f2a43d70..306fbfd176 100755 --- a/_scss/_typography.scss +++ b/_scss/_typography.scss @@ -30,7 +30,7 @@ */ /* latin */ -@font-face { +/*@font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 400; @@ -82,3 +82,110 @@ dd, dt { ol, ul { padding-left: 25px; } + + +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url(https://fonts.gstatic.com/s/roboto/v30/KFOlCnqEu92Fr1MmEU9fBBc4.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* latin */ +@font-face { + font-family: 'Roboto Mono'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/robotomono/v22/L0xTDF4xlVMF-BfR8bXMIhJHg45mwgGEFl0_3vrtSM1J-gEPT5Ese6hmHSh0mQ.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +html, body { + font-family: 'Roboto', sans-serif; + font-size: 14px; +} + +h1, .h1 { + font-size: 2.5rem; + font-weight: 500; + line-height: 1.167; +} + +h2, .h2 { + font-size: 2rem; + font-weight: 500; + line-height: 1.2; +} + +h3, .h3 { + font-size: 1.5rem; + font-weight: 500; + line-height: 1.167; +} + +h4, .h4 { + font-size: 1.286rem; + font-weight: 500; + line-height: 1.235; +} + +.subtitle1 { + font-size: 1.143rem; + font-weight: 500; + line-height: 1.75; +} + +p, .body1 { + font-size: 1rem; + line-height: 1.5; +} + +.body2 { + font-size: 0.86rem; + line-height: 1.43; +} + +code, pre { + font-size: 1rem; + font-family: 'Roboto Mono', monospace; +} + +.overline { + font-size: 0.72rem; + font-weight: 500; + line-height: 2.66; + text-transform: uppercase; +} + +.inline-code { + font-size: 1rem; + font-family: 'Roboto Mono', monospace; + background-color: white; /* black if dark mode */ + border: 1px solid #E1E2E6; /* grey.200 */ + padding: 0.2em 0.4em; + border-radius: 4px; +} + +.code-block { + font-size: 1rem; + font-family: 'Roboto Mono', monospace; + background-color: white; /* black if dark mode */ + border: 1px solid #E1E2E6; /* grey.200 */ + padding: 8px; + border-radius: 4px; + display: block; +} \ No newline at end of file diff --git a/_scss/_upgrade-cta.scss b/_scss/_upgrade-cta.scss index bb07d6d448..548ca30448 100644 --- a/_scss/_upgrade-cta.scss +++ b/_scss/_upgrade-cta.scss @@ -1,13 +1,13 @@ .docker-upgrade-cta { html.night & { - background-color: change-color($orange-10, $alpha: 0.3); - border: 1px solid $orange-10; - p, .docker-upgrade-cta__heading { color: $white-0; } + background-color: change-color($light-amber-100, $alpha: 0.3); + border: 1px solid $light-amber-100; + p, .docker-upgrade-cta__heading { color: $white; } } html:not(.night) & { - background-color: $orange-10; - border: 1px solid $orange-20; + background-color: $light-amber-100; + border: 1px solid $light-amber-200; p, .docker-upgrade-cta__heading { color: inherit; } } diff --git a/_scss/_utilities.scss b/_scss/_utilities.scss index 1e12670253..e3c8b6b90a 100755 --- a/_scss/_utilities.scss +++ b/_scss/_utilities.scss @@ -68,7 +68,6 @@ i.fa.fa-outdent { color: $white; padding: 16px 15px 0 0; font-size: 1.5rem; - opacity: 0.5; } /* Inline graphics and icons (like the whale menu icon in d4mac, d4win) */ @@ -85,7 +84,7 @@ img.inline { & input[type=text] { background: rgba(0, 0, 0, 0.17) url("/assets/images/search.png") no-repeat 10px 9px; border: 0; - color: #0C5176; + color: $light-blue-700; border-radius: 0; margin: 0; transition: all 0.2s ease; diff --git a/_scss/_variables.scss b/_scss/_variables.scss index affa95030d..28daf2c250 100755 --- a/_scss/_variables.scss +++ b/_scss/_variables.scss @@ -1,14 +1,14 @@ -@import "color-palette-v2"; +@import "DS-colors"; /* * global */ -$headings: "Open Sans", sans-serif; -$headings-landing: "Open Sans", sans-serif; -$buttons: "Open Sans", sans-serif; -$font: "Open Sans", sans-serif; +$headings: "Roboto", sans-serif; +$headings-landing: "Roboto", sans-serif; +$buttons: "Roboto", sans-serif; +$font: "Roboto", sans-serif; $body-text-size: 14px; $white: #fff; $black: #000; @@ -17,47 +17,48 @@ $top-navigation-height: 92px; // top navigation height is: nav (55px) + breadcru /* * standard mode */ -$body-text: $black-0; -$primary-links: $blue-70; +$body-text: $black; +$primary-links: $light-blue-600; // -$bg-body: $white-0; -$bg-body-landing: $white-10; -$bg-header: $blue-60; -$bg-secondary: $blue-60; -$bg-sidebar: $white-10; -$bg-sidebar-active: $white-15; -$bg-footer: $white-0; -$bg-footer-landing: $marine-90; -$bg-component: $white-5; -$bg-card: $white-0; +$bg-body: $white; +$bg-body-landing: $light-page-background; +$bg-header: $light-blue-500; +$bg-secondary: $light-blue-500; +$bg-sidebar: $light-page-background; +$bg-sidebar-active: $light-page-background; +$bg-footer: $white; +$bg-footer-landing: $light-grey-500; +$bg-component: $light-page-background; +$bg-card: $white; // notes, warnings// -$note-color: $blue-80; -$important-color: $orange-90; -$warning-color: $red-90; - -$slider-bg: $marine-10; -$slider-btn: $blue-60; -$table-head: $grey-10; +$note-color: $light-blue-500; +$important-color: $light-amber-500; +$warning-color: $light-red-700; + +$slider-bg: $light-blue-200; +$slider-btn: $light-blue-500; +$table-head: $light-grey-200; /* * night mode */ -$body-text-night: hsl(180, 1%, 83%); -$primary-links-night: hsl(203, 85%, 79%); +$body-text-night: $white; +$primary-links-night: $dark-grey-700; -$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-sidebar-night-active: hsl(203, 40%, 7%); -$bg-footer-night: hsl(203, 0%, 0%); -$bg-footer-landing-night: hsl(214, 100%, 20%); +$bg-body-night: $dark-palette-background; +$bg-body-landing-night: $dark-palette-background; +$bg-header-night: $dark-blue-200; +$bg-secondary-night: $dark-grey-100; +$bg-sidebar-night: $dark-grey-100; +$bg-sidebar-night-active: $dark-grey-100; +$bg-footer-night: $dark-grey-100; +$bg-footer-landing-night: $dark-grey-100; -$bg-component-night: hsl(203, 44%, 10%); -$bg-card-night: #0e161b; +$bg-component-night: $dark-grey-200; +$bg-card-night: $dark-grey-200; -$active-sidebar-night: hsl(203, 85%, 79%); +$active-sidebar-night: $dark-grey-800; + +$bg-search-results-night: $black; -$bg-search-results-night: hsla(0, 0%, 4%, 0.95); diff --git a/assets/css/style.scss b/assets/css/style.scss index 24b3318cd0..0fa0179f6d 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -5,6 +5,7 @@ @import "breakpoint"; @import "color-palette-v2"; @import "color-palette-v3"; +@import "DS-colors"; @import "variables"; @import "night-mode"; @import "base"; diff --git a/assets/images/download-docker-dark.svg b/assets/images/download-docker-dark.svg new file mode 100644 index 0000000000..b72e92986d --- /dev/null +++ b/assets/images/download-docker-dark.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/download-docker.svg b/assets/images/download-docker.svg index 36919890ac..436a140487 100644 --- a/assets/images/download-docker.svg +++ b/assets/images/download-docker.svg @@ -1,16 +1,23 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/download-docker2.svg b/assets/images/download-docker2.svg new file mode 100644 index 0000000000..36919890ac --- /dev/null +++ b/assets/images/download-docker2.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/assets/images/guides-dark.svg b/assets/images/guides-dark.svg new file mode 100644 index 0000000000..1eab749d8b --- /dev/null +++ b/assets/images/guides-dark.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/guides.svg b/assets/images/guides.svg index c0819c299b..36eabb5647 100644 --- a/assets/images/guides.svg +++ b/assets/images/guides.svg @@ -1,5 +1,27 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/guides2.svg b/assets/images/guides2.svg new file mode 100644 index 0000000000..c0819c299b --- /dev/null +++ b/assets/images/guides2.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/language-guides-dark.svg b/assets/images/language-guides-dark.svg new file mode 100644 index 0000000000..c0aef499db --- /dev/null +++ b/assets/images/language-guides-dark.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/language-guides.svg b/assets/images/language-guides.svg index 4daf380d02..e8c97ea4a3 100644 --- a/assets/images/language-guides.svg +++ b/assets/images/language-guides.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/language-guides2.svg b/assets/images/language-guides2.svg new file mode 100644 index 0000000000..4daf380d02 --- /dev/null +++ b/assets/images/language-guides2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/manuals-dark.svg b/assets/images/manuals-dark.svg new file mode 100644 index 0000000000..85f7f509a1 --- /dev/null +++ b/assets/images/manuals-dark.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/images/manuals.svg b/assets/images/manuals.svg index 26951598b9..fae4e907c3 100644 --- a/assets/images/manuals.svg +++ b/assets/images/manuals.svg @@ -1,8 +1,15 @@ - - - - - - - + + + + + + + + + + + + + + diff --git a/assets/images/manuals2.svg b/assets/images/manuals2.svg new file mode 100644 index 0000000000..26951598b9 --- /dev/null +++ b/assets/images/manuals2.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/images/reference-dark.svg b/assets/images/reference-dark.svg new file mode 100644 index 0000000000..7c72843fd8 --- /dev/null +++ b/assets/images/reference-dark.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/assets/images/reference.svg b/assets/images/reference.svg index 72aebbb76b..466ba69b0c 100644 --- a/assets/images/reference.svg +++ b/assets/images/reference.svg @@ -1,9 +1,16 @@ - - - - - - - - + + + + + + + + + + + + + + + diff --git a/assets/images/reference2.svg b/assets/images/reference2.svg new file mode 100644 index 0000000000..72aebbb76b --- /dev/null +++ b/assets/images/reference2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/images/rocket-dark.svg b/assets/images/rocket-dark.svg new file mode 100644 index 0000000000..2d9e4ef643 --- /dev/null +++ b/assets/images/rocket-dark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/images/rocket.svg b/assets/images/rocket.svg index 6ed711feca..c11ed0eb20 100644 --- a/assets/images/rocket.svg +++ b/assets/images/rocket.svg @@ -1,10 +1 @@ - - - - - - - - - - + diff --git a/assets/images/rocket2.svg b/assets/images/rocket2.svg new file mode 100644 index 0000000000..6ed711feca --- /dev/null +++ b/assets/images/rocket2.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/images/whats-new-dark.svg b/assets/images/whats-new-dark.svg new file mode 100644 index 0000000000..a7f53e3ac0 --- /dev/null +++ b/assets/images/whats-new-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/whats-new.svg b/assets/images/whats-new.svg index 3b169065e0..0c054f72e5 100644 --- a/assets/images/whats-new.svg +++ b/assets/images/whats-new.svg @@ -1,8 +1,7 @@ - - - - - - - + + + + + + diff --git a/assets/images/whats-new2.svg b/assets/images/whats-new2.svg new file mode 100644 index 0000000000..3b169065e0 --- /dev/null +++ b/assets/images/whats-new2.svg @@ -0,0 +1,8 @@ + + + + + + + +