From nobody Thu Dec 30 16:17:06 2021 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AE8231926CF0 for ; Thu, 30 Dec 2021 16:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JPthL353sz4Vt2; Thu, 30 Dec 2021 16:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 459B21B3FA; Thu, 30 Dec 2021 16:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BUGH68S064715; Thu, 30 Dec 2021 16:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BUGH6WW064714; Thu, 30 Dec 2021 16:17:06 GMT (envelope-from git) Date: Thu, 30 Dec 2021 16:17:06 GMT Message-Id: <202112301617.1BUGH6WW064714@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 0b24fd8606 - main - Fix problem with an overlap in the Table of Contents List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b24fd86066aa501c0371baf74f5b33fd51ae87a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640881026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fC2dDjiSwTvWmDvsVBNG+m+n5N9m3y9gRRKsOft3Cgs=; b=L+3Cg0SW7UbCW/L2dKgb/5fcGHSrGqILsHtRVTTM4kwyaRCU+snvejXy+Umv4mzL6nabU2 GCtBPUFG7ESt/TpwVDvD+QqZPBJDlhmBcQ9d/oBdN4uB+3eK/xhUV8xFxGjtjg4zORIjPC rFdJ0VB6Id4V46iq9JmZc1sJvYuJ0gyM1NEy0BgN1bFZeb8pr+oz3+7x8X9GD/UwmIXtD0 DQK600xVENYmWkm/UzhyOqXLHc5TqCHXq7/73mwnUFyNuWqcqqqIOkh+t8iRMGfiiif540 1rRm3u0s3tfht6/Qhij9hwbMS7RV9dutqT0/SDXurihXakKtQhpIX+fWa6Pcnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640881026; a=rsa-sha256; cv=none; b=PBthyvZpkxNJHevis3BK02wlhnqp1FyNSGqznH2OHdSfFfRVeICPOc6JPjwyhGxFFPeT5Z HnK9UVPfTczf43Nk/B1U+rpJKtrUc1dYyfK9+s8COqwmZqlavx5ufkG7m+1ZEXDzbonYCf GAexp0ngRL8SoEa4XgJyNMqaNjnotfTD5Unz77ffO9KNa/t35FBDnus+wM2yJ4Kxyug6X8 4hH4CA5fOHWeQgb49kVBRFj4r79tYqs9+juD6dUHTwCwzj9zOXG3EaTZBKlozFhrT+lRFT Pi1qtp55ST4kPRxc2caVo28KaO2Eqj5KnjS6KalT6EK8nh57ZSVK7t9scE1wkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=0b24fd86066aa501c0371baf74f5b33fd51ae87a commit 0b24fd86066aa501c0371baf74f5b33fd51ae87a Author: Sergio Carlavilla Delgado AuthorDate: 2021-12-30 16:14:58 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-12-30 16:14:58 +0000 Fix problem with an overlap in the Table of Contents * Reduce the height used by the toc * Merge style of the toc for articles and books PR: 260577 Submitted by: Graham Perrin --- .../beastie/assets/styles/documentation.scss | 258 +++++++-------------- .../themes/beastie/layouts/articles/list.html | 4 +- .../themes/beastie/layouts/articles/single.html | 4 +- .../themes/beastie/layouts/books/list.html | 4 +- .../themes/beastie/layouts/books/single.html | 4 +- 5 files changed, 88 insertions(+), 186 deletions(-) diff --git a/documentation/themes/beastie/assets/styles/documentation.scss b/documentation/themes/beastie/assets/styles/documentation.scss index 292589023c..b537252b4f 100644 --- a/documentation/themes/beastie/assets/styles/documentation.scss +++ b/documentation/themes/beastie/assets/styles/documentation.scss @@ -61,95 +61,6 @@ padding-right: 1.5rem; transition: .2s ease-in-out; } - - .article-toc { - flex: 0 0 16rem; - font-size: .75rem; - - .article-toc-content { - width: 16rem; - position: sticky; - top: var(--header-height); - bottom: 0; - overflow-x: hidden; - overflow-y: auto; - transition: .2s ease-in-out; - - h3 { - border-bottom: none; - } - - #TableOfContents { - overflow-y: auto; - position: sticky; - overflow: auto; - max-height: calc(90vh); - } - - #TableOfContents, .resources { - ul { - list-style: none; - margin: 0; - padding: 0; - - li { - margin: 0; - - a { - color: var(--global-font-color); - display: inline-block; - padding: .25rem 0 .25rem .5rem; - text-decoration: none; - border-left: 1px solid var(--lines-color); - - &:hover { - font-weight: bolder; - } - } - } - } - } - - .resources { - .contents { - i { - margin-right: 5px; - } - } - } - } - } - - .toc-mobile { - h3 { - border-bottom: none; - } - - #TableOfContents, .resources { - ul { - list-style: none; - margin: 0; - padding: 0; - - li { - margin: 0; - - a { - color: var(--global-font-color); - display: inline-block; - padding: .25rem 0 .25rem .5rem; - text-decoration: none; - border-left: 1px solid var(--lines-color); - - &:hover { - font-weight: bolder; - } - } - - } - } - } - } } .main-wrapper-book { @@ -253,6 +164,10 @@ font-weight: 500; padding: 5px; border: 1px solid var(--lines-color); + + i { + padding-right: 5px; + } } } @@ -284,119 +199,115 @@ } } +} - .book-toc { - flex: 0 0 16rem; - font-size: .75rem; - background-color: var(--global-background-color); - - .book-toc-content { - width: 16rem; - position: sticky; - top: var(--header-height); - bottom: 0; - overflow-x: hidden; - overflow-y: auto; - transition: .2s ease-in-out; - - h3 { - border-bottom: none; - margin: 1rem 0; - } - - #TableOfContents { - position: sticky; - overflow: auto; - max-height: calc(90vh); - - ul { - margin: 0; - padding: 0; - - li { - margin: 0; - list-style: none; +.toc { + flex: 0 0 16rem; + font-size: .75rem; + background-color: var(--global-background-color); + + .toc-content { + width: 16rem; + position: sticky; + top: var(--header-height); + bottom: 0; + overflow-x: hidden; + overflow-y: auto; + transition: .2s ease-in-out; - a { - color: var(--global-font-color); - display: inline-block; - padding: .25rem 0 .25rem .5rem; - margin-left: .5rem; - text-decoration: none; - - i { - margin-right: .5rem; - } - - &:hover { - font-weight: 500; - } - } + h3 { + border-bottom: none; + margin: 1rem 0; + } - } - } - } + #TableOfContents { + position: sticky; + overflow: auto; + max-height: 60vh; - .resources { - h3 { - margin: 1rem 0; - } + ul { + margin: 0; + padding: 0; - ul { + li { margin: 0; - padding: 0; - - li { - list-style: none; - margin: 0; + list-style: none; - a { - color: var(--global-font-color); - display: inline-block; - padding: .25rem 0 .25rem .5rem; - } + a { + color: var(--global-font-color); + display: inline-block; + padding: .25rem 0 .25rem .5rem; + margin-left: .5rem; + text-decoration: none; i { - margin-left: 1rem; + margin-right: .5rem; } + &:hover { + font-weight: 500; + } } } } } - } - .toc-mobile { - h3 { - border-bottom: none; - } + .resources { + h3 { + margin: 1rem 0; + } - #TableOfContents, .resources { ul { - list-style: none; margin: 0; padding: 0; li { + list-style: none; margin: 0; a { color: var(--global-font-color); display: inline-block; padding: .25rem 0 .25rem .5rem; - text-decoration: none; - border-left: 1px solid var(--lines-color); - - &:hover { - font-weight: bolder; - } } + i { + margin-left: 1rem; + } } } } } +} + +.toc-mobile { + h3 { + border-bottom: none; + } + + #TableOfContents, .resources { + ul { + list-style: none; + margin: 0; + padding: 0; + li { + margin: 0; + + a { + color: var(--global-font-color); + display: inline-block; + padding: .25rem 0 .25rem .5rem; + text-decoration: none; + border-left: 1px solid var(--lines-color); + + &:hover { + font-weight: bolder; + } + } + } + } + } } .hidden { @@ -412,11 +323,7 @@ input.toggle { } @media (max-width: 55em) { - .article-toc { - display: none; - } - - .book-toc { + .toc { display: none; } @@ -453,15 +360,10 @@ input.toggle { right: 0; } } - } @media (min-width: 55em) { - .toc-mobile { + .toc-mobile, .book-menu-mobile { display: none; } - .book-menu-mobile { - display: none; - } - } diff --git a/documentation/themes/beastie/layouts/articles/list.html b/documentation/themes/beastie/layouts/articles/list.html index 2954accc8b..d79f13bb32 100644 --- a/documentation/themes/beastie/layouts/articles/list.html +++ b/documentation/themes/beastie/layouts/articles/list.html @@ -35,8 +35,8 @@ {{ .Content }} -