Skip to content

Commit 1993384

Browse files
committed
🔀 Merge from Google
2 parents be0e4f9 + d30b1c9 commit 1993384

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1632
-1023
lines changed

CHANGELOG.md

Lines changed: 57 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,41 @@
66

77
Useful links: Docsy [releases][] & [tags][]. Jump to the [latest][] release.
88

9-
For a list of issues targeted for the next release, see the [23Q1][] milestone.
9+
For a list of issues targeted for the next release, see the [23Q2][] milestone.
1010

11-
## 0.7.0 - next planned release (unpublished yet)
11+
## [0.8.0][releases] - next major release (unpublished yet)
1212

1313
**New**:
1414

1515
**Breaking changes**:
1616

17+
**Other changes**:
18+
19+
## [0.7.1][]
20+
21+
Followup changes to **Bootstrap (BS) 5.2 upgrade** ([#470]):
22+
23+
- `td-blog-posts-list__item` and `td-blog-posts-list__body` replace the `.media`
24+
and `.media-body` classes, dropped by BS 5 [#1560].
25+
- Docsy test for Bootstrap version has been made more robust, and can be
26+
disabled. For details, see [#1579].
27+
28+
[#1560]: https://github.com/google/docsy/issues/1560
29+
[#1579]: https://github.com/google/docsy/issues/1579
30+
31+
## [0.7.0][]
32+
33+
**New**:
34+
35+
- **Click to copy button for Chroma-highlighted code blocks**: If you already
36+
implemented this functionality on your website, you can disable it. For
37+
details see [Chroma highlighting docs][chroma-docsy].
38+
39+
**Breaking changes:**
40+
41+
- [**Hugo** release][hugo-releases] **0.110.0** or later is required.
1742
- **Upgraded Bootstrap ([#470])** to v5.2. For a list of Bootstrap's breaking
18-
changes, see the [Bootstrap migration guide][bsv5mig]. Other Docsy-specific
19-
changes are listed below:
43+
changes, see the [Bootstrap migration page][bsv5mig]. Docsy-specific changes:
2044
- Clean up of unused, or rarely used, variables, functions, and mixins:
2145
- Dropped `$primary-light`
2246
- Dropped `color-diff()`
@@ -29,29 +53,40 @@ For a list of issues targeted for the next release, see the [23Q1][] milestone.
2953
- Dropped support for pre-Hugo-0.54.x behavior of `{{% %}}`. ([#939])
3054
- `blocks/section`: **default** and accepted values of the `type` argument
3155
have changed! For details see [blocks/section] ([#1472]).
56+
- **Card shortcodes** ([#1376])]:
57+
- Renamed CSS class `td-card-deck` to `td-card-group`.
58+
- `card`, `card-code`: markup of inner content (HTML/markdown) now depends
59+
on the syntax of the calling shortcode, not on extension of page file any
60+
more [#906].
61+
- `card-code` is deprecated; use `card` with named parameter `code=true`
62+
instead.
63+
64+
[chroma-docsy]:
65+
https://www.docsy.dev/docs/adding-content/lookandfeel/#code-highlighting-with-chroma
3266

33-
- **[Adaptation of shortcodes for diplay of cards (#1376)][1376]:
34-
- shortcode `cardpane`: renamed CSS class `td-card-deck` to `td-card-group`.
35-
- shortcode `card`, `card-code`: markup of inner content (html/markdown)
36-
now depends on the syntax of the calling shortcode, not on extension
37-
of page file any more [#906][906].
38-
- shortcode `card-code` is now deprecated, use shortcode `card` with named
39-
parameter `code=true` instead.
67+
- **Detection of draw.io diagrams** is now **disabled** by default [#1185][]
4068

4169
**Other changes**:
4270

71+
- `$list-inline-padding` is increased in support of footer icons ([#1523]). If
72+
this global adjustment is a problem for your project, let us know and we can
73+
contextualize the adjustment to the footer.
4374
- Non-breaking changes that result from the Bootstrap v5 upgrade:
4475
- Draw.io diagram edit button: replaced custom colors by BS's outline primary.
4576

4677
[#470]: https://github.com/google/docsy/issues/470
4778
[#906]: https://github.com/google/docsy/issues/906
4879
[#939]: https://github.com/google/docsy/issues/939
80+
[#1185]: https://github.com/google/docsy/issues/1185
4981
[#1369]: https://github.com/google/docsy/issues/1369
82+
[#1376]: https://github.com/google/docsy/issues/1369
5083
[#1442]: https://github.com/google/docsy/issues/1442
5184
[#1472]: https://github.com/google/docsy/issues/1472
85+
[#1523]: https://github.com/google/docsy/pull/1523
5286
[blocks/section]:
5387
https://www.docsy.dev/docs/adding-content/shortcodes/#blockssection
5488
[bsv5mig]: https://getbootstrap.com/docs/5.2/migration/
89+
[hugo-releases]: https://github.com/gohugoio/hugo/releases
5590

5691
## [0.6.0][]
5792

@@ -147,12 +182,16 @@ submodules. This has an impact on your project-build setup. To migrate your
147182
site, follow these steps (execute commands from your project's root directory):
148183

149184
1. Delete obsolete Docsy Git submodules:
150-
```console
151-
$ rm -Rf themes/docsy/assets/vendor
185+
```sh
186+
git rm themes/docsy/assets/vendor/Font-Awesome
187+
git rm themes/docsy/assets/vendor/bootstrap
152188
```
189+
These commands remove the submodules from Git's tracking, from the
190+
`.gitmodules` file, and deletes the submodule files under
191+
`themes/docsy/assets/vendor`.
153192
2. Get Docsy dependencies:
154-
```console
155-
$ (cd themes/docsy && npm install)
193+
```sh
194+
(cd themes/docsy && npm install)
156195
```
157196
3. Update your build scripts to fetch Docsy dependencies automatically. For
158197
example, if your site build uses NPM scripts, consider getting Docsy
@@ -223,14 +262,16 @@ For a full list of the changes to this release, see the [release notes][0.x.y].
223262
224263
[@deining]: https://github.com/deining
225264
[@lisafc]: https://github.com/LisaFC
265+
[0.7.1]: https://github.com/google/docsy/releases/v0.7.1
266+
[0.7.0]: https://github.com/google/docsy/releases/v0.7.0
226267
[0.6.0]: https://github.com/google/docsy/releases/v0.6.0
227268
[0.5.1]: https://github.com/google/docsy/releases/v0.5.1
228269
[0.5.0]: https://github.com/google/docsy/releases/v0.5.0
229270
[0.4.0]: https://github.com/google/docsy/releases/v0.4.0
230271
[0.3.0]: https://github.com/google/docsy/releases/v0.3.0
231272
[0.2.0]: https://github.com/google/docsy/releases/v0.2.0
232273
[0.x.y]: #
233-
[23q1]: https://github.com/google/docsy/milestone/6
274+
[23q2]: https://github.com/google/docsy/milestone/7
234275
[hugo modules]: https://gohugo.io/hugo-modules/
235276
[latest]: https://github.com/google/docsy/releases/latest
236277
[releases]: https://github.com/google/docsy/releases

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ information on using pull requests.
2929
This project follows
3030
[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
3131

32+
## Student contributions
33+
34+
Docsy welcomes contributions from students. However, we cannot guarantee that PRs will be merged within any specific timeframe. We ask that instructors *not* create assignments requiring students to have PRs merged into the project. We will not merge PRs solely to satisfy any class assignments.
35+
3236
## How to contribute
3337

3438
See the [contribution guidelines][] in the Docsy user guide.

README.md

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Docsy
2-
## 🚧 WARNING: `main` is unstable! For details, see [#1359](https://github.com/google/docsy/discussions/1359) 🚧
2+
3+
[![Project status: active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
4+
[![Project releases](https://img.shields.io/github/release/google/docsy)](https://github.com/google/docsy/releases)
5+
[![Project build Status](https://badges.netlify.com/api/docsydocs.svg?branch=master)](https://app.netlify.com/sites/docsydocs/deploys)
6+
[![Project contributors](https://img.shields.io/github/contributors/google/docsy)](https://github.com/google/docsy/graphs/contributors)
7+
[![Project license](https://img.shields.io/github/license/google/docsy)](https://github.com/google/docsy/blob/main/LICENSE)
8+
9+
## 🚧 WARNING 🚧 : `main` is under development and potentially unstable! Use official Docsy [releases].
310

411
Docsy is a [Hugo](https://gohugo.io) theme for technical documentation sets,
512
providing simple navigation, site structure, and more.
@@ -13,52 +20,54 @@ The following are basic prerequisites for using Docsy in your site:
1320

1421
- Install a recent release of the Hugo "extended" version. If you install from
1522
the [Hugo release page](https://github.com/gohugoio/hugo/releases), make sure
16-
you download the `_extended` version which supports SCSS.
23+
you download the `extended` version, which supports SCSS.
1724

1825
- Install `PostCSS` so that the site build can create the final CSS assets. You
1926
can install it locally by running the following commands from the root
2027
directory of your project:
2128

22-
```console
23-
$ npm install --save-dev autoprefixer
24-
$ npm install --save-dev postcss-cli
29+
```sh
30+
npm install --save-dev autoprefixer
31+
npm install --save-dev postcss-cli
2532
```
26-
27-
Starting in [version 8 of `postcss-cli`](https://github.com/postcss/postcss-cli/blob/master/CHANGELOG.md),
33+
34+
Starting in
35+
[version 8 of `postcss-cli`](https://github.com/postcss/postcss-cli/blob/master/CHANGELOG.md),
2836
you must also separately install `postcss`:
2937

30-
```bash
38+
```sh
3139
npm install -D postcss
3240
```
33-
34-
Any additional prerequisites depend on the [installation option](https://www.docsy.dev/docs/get-started/#installation-options)
35-
you choose. We recommend using Docsy as a Hugo module, which requires that
36-
you have the `go` language installed in addition to Hugo and PostCSS.
3741

38-
For complete prerequisites and instructions, see our [Get started guides](https://www.docsy.dev/docs/get-started/).
42+
Any additional prerequisites depend on the
43+
[installation option](https://www.docsy.dev/docs/get-started/#installation-options)
44+
you choose. We recommend using Docsy as a Hugo module, which requires that you
45+
have the `go` language installed in addition to Hugo and PostCSS.
46+
47+
For complete prerequisites and instructions, see our
48+
[Get started guides](https://www.docsy.dev/docs/get-started/).
3949

4050
## Example and usage
4151

42-
You can find an example project that uses Docsy in the [Docsy Example Project
43-
repo](https://github.com/google/docsy-example).The Docsy Example Project is
44-
hosted at [example.docsy.dev](https://example.docsy.dev). For
52+
You can find an example project that uses Docsy in the
53+
[Docsy Example Project repo](https://github.com/google/docsy-example).The Docsy
54+
Example Project is hosted at [example.docsy.dev](https://example.docsy.dev). For
4555
real-life examples of sites that use Docsy (and their source repos), see our
4656
[Examples](https://www.docsy.dev/docs/examples/) page.
4757

4858
To use the Docsy theme for your own site:
4959

50-
- (Recommended) Use the [example
51-
project](https://github.com/google/docsy-example), which includes the Docsy
52-
theme as a Hugo module, as a template to create your project. You can customize
53-
this pre-configured basic site into your own Docsy themed site. [Learn
54-
more...](https://github.com/google/docsy-example)
60+
- (Recommended) Use the
61+
[example project](https://github.com/google/docsy-example), which includes the
62+
Docsy theme as a Hugo module, as a template to create your project. You can
63+
customize this pre-configured basic site into your own Docsy themed site.
64+
[Learn more...](https://github.com/google/docsy-example)
5565

56-
- Add Docsy to your existing Hugo site. You can
57-
add Docsy as a Hugo module, as a Git submodule, or clone the Docsy theme into your
58-
project.
66+
- Add Docsy to your existing Hugo site. You can add Docsy as a Hugo module, as a
67+
Git submodule, or clone the Docsy theme into your project.
5968

60-
See the [Get started guides](https://www.docsy.dev/docs/get-started/)
61-
for details about the various usage options.
69+
See the [Get started guides](https://www.docsy.dev/docs/get-started/) for
70+
details about the various usage options.
6271

6372
## Documentation
6473

@@ -71,27 +80,27 @@ Alternatively you can use Hugo to generate and serve a local copy of the guide
7180
(also useful for testing local theme changes), making sure you have installed
7281
all the prerequisites listed above:
7382

74-
```console
75-
$ git clone --depth 1 https://github.com/google/docsy.git
76-
$ cd docsy/userguide/
77-
$ npm install
78-
$ npm run serve
83+
```sh
84+
git clone --depth 1 https://github.com/google/docsy.git
85+
cd docsy/userguide/
86+
npm install
87+
npm run serve
7988
```
8089

81-
## Contributing ![GitHub](https://img.shields.io/github/contributors/google/docsy)
90+
## Contributing
8291

8392
Please read
84-
[CONTRIBUTING.md](https://github.com/google/docsy/blob/main/CONTRIBUTING.md)
85-
for details on our code of conduct, and the process for submitting pull requests
86-
to us. See also the list of
93+
[CONTRIBUTING.md](https://github.com/google/docsy/blob/main/CONTRIBUTING.md) for
94+
details on our code of conduct, and the process for submitting pull requests to
95+
us. See also the list of
8796
[contributors](https://github.com/google/docsy/graphs/contributors) who
8897
participated in this project.
8998

90-
## License ![GitHub](https://img.shields.io/github/license/google/docsy)
99+
## License
91100

92101
This project is licensed under the Apache License 2.0 - see the
93-
[LICENSE.md](https://github.com/google/docsy/blob/main/LICENSE) file for
94-
details
102+
[LICENSE.md](https://github.com/google/docsy/blob/main/LICENSE) file for details
95103

96-
[Deploys]: https://app.netlify.com/sites/docsydocs/deploys
97-
[Netlify]: https://netlify.com
104+
[deploys]: https://app.netlify.com/sites/docsydocs/deploys
105+
[netlify]: https://netlify.com
106+
[releases]: https://github.com/google/docsy/releases

0 commit comments

Comments
 (0)