From fd6c9999204251c08aa1bea95c425eadc8127163 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 09:08:10 +0000 Subject: [PATCH 1/6] Bump prettier from 2.1.1 to 2.1.2 Bumps [prettier](https://github.com/prettier/prettier) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.1.1...2.1.2) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c7aeaf..2106aad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "just-the-docs", - "version": "0.3.1", + "version": "0.3.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3753,9 +3753,9 @@ "dev": true }, "prettier": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz", - "integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", + "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index 5b48684..9fe18e1 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "bugs": "https://github.com/pmarsceill/just-the-docs/issues", "devDependencies": { "@primer/css": "^15.1.0", - "prettier": "^2.1.1", + "prettier": "^2.1.2", "stylelint": "^13.6.1", "stylelint-config-prettier": "^8.0.2", "stylelint-config-primer": "^9.0.0", From 5d1609b8887143bcdf137fb41c777c0dbc5e9efa Mon Sep 17 00:00:00 2001 From: PLanCompS <18308236+pdmosses@users.noreply.github.com> Date: Tue, 29 Sep 2020 13:09:57 +0200 Subject: [PATCH 2/6] Update normalize.scss Fix #387 - Update `_sass/vendor/normalize.scss/normalize.scss` to v8.0.1. - Remove outdated `_sass/vendor/normalize.scss/package.json`. - Update `_sass/vendor/normalize.scss/README.md`. --- _sass/vendor/normalize.scss/README.md | 79 +--- _sass/vendor/normalize.scss/normalize.scss | 494 +++++++++------------ _sass/vendor/normalize.scss/package.json | 70 --- 3 files changed, 212 insertions(+), 431 deletions(-) delete mode 100644 _sass/vendor/normalize.scss/package.json diff --git a/_sass/vendor/normalize.scss/README.md b/_sass/vendor/normalize.scss/README.md index 36cc1c6..7af1714 100644 --- a/_sass/vendor/normalize.scss/README.md +++ b/_sass/vendor/normalize.scss/README.md @@ -1,78 +1,7 @@ -# normalize.scss v0.1.0 +# normalize.scss -Normalize.scss is the SCSS version of [normalize.css](http://necolas.github.io/normalize.css), a customisable CSS file that makes browsers render all elements more consistently and in line with modern standards. +Normalize.scss is an SCSS copy of [normalize.css](http://necolas.github.io/normalize.css), a customisable CSS file that makes browsers render all elements more consistently and in line with modern standards. + +The [normalize.scss fork](https://github.com/guerrero/normalize.scss) of [normalize.css](http://necolas.github.io/normalize.css) was archived in 2014, and has not been updated since v0.1.0. [View the normalize.css test file](http://necolas.github.io/normalize.css/latest/test.html) - -## Install - -* [npm](http://npmjs.org/): `npm install --save normalize.scss` -* [Component(1)](https://github.com/component/component/): `component install guerrero/normalize.scss` -* [Bower](http://bower.io/): `bower install --save normalize.scss` -* Download: Go to [this link](https://raw.githubusercontent.com/guerrero/normalize.scss/master/normalize.scss), press right-click on the page and choose "Save as..." - -No other styles should come before Normalize.scss. - -It's recommendable to modify `normalize.scss` to suit it to your project - -## What does it do? - -* Preserves useful defaults, unlike many CSS resets. -* Normalizes styles for a wide range of elements. -* Corrects bugs and common browser inconsistencies. -* Improves usability with subtle improvements. -* Explains what code does using detailed comments. - -## Browser support - -* Google Chrome (latest) -* Mozilla Firefox (latest) -* Mozilla Firefox 4 -* Opera (latest) -* Apple Safari 6+ -* Internet Explorer 8+ - -[Normalize.css v1 provides legacy browser -support](https://github.com/necolas/normalize.css/tree/v1) (IE 6+, Safari 4+), -but is no longer actively developed. - -## Extended details - -Additional detail and explanation of the esoteric parts of normalize.css. - -#### `pre, code, kbd, samp` - -The `font-family: monospace, monospace` hack fixes the inheritance and scaling -of font-size for preformated text. The duplication of `monospace` is -intentional. [Source](http://en.wikipedia.org/wiki/User:Davidgothberg/Test59). - -#### `sub, sup` - -Normally, using `sub` or `sup` affects the line-box height of text in all -browsers. [Source](http://gist.github.com/413930). - -#### `svg:not(:root)` - -Adding `overflow: hidden` fixes IE9's SVG rendering. Earlier versions of IE -don't support SVG, so we can safely use the `:not()` and `:root` selectors that -modern browsers use in the default UA stylesheets to apply this style. [SVG -Mailing List discussion](http://lists.w3.org/Archives/Public/public-svg-wg/2008JulSep/0339.html) - -#### `input[type="search"]` - -The search input is not fully stylable by default. In Chrome and Safari on -OSX/iOS you can't control `font`, `padding`, `border`, or `background`. In -Chrome and Safari on Windows you can't control `border` properly. It will apply -`border-width` but will only show a border color (which cannot be controlled) -for the outer 1px of that border. Applying `-webkit-appearance: textfield` -addresses these issues without removing the benefits of search inputs (e.g. -showing past searches). - -#### `legend` - -Adding `border: 0` corrects an IE 8–11 bug where `color` (yes, `color`) is not -inherited by `legend`. - -## Acknowledgements - -Normalize.scss is a project by [Alex Guerrero](https://github.com/guerrero) based on [normalize.css](http://necolas.github.io/normalize.css) from [Nicolas Gallagher](https://github.com/necolas), co-created with [Jonathan Neal](https://github.com/jonathantneal). diff --git a/_sass/vendor/normalize.scss/normalize.scss b/_sass/vendor/normalize.scss/normalize.scss index ce38a4f..192eb9c 100644 --- a/_sass/vendor/normalize.scss/normalize.scss +++ b/_sass/vendor/normalize.scss/normalize.scss @@ -1,135 +1,40 @@ -/*! normalize.scss v0.1.0 | MIT License | based on git.io/normalize */ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ /** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. */ html { - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ + line-height: 1.15; /* 1 */ -webkit-text-size-adjust: 100%; /* 2 */ } +/* Sections + ========================================================================== */ + /** - * Remove default margin. + * Remove the margin in all browsers. */ body { margin: 0; } -/* HTML5 display definitions - ========================================================================== */ - /** - * Correct `block` display not defined for any HTML5 element in IE 8/9. - * Correct `block` display not defined for `details` or `summary` in IE 10/11 - * and Firefox. - * Correct `block` display not defined for `main` in IE 11. + * Render the `main` element consistently in IE. */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -main, -menu, -nav, -section, -summary { +main { display: block; } /** - * 1. Correct `inline-block` display not defined in IE 8/9. - * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. - */ - -audio, -canvas, -progress, -video { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ -} - -/** - * Prevent modern browsers from displaying `audio` without controls. - * Remove excess height in iOS 5 devices. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/** - * Address `[hidden]` styling not present in IE 8/9/10. - * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. - */ - -[hidden], -template { - display: none; -} - -/* Links - ========================================================================== */ - -/** - * Remove the gray background color from active links in IE 10. - */ - -a { - background-color: transparent; -} - -/** - * Improve readability when focused and also mouse hovered in all browsers. - */ - -a:active, -a:hover { - outline: 0; -} - -/* Text-level semantics - ========================================================================== */ - -/** - * Address styling not present in IE 8/9/10/11, Safari, and Chrome. - */ - -abbr[title] { - border-bottom: 1px dotted; -} - -/** - * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. - */ - -b, -strong { - font-weight: bold; -} - -/** - * Address styling not present in Safari and Chrome. - */ - -dfn { - font-style: italic; -} - -/** - * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari, and Chrome. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ h1 { @@ -137,17 +42,75 @@ h1 { margin: 0.67em 0; } +/* Grouping content + ========================================================================== */ + /** - * Address styling not present in IE 8/9. + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. */ -mark { - background: #ff0; - color: #000; +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ } /** - * Address inconsistent and variable font size in all browsers. + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. */ small { @@ -155,7 +118,8 @@ small { } /** - * Prevent `sub` and `sup` affecting `line-height` in all browsers. + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. */ sub, @@ -166,87 +130,31 @@ sup { vertical-align: baseline; } -sup { - top: -0.5em; -} - sub { bottom: -0.25em; } +sup { + top: -0.5em; +} + /* Embedded content ========================================================================== */ /** - * Remove border when inside `a` element in IE 8/9/10. + * Remove the border on images inside links in IE 10. */ img { - border: 0; -} - -/** - * Correct overflow not hidden in IE 9/10/11. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Grouping content - ========================================================================== */ - -/** - * Address margin not present in IE 8/9 and Safari. - */ - -figure { - margin: 1em 40px; -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; -} - -/** - * Contain overflow in all browsers. - */ - -pre { - overflow: auto; -} - -/** - * Address odd `em`-unit font size rendering in all browsers. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; + border-style: none; } /* Forms ========================================================================== */ /** - * Known limitation: by default, Chrome and Safari on OS X allow very limited - * styling of `select`, unless a `border` property is set. - */ - -/** - * 1. Correct color not being inherited. - * Known issue: affects color of disabled elements. - * 2. Correct font properties not being inherited. - * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. */ button, @@ -254,146 +162,100 @@ input, optgroup, select, textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ } /** - * Address `overflow` set to `hidden` in IE 8/9/10/11. + * Show the overflow in IE. + * 1. Show the overflow in Edge. */ -button { +button, +input { /* 1 */ overflow: visible; } /** - * Address inconsistent `text-transform` inheritance for `button` and `select`. - * All other form control elements do not inherit `text-transform` values. - * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. - * Correct `select` style inheritance in Firefox. + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. */ button, -select { +select { /* 1 */ text-transform: none; } /** - * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. - * 2. Correct inability to style clickable `input` types in iOS. - * 3. Improve usability and consistency of cursor style between image-type - * `input` and others. + * Correct the inability to style clickable types in iOS and Safari. */ button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; } /** - * Re-set default cursor for disabled elements. - */ - -button[disabled], -html input[disabled] { - cursor: default; -} - -/** - * Remove inner padding and border in Firefox 4+. + * Remove the inner border and padding in Firefox. */ button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; padding: 0; } /** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. + * Restore the focus styles unset by the previous rule. */ -input { - line-height: normal; +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; } /** - * It's recommended that you don't attempt to style these elements. - * Firefox's implementation doesn't respect box-sizing, padding, or width. - * - * 1. Address box sizing set to `content-box` in IE 8/9/10. - * 2. Remove excess padding in IE 8/9/10. - */ - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Fix the cursor style for Chrome's increment/decrement buttons. For certain - * `font-size` values of the `input`, it causes the cursor style of the - * decrement button to change from `default` to `text`. - */ - -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Address `appearance` set to `searchfield` in Safari and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari and Chrome - * (include `-moz` to future-proof). - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; -} - -/** - * Remove inner padding and search cancel button in Safari and Chrome on OS X. - * Safari (but not Chrome) clips the cancel button when the search input has - * padding (and `textfield` appearance). - */ - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * Define consistent border, margin, and padding. + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; + padding: 0.35em 0.75em 0.625em; } /** - * 1. Correct `color` not being inherited in IE 8/9/10/11. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. */ legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ } /** - * Remove default vertical scrollbar in IE 8/9/10/11. + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. */ textarea { @@ -401,27 +263,87 @@ textarea { } /** - * Don't inherit the `font-weight` (applied by a rule above). - * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. */ -optgroup { - font-weight: bold; +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ } -/* Tables +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc ========================================================================== */ /** - * Remove most spacing between table cells. + * Add the correct display in IE 10+. */ -table { - border-collapse: collapse; - border-spacing: 0; +template { + display: none; } -td, -th { - padding: 0; +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; } diff --git a/_sass/vendor/normalize.scss/package.json b/_sass/vendor/normalize.scss/package.json deleted file mode 100644 index 2d051c2..0000000 --- a/_sass/vendor/normalize.scss/package.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "_args": [ - [ - "normalize.scss", - "/Users/pmarsceill/_projects/just-the-docs" - ] - ], - "_from": "normalize.scss@*", - "_id": "normalize.scss@0.1.0", - "_inCache": true, - "_installable": true, - "_location": "/normalize.scss", - "_nodeVersion": "0.10.32", - "_npmUser": { - "email": "alexguerrero1092@gmail.com", - "name": "alexguerrero" - }, - "_npmVersion": "2.0.2", - "_phantomChildren": {}, - "_requested": { - "name": "normalize.scss", - "raw": "normalize.scss", - "rawSpec": "", - "scope": null, - "spec": "*", - "type": "range" - }, - "_requiredBy": [ - "#DEV:/" - ], - "_resolved": "https://registry.npmjs.org/normalize.scss/-/normalize.scss-0.1.0.tgz", - "_shasum": "4a21dc25bd4c019c857785f829b658aba2a8f9ab", - "_shrinkwrap": null, - "_spec": "normalize.scss", - "_where": "/Users/pmarsceill/_projects/just-the-docs", - "author": "", - "bugs": { - "url": "https://github.com/guerrero/normalize.scss/issues" - }, - "dependencies": {}, - "description": "Normalize.scss as a node packaged module", - "devDependencies": {}, - "directories": {}, - "dist": { - "shasum": "4a21dc25bd4c019c857785f829b658aba2a8f9ab", - "tarball": "https://registry.npmjs.org/normalize.scss/-/normalize.scss-0.1.0.tgz" - }, - "files": [ - "normalize.scss" - ], - "gitHead": "d67d517e28615a873066438af1d4845c157c9baf", - "homepage": "https://github.com/guerrero/normalize.scss", - "license": "MIT", - "maintainers": [ - { - "name": "alexguerrero", - "email": "alexguerrero1092@gmail.com" - } - ], - "name": "normalize.scss", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", - "repository": { - "type": "git", - "url": "git://github.com/guerrero/normalize.scss.git" - }, - "scripts": {}, - "style": "normalize.scss", - "version": "0.1.0" -} From 2e377e45ac22311761932480632756faadbdac9d Mon Sep 17 00:00:00 2001 From: PLanCompS <18308236+pdmosses@users.noreply.github.com> Date: Tue, 29 Sep 2020 16:08:16 +0200 Subject: [PATCH 3/6] Update code.scss Fix #417 - Avoid appearance of dark border around visited code links in Safari. --- _sass/code.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_sass/code.scss b/_sass/code.scss index ead2c5f..7013971 100644 --- a/_sass/code.scss +++ b/_sass/code.scss @@ -11,6 +11,11 @@ code { border-radius: $border-radius; } +// Avoid appearance of dark border around visited code links in Safari +a:visited code { + border-color: $border-color; +} + // Content structure for highlighted code blocks using fences or Liquid // // ```[LANG]...```, no kramdown line_numbers: From 59f757a79065693344a60cd48c4f81303be05433 Mon Sep 17 00:00:00 2001 From: PLanCompS <18308236+pdmosses@users.noreply.github.com> Date: Tue, 29 Sep 2020 17:13:13 +0200 Subject: [PATCH 4/6] Fix list alignment Resolve #420 - Remove `margin-top` for the first child in various list items, to improve alignment. - Add examples of lists to `docs/tests/styling`. --- _sass/content.scss | 35 ++++++++++++++++ docs/tests/styling/dl.md | 83 +++++++++++++++++++++++++++++++++++++ docs/tests/styling/index.md | 8 ++++ docs/tests/styling/ol.md | 65 +++++++++++++++++++++++++++++ docs/tests/styling/ul.md | 65 +++++++++++++++++++++++++++++ 5 files changed, 256 insertions(+) create mode 100644 docs/tests/styling/dl.md create mode 100644 docs/tests/styling/index.md create mode 100644 docs/tests/styling/ol.md create mode 100644 docs/tests/styling/ul.md diff --git a/_sass/content.scss b/_sass/content.scss index bc906ed..96cddc8 100644 --- a/_sass/content.scss +++ b/_sass/content.scss @@ -154,6 +154,41 @@ visibility: hidden; } } + + dd { + blockquote, + div, + dl, + dt, + h1, + h2, + h3, + h4, + h5, + h6, + li, + ol, + p, + pre, + table, + ul, + .table-wrapper { + &:first-child { + margin-top: 0; + } + } + } + + dd, + ol, + ul { + dl:first-child { + dt:first-child, + dd:nth-child(2) { + margin-top: 0; + } + } + } .anchor-heading:hover, h1:hover > .anchor-heading, diff --git a/docs/tests/styling/dl.md b/docs/tests/styling/dl.md new file mode 100644 index 0000000..49dc034 --- /dev/null +++ b/docs/tests/styling/dl.md @@ -0,0 +1,83 @@ +--- +layout: default +title: Description lists +parent: Styling +grand_parent: Tests +--- + +# Description lists + +The first child element of each `dd` element in a `dl` list should be aligned with the preceding `dt` element in the following examples. + +term + +: paragraph text + + paragraph text + +term + +: ### Header + + paragraph text + +term + +: > block quote + + paragraph text + +term + +: ```sh + fenced code block + ``` + + paragraph text + +term + +: + unordered list item + + unordered list item + + paragraph text + +term + +: 1. ordered list item + 2. ordered list item + + paragraph text + +term + +: sub-term + : sub-description + + sub-term + : sub-description + + paragraph text + +term + +: |-----------------+------------+-----------------+----------------| + | Default aligned |Left aligned| Center aligned | Right aligned | + |-----------------|:-----------|:---------------:|---------------:| + | First body part |Second cell | Third cell | fourth cell | + | Second line |foo | **strong** | baz | + | Third line |quux | baz | bar | + |-----------------+------------+-----------------+----------------| + | Second body | | | | + | 2 line | | | | + |=================+============+=================+================| + | Footer row | | | | + |-----------------+------------+-----------------+----------------| + + paragraph text + +term + +: *** + + paragraph text diff --git a/docs/tests/styling/index.md b/docs/tests/styling/index.md new file mode 100644 index 0000000..12782be --- /dev/null +++ b/docs/tests/styling/index.md @@ -0,0 +1,8 @@ +--- +layout: default +title: Styling +parent: Tests +has_children: true +--- + +# Styling diff --git a/docs/tests/styling/ol.md b/docs/tests/styling/ol.md new file mode 100644 index 0000000..6e1468d --- /dev/null +++ b/docs/tests/styling/ol.md @@ -0,0 +1,65 @@ +--- +layout: default +title: Ordered lists +parent: Styling +grand_parent: Tests +--- + +# Ordered lists + +The first child element of each `li` element in an `ol` list should be aligned with the preceding label in the following examples. + +1. paragraph text + + paragraph text + +1. ### Header + + paragraph text + +1. > block quote + + paragraph text + +1. ```sh + fenced code block + ``` + + paragraph text + +1. + unordered list item + + unordered list item + + paragraph text + +1. 1. ordered list item + 2. ordered list item + + paragraph text + +1. term + : description + + term + : description + + paragraph text + +1. |-----------------+------------+-----------------+----------------| + | Default aligned |Left aligned| Center aligned | Right aligned | + |-----------------|:-----------|:---------------:|---------------:| + | First body part |Second cell | Third cell | fourth cell | + | Second line |foo | **strong** | baz | + | Third line |quux | baz | bar | + |-----------------+------------+-----------------+----------------| + | Second body | | | | + | 2 line | | | | + |=================+============+=================+================| + | Footer row | | | | + |-----------------+------------+-----------------+----------------| + + paragraph text + +1. *** + + paragraph text diff --git a/docs/tests/styling/ul.md b/docs/tests/styling/ul.md new file mode 100644 index 0000000..070b41a --- /dev/null +++ b/docs/tests/styling/ul.md @@ -0,0 +1,65 @@ +--- +layout: default +title: Unordered lists +parent: Styling +grand_parent: Tests +--- + +# Unordered lists + +The first child element of each `li` element in a `ul` list should be aligned with the preceding bullet in the following examples. + +- paragraph text + + paragraph text + +- ### Header + + paragraph text + +- > block quote + + paragraph text + +- ```sh + fenced code block + ``` + + paragraph text + +- + unordered list item + + unordered list item + + paragraph text + +- 1. ordered list item + 2. ordered list item + + paragraph text + +- term + : description + + term + : description + + paragraph text + +- |-----------------+------------+-----------------+----------------| + | Default aligned |Left aligned| Center aligned | Right aligned | + |-----------------|:-----------|:---------------:|---------------:| + | First body part |Second cell | Third cell | fourth cell | + | Second line |foo | **strong** | baz | + | Third line |quux | baz | bar | + |-----------------+------------+-----------------+----------------| + | Second body | | | | + | 2 line | | | | + |=================+============+=================+================| + | Footer row | | | | + |-----------------+------------+-----------------+----------------| + + paragraph text + +- *** + + paragraph text From 80e05938c7aa04309dfe2e5dc6ac198444fa8223 Mon Sep 17 00:00:00 2001 From: PLanCompS <18308236+pdmosses@users.noreply.github.com> Date: Tue, 29 Sep 2020 17:25:34 +0200 Subject: [PATCH 5/6] prettier --- _sass/content.scss | 55 ++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/_sass/content.scss b/_sass/content.scss index 96cddc8..45be6bc 100644 --- a/_sass/content.scss +++ b/_sass/content.scss @@ -130,32 +130,6 @@ grid-column: 2; margin-bottom: 0; margin-left: 1em; - } - - .anchor-heading { - position: absolute; - right: -$sp-4; - width: $sp-5; - height: 100%; - padding-right: $sp-1; - padding-left: $sp-1; - overflow: visible; - - @include mq(md) { - right: auto; - left: -$sp-5; - } - - svg { - display: inline-block; - width: 100%; - height: 100%; - color: $link-color; - visibility: hidden; - } - } - - dd { blockquote, div, dl, @@ -178,9 +152,9 @@ } } } - - dd, - ol, + + dd, + ol, ul { dl:first-child { dt:first-child, @@ -190,6 +164,29 @@ } } + .anchor-heading { + position: absolute; + right: -$sp-4; + width: $sp-5; + height: 100%; + padding-right: $sp-1; + padding-left: $sp-1; + overflow: visible; + + @include mq(md) { + right: auto; + left: -$sp-5; + } + + svg { + display: inline-block; + width: 100%; + height: 100%; + color: $link-color; + visibility: hidden; + } + } + .anchor-heading:hover, h1:hover > .anchor-heading, h2:hover > .anchor-heading, From 32afb2a983455f8bc93a72301d506a3e009b687d Mon Sep 17 00:00:00 2001 From: PLanCompS <18308236+pdmosses@users.noreply.github.com> Date: Tue, 29 Sep 2020 17:27:59 +0200 Subject: [PATCH 6/6] prettier --- _sass/content.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_sass/content.scss b/_sass/content.scss index 45be6bc..a53271a 100644 --- a/_sass/content.scss +++ b/_sass/content.scss @@ -152,7 +152,7 @@ } } } - + dd, ol, ul {