diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index d86f9ab92..eb26b3a66 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -11,6 +11,6 @@ jobs: - uses: ahmadnassri/action-dependabot-auto-merge@v2 with: github-token: ${{ secrets.GH_TOKEN }} - command: "squash and merge" + command: 'squash and merge' approve: true target: minor diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 976bc9cbb..ccb9ac173 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,11 +19,8 @@ jobs: - name: Install all npm packages run: npm ci - - name: Lint JS code - run: npm run lint:js - - - name: Lint CSS code - run: npm run lint:css + - name: Lint files + run: npm test - name: Build all run: npm run build diff --git a/.prettierignore b/.prettierignore index 77f12ae2e..5f0d1180b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,3 @@ +CHANGELOG.md docs/ +live-examples/html-examples/inline-text-semantics/rtc.html diff --git a/contributing/html-examples.md b/contributing/html-examples.md index ce0251007..b01f3c42a 100644 --- a/contributing/html-examples.md +++ b/contributing/html-examples.md @@ -182,8 +182,7 @@ In particular, see the following guidelines for the HTML source and the output: Grapefruit slice atop a pile of other slices + alt="Grapefruit slice atop a pile of other slices" /> ``` With a browser window width of 1000 pixels, this will wrap like this: @@ -194,8 +193,7 @@ With a browser window width of 1000 pixels, this will wrap like this: src="/media/examples /Grapefruit_Slice--332x332.jpg" alt="Grapefruit slice atop a pile -of other slices" -/> +of other slices" /> ``` If we add line breaks after each attribute, the example is much more readable: @@ -204,8 +202,7 @@ If we add line breaks after each attribute, the example is much more readable: Grapefruit slice atop a pile of other slices + alt="Grapefruit slice atop a pile of other slices" /> ``` #### HTML output formal guidelines diff --git a/live-examples/css-examples/@counter-style/meta.json b/live-examples/css-examples/@counter-style/meta.json index 3232a3b41..647d961a6 100644 --- a/live-examples/css-examples/@counter-style/meta.json +++ b/live-examples/css-examples/@counter-style/meta.json @@ -1,94 +1,94 @@ { - "pages": { - "counterStyle": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/counter-style.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style.html", - "title": "CSS Demo: @counter-style", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStyleSystem": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/system.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style-system.html", - "title": "CSS Demo: system", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStyleNegative": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/negative.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list-negative.html", - "fileName": "counter-style-negative.html", - "title": "CSS Demo: negative", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStylePrefix": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/prefix.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style-prefix.html", - "title": "CSS Demo: prefix", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStyleSuffix": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/suffix.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style-suffix.html", - "title": "CSS Demo: suffix", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStyleRange": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/range.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style-range.html", - "title": "CSS Demo: range", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStylePad": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/pad.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style-pad.html", - "title": "CSS Demo: pad", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStyleFallback": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/fallback.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style-fallback.html", - "title": "CSS Demo: fallback", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStyleSymbols": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/symbols.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style-symbols.html", - "title": "CSS Demo: symbols", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - }, - "counterStyleAdditiveSymbols": { - "cssExampleSrc": "./live-examples/css-examples/@counter-style/additive-symbols.css", - "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", - "fileName": "counter-style-additive-symbols.html", - "title": "CSS Demo: additive-symbols", - "type": "tabbed", - "defaultTab": "css", - "height": "tabbed-shorter" - } + "pages": { + "counterStyle": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/counter-style.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style.html", + "title": "CSS Demo: @counter-style", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStyleSystem": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/system.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style-system.html", + "title": "CSS Demo: system", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStyleNegative": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/negative.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list-negative.html", + "fileName": "counter-style-negative.html", + "title": "CSS Demo: negative", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStylePrefix": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/prefix.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style-prefix.html", + "title": "CSS Demo: prefix", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStyleSuffix": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/suffix.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style-suffix.html", + "title": "CSS Demo: suffix", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStyleRange": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/range.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style-range.html", + "title": "CSS Demo: range", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStylePad": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/pad.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style-pad.html", + "title": "CSS Demo: pad", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStyleFallback": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/fallback.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style-fallback.html", + "title": "CSS Demo: fallback", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStyleSymbols": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/symbols.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style-symbols.html", + "title": "CSS Demo: symbols", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" + }, + "counterStyleAdditiveSymbols": { + "cssExampleSrc": "./live-examples/css-examples/@counter-style/additive-symbols.css", + "exampleCode": "./live-examples/css-examples/@counter-style/counter-list.html", + "fileName": "counter-style-additive-symbols.html", + "title": "CSS Demo: additive-symbols", + "type": "tabbed", + "defaultTab": "css", + "height": "tabbed-shorter" } + } } diff --git a/live-examples/css-examples/fragmentation/box-decoration-break.html b/live-examples/css-examples/fragmentation/box-decoration-break.html index 4f947e4c8..b5adcd766 100644 --- a/live-examples/css-examples/fragmentation/box-decoration-break.html +++ b/live-examples/css-examples/fragmentation/box-decoration-break.html @@ -1,8 +1,7 @@
+ data-property="box-decoration-break -webkit-box-decoration-break">
box-decoration-break: slice;
 -webkit-box-decoration-break: slice;
diff --git a/live-examples/css-examples/masking/mask-type.html b/live-examples/css-examples/masking/mask-type.html index bf10344ca..0e2f8405a 100644 --- a/live-examples/css-examples/masking/mask-type.html +++ b/live-examples/css-examples/masking/mask-type.html @@ -22,8 +22,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="0" - height="0" - > + height="0"> diff --git a/live-examples/html-examples/embedded-content/iframe.html b/live-examples/html-examples/embedded-content/iframe.html index d6edac380..a41fe1bf9 100644 --- a/live-examples/html-examples/embedded-content/iframe.html +++ b/live-examples/html-examples/embedded-content/iframe.html @@ -3,6 +3,5 @@ title="Inline Frame Example" width="300" height="200" - src="https://www.openstreetmap.org/export/embed.html?bbox=-0.004017949104309083%2C51.47612752641776%2C0.00030577182769775396%2C51.478569861898606&layer=mapnik" -> + src="https://www.openstreetmap.org/export/embed.html?bbox=-0.004017949104309083%2C51.47612752641776%2C0.00030577182769775396%2C51.478569861898606&layer=mapnik"> diff --git a/live-examples/html-examples/image-and-multimedia/area.html b/live-examples/html-examples/image-and-multimedia/area.html index e0c54cbf1..660ad0426 100644 --- a/live-examples/html-examples/image-and-multimedia/area.html +++ b/live-examples/html-examples/image-and-multimedia/area.html @@ -4,35 +4,30 @@ coords="129,0,260,95,129,138" href="https://developer.mozilla.org/docs/Web/HTTP" target="_blank" - alt="HTTP" - /> + alt="HTTP" /> HTML + alt="HTML" /> JavaScript + alt="JavaScript" /> Web APIs + alt="Web APIs" /> CSS + alt="CSS" /> MDN infographic diff --git a/live-examples/html-examples/image-and-multimedia/img.html b/live-examples/html-examples/image-and-multimedia/img.html index 579d92d0a..8cd5c9000 100644 --- a/live-examples/html-examples/image-and-multimedia/img.html +++ b/live-examples/html-examples/image-and-multimedia/img.html @@ -1,5 +1,4 @@ Grapefruit slice atop a pile of other slices + alt="Grapefruit slice atop a pile of other slices" /> diff --git a/live-examples/html-examples/image-and-multimedia/map.html b/live-examples/html-examples/image-and-multimedia/map.html index bda6a7295..211bb0111 100644 --- a/live-examples/html-examples/image-and-multimedia/map.html +++ b/live-examples/html-examples/image-and-multimedia/map.html @@ -4,21 +4,18 @@ coords="130,147,200,107,254,219,130,228" href="https://developer.mozilla.org/docs/Web/HTML" target="_blank" - alt="HTML" - /> + alt="HTML" /> CSS + alt="CSS" /> JavaScript + alt="JavaScript" /> MDN infographic diff --git a/live-examples/html-examples/input/datetime-local.html b/live-examples/html-examples/input/datetime-local.html index 693855521..1d9268214 100644 --- a/live-examples/html-examples/input/datetime-local.html +++ b/live-examples/html-examples/input/datetime-local.html @@ -6,5 +6,4 @@ name="meeting-time" value="2018-06-12T19:30" min="2018-06-07T00:00" - max="2018-06-14T00:00" -/> + max="2018-06-14T00:00" />