diff --git a/README.md b/README.md index a5f75241d9..1ddf7e91e5 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,6 @@ following keys are supported. The title, description, and keywords are required. | notoc | no | Either `true` or `false`. If `true`, no in-page TOC is generated for the HTML output of this page. Defaults to `false`. Appropriate for some landing pages that have no in-page headings.| | toc_min | no | Ignored if `notoc` is set to `true`. The minimum heading level included in the in-page TOC. Defaults to `2`, to show `

` headings as the minimum. | | toc_max | no | Ignored if `notoc` is set to `false`. The maximum heading level included in the in-page TOC. Defaults to `3`, to show `

` headings. Set to the same as `toc_min` to only show `toc_min` level of headings. | -| tree | no | Either `true` or `false`. Set to `false` to disable the left-hand site-wide navigation for this page. Appropriate for some pages like the search page or the 404 page. | | no_ratings | no | Either `true` or `false`. Set to `true` to disable the page-ratings applet for this page. Defaults to `false`. | | skip_read_time | no | Set to `true` to disable the 'Estimated reading time' banner for this page. | | sitemap | no | Exclude the page from indexing by search engines. When set to `false`, the page is excluded from `sitemap.xml`, and a `` header is added to the page. | diff --git a/_config.yml b/_config.yml index 4a606c2dcf..9e285d14aa 100644 --- a/_config.yml +++ b/_config.yml @@ -41,7 +41,6 @@ defaults: layout: docs toc_min: 2 toc_max: 3 - tree: true # Set the correct edit-URL for upstream resources. We usually don't create a direct # edit link for these, and instead point to the directory that contains the file. @@ -65,6 +64,7 @@ defaults: path: engine/reference/commandline values: edit_url: "https://github.com/docker/cli/tree/master/docs/reference/commandline" + skip_read_time: true - scope: path: glossary values: diff --git a/_includes/body.html b/_includes/body.html index 432ac449eb..db8f03ec6e 100644 --- a/_includes/body.html +++ b/_includes/body.html @@ -19,7 +19,7 @@ {%- if page.advisory -%}
{{ site.data.advisories.texts[page.advisory] | markdownify }}
{%- endif -%} - {%- unless page.tree == false or page.skip_read_time == true -%}{% include read_time.html %}{%- endunless -%} + {%- unless page.skip_read_time == true -%}{% include read_time.html %}{%- endunless -%} {{ content }} {%- unless page.notags == true -%} {%- assign keywords = page.keywords | split:"," -%} diff --git a/_includes/head.html b/_includes/head.html index a14d04392c..7ce01b8c36 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -74,6 +74,7 @@ we only preload the "woff2" variants, as older formats (woff, eot) are only used by older browsers, and we don't optimize for those. {%- endcomment -%} + diff --git a/_includes/read_time.html b/_includes/read_time.html index 9a7565e233..9cb3f7ae19 100644 --- a/_includes/read_time.html +++ b/_includes/read_time.html @@ -1,9 +1,4 @@ - - Estimated reading time: - {% assign words = content | number_of_words %} - {% if words < 360 %} - 1 minute - {% else %} - {{ words | divided_by:180 }} minutes - {% endif %} - +{%- assign words = content | number_of_words -%} +{%- if words >= 360 -%} +

Estimated reading time: {{ words | divided_by:180 }} minutes

+{%- endif -%} diff --git a/_scss/_base.scss b/_scss/_base.scss index 33fa120cc1..ab25d13e3c 100755 --- a/_scss/_base.scss +++ b/_scss/_base.scss @@ -1,5 +1,5 @@ html { - font-family: sans-serif; + font-family: $font; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; -moz-osx-font-smoothing: grayscale; @@ -20,7 +20,7 @@ a { color: $primary-links; text-decoration: none; outline: none; - &:hover { + &:hover, &:focus { opacity: .8; text-decoration: none; } diff --git a/_scss/_buttons.scss b/_scss/_buttons.scss index 62c357db63..0e1c94f28e 100755 --- a/_scss/_buttons.scss +++ b/_scss/_buttons.scss @@ -57,7 +57,6 @@ a.button.outline-btn.min-hgt { .outline-btn { background: #fff; border: 1px solid #0087C8; - text-decoration: none; margin: 0; &:hover { color: #1488C6; diff --git a/_scss/_content.scss b/_scss/_content.scss index 398752cd1a..3c9cb050b6 100755 --- a/_scss/_content.scss +++ b/_scss/_content.scss @@ -1,11 +1,12 @@ -/* - * Images ********************************************************************** - */ -.content img { - display: block; +.content, p { + line-height: 24px; + + img { + display: block; + height: auto; max-width: 100%; - height: auto; + } } /* @@ -95,10 +96,8 @@ h3:hover > a.anchorLink a.glossary { color: $body-text; - text-decoration: none; outline: none; &:hover { opacity: 1; - text-decoration: none; } } diff --git a/_scss/_landing.scss b/_scss/_landing.scss index f4639ba580..83548be8a2 100644 --- a/_scss/_landing.scss +++ b/_scss/_landing.scss @@ -162,6 +162,7 @@ body.landing { $icons: rocket, download-docker, guides, whats-new, manuals, reference; .card { + color: $body-text; background-color: $bg-card; box-shadow: 0 3px 6px rgba(11, 33, 74, 0.09), 0 -2px 2px rgba(11, 33, 74, 0.03); @@ -182,7 +183,7 @@ body.landing { .title { font-size: 16px; line-height: 16px; - margin: 8px 0; + margin: 10px 0; @include sm-width { font-size: 18px; @@ -213,11 +214,6 @@ body.landing { display: block; transition: transform 150ms ease-in-out; - &:focus, - &:visited { - text-decoration: none; - } - &:hover { opacity: 1; transform: scale(1.01); diff --git a/_scss/_layout.scss b/_scss/_layout.scss index 7702dad091..679919546a 100755 --- a/_scss/_layout.scss +++ b/_scss/_layout.scss @@ -147,7 +147,6 @@ footer { color: #637986; font-size: 12px; line-height: 16px; - text-decoration: none; } } } @@ -184,7 +183,6 @@ footer { } .footer-copyright p { - font-family: $font; font-size: 12px; line-height: 17px; color: #637986; diff --git a/_scss/_navigation.scss b/_scss/_navigation.scss index 9524e44743..82c06a30a5 100755 --- a/_scss/_navigation.scss +++ b/_scss/_navigation.scss @@ -70,14 +70,11 @@ .nav-sidebar ul li a:focus, .nav-sidebar ul li a:hover { border-bottom: none; - text-decoration: none; } .nav-sidebar ul li a.active, .nav-sidebar.nav>li>a:focus { - cursor: default; background: #F3F4F4; - color: #2089C4; border-left: 4px solid $primary-links; font-weight: 600; } @@ -122,7 +119,6 @@ display: inline-block; font-size: 12px; padding: 5px 10px 5px 10px; - text-decoration: none; } } } diff --git a/_scss/_night-mode.scss b/_scss/_night-mode.scss index c3b95d77c3..069cd293e1 100755 --- a/_scss/_night-mode.scss +++ b/_scss/_night-mode.scss @@ -8,11 +8,11 @@ body.night { background-color: $bg-header-night; } .card, .cardlet { + color: inherit; background-color: $bg-card-night; } } - p,ol,ul, .rating-nero-value, .reading-time { color: $body-text-night !important; @@ -51,7 +51,6 @@ body.night { .nav-sidebar ul li a.active, .nav-sidebar.nav>li>a:focus, .toc-nav li a.active { - color: $active-sidebar-night; background: #0a151a; border-left: 4px solid $primary-links; } diff --git a/_scss/_notes.scss b/_scss/_notes.scss index 39b7f53a4b..32142859d7 100644 --- a/_scss/_notes.scss +++ b/_scss/_notes.scss @@ -2,6 +2,7 @@ blockquote { background-color: $note-bg-color; border-left-color: $note-color; + font-size: unset; // override bootstrap font-size for blockquotes > p:first-child { color: $note-color; diff --git a/_scss/_overrides.scss b/_scss/_overrides.scss index 69a0a91452..657e175fca 100755 --- a/_scss/_overrides.scss +++ b/_scss/_overrides.scss @@ -65,7 +65,6 @@ .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover { color: #ffffff; - text-decoration: none; background-color: #0c5176; } @@ -117,10 +116,6 @@ a.gs-title { background: transparent; } -img.with-border { - border: 1px solid #eaeaea; -} - input.gsc-search-button, input.gsc-search-button:hover, input.gsc-search-button:focus { display: none!important; } diff --git a/_scss/_typography.scss b/_scss/_typography.scss index 0c6ef7d426..87ce5d24e4 100755 --- a/_scss/_typography.scss +++ b/_scss/_typography.scss @@ -34,14 +34,13 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; - font-display: swap; + font-display: fallback; src: local('Open Sans Regular'), local('OpenSans-Regular'), url(https://fonts.gstatic.com/s/opensans/v18/mem8YaGs126MiZpBA-UFVZ0bf8pkAg.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; } h1,h2,h3,h4,h5,h6 { font-family: $headings; - color: $body-text; clear: both; line-height: 26px; } @@ -74,20 +73,6 @@ h6 { font-size: 14px; } -p { - color: $body-text; - font-family: $font; - font-size: $body-text-size; - line-height: 24px; - margin: 10px 0 10px 0; -} - -ul { - li { - font-size: 14px; - } -} - dd, dt { line-height: 25px; } diff --git a/_scss/_utilities.scss b/_scss/_utilities.scss index 69fa19cb8c..ea74a5378f 100755 --- a/_scss/_utilities.scss +++ b/_scss/_utilities.scss @@ -10,9 +10,7 @@ } .reading-time { - font-style: italic; font-size: 12px; - display: block; color: rgba(13, 86, 125, 0.55); } diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index 6f64aa4279..db6654e9e2 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -234,8 +234,7 @@ experience conflicts, remove `/usr/local/bin/kubectl`. The status of Kubernetes shows in the Docker menu and the context points to `docker-desktop`. - ![Docker Menu with Kubernetes](images/kubernetes/kube-context.png){: .with-border - width="400px"} + ![Docker Menu with Kubernetes](images/kubernetes/kube-context.png){: width="400px"} - By default, Kubernetes containers are hidden from commands like `docker service ls`, because managing them manually is not supported. To make them diff --git a/engine/reference/commandline/app.md b/engine/reference/commandline/app.md index 4fbf1ac8f7..1aacb8586b 100644 --- a/engine/reference/commandline/app.md +++ b/engine/reference/commandline/app.md @@ -2,7 +2,6 @@ datafolder: docker-app datafile: docker_app title: docker app -skip_read_time: true ---