Skip to content

Commit

Permalink
Merge branch 'main' into 2581-whitespace-example-without-whitespace-i…
Browse files Browse the repository at this point in the history
…ncluded-in-code
  • Loading branch information
mfranzke authored Oct 4, 2023
2 parents 60a76bf + 2a51597 commit 8702e57
Show file tree
Hide file tree
Showing 50 changed files with 806 additions and 404 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
github-token: ${{ secrets.GH_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
if: github.triggering_actor != 'dependabot[bot]'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- name: Checkout
if: needs.publish-release.outputs.release_created
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js environment
if: needs.publish-release.outputs.release_created
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stage-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: github.triggering_actor != 'dependabot[bot]'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand Down
Empty file modified .husky/pre-commit
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion .prettierrc → .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"bracketSameLine": true,
"singleQuote": true,
"tabWidth": 2,
"printWidth": 120
}
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [2.2.0](https://github.com/mdn/interactive-examples/compare/v2.1.1...v2.2.0) (2023-08-29)


### Features

* **css:** Add example of `[@counter-style](https://github.com/counter-style)` and all of its descriptors ([#2089](https://github.com/mdn/interactive-examples/issues/2089)) ([2c4362a](https://github.com/mdn/interactive-examples/commit/2c4362ab85cfa3f8100dd25235f84a21d8021300))
* **html:** Add example of `<dialog>` ([#2212](https://github.com/mdn/interactive-examples/issues/2212)) ([e97aa1d](https://github.com/mdn/interactive-examples/commit/e97aa1d340a2d6cfdbf9badf3329f141b9b94b90))

## [2.1.1](https://github.com/mdn/interactive-examples/compare/v2.1.0...v2.1.1) (2023-08-17)


Expand Down
15 changes: 15 additions & 0 deletions live-examples/css-examples/@counter-style/additive-symbols.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
@counter-style full-roman {
system: additive;
additive-symbols:
50 l,
40 xl,
10 x,
9 ix,
5 v,
4 iv,
1 i;
}

ul {
list-style: full-roman;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<ol start="-3">
<li>One</li>
<li>Two</li>
<li>Three</li>
<li>Four</li>
<li>Five</li>
<li>Six</li>
<li>Seven</li>
<li>Eight</li>
</ol>
10 changes: 10 additions & 0 deletions live-examples/css-examples/@counter-style/counter-list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<ul>
<li>One</li>
<li>Two</li>
<li>Three</li>
<li>Four</li>
<li>Five</li>
<li>Six</li>
<li>Seven</li>
<li>Eight</li>
</ul>
11 changes: 11 additions & 0 deletions live-examples/css-examples/@counter-style/counter-style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@counter-style black-white-squares {
system: symbolic;
symbols: ◆ ◇;
suffix: ' ';
range: 0 6;
fallback: square;
}

ul {
list-style: black-white-squares;
}
9 changes: 9 additions & 0 deletions live-examples/css-examples/@counter-style/fallback.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@counter-style colors {
system: fixed;
symbols: 🟤 🟠 🟡 🟢 🟣;
fallback: disc;
}

ul {
list-style: colors;
}
94 changes: 94 additions & 0 deletions live-examples/css-examples/@counter-style/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +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"
}
}
}
9 changes: 9 additions & 0 deletions live-examples/css-examples/@counter-style/negative.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@counter-style negative-alphabet {
system: numeric;
symbols: 'A' 'B' 'C' 'D' 'E' 'F';
negative: '→' '←';
}

ol {
list-style: negative-alphabet;
}
9 changes: 9 additions & 0 deletions live-examples/css-examples/@counter-style/pad.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@counter-style binary-with-pad {
system: numeric;
symbols: '0' '1';
pad: 4 '_';
}

ul {
list-style: binary-with-pad;
}
9 changes: 9 additions & 0 deletions live-examples/css-examples/@counter-style/prefix.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@counter-style heads {
system: cyclic;
symbols: 👧 🧒 🧑 👱;
prefix: '🖐🏻';
}

ul {
list-style: heads;
}
12 changes: 12 additions & 0 deletions live-examples/css-examples/@counter-style/range.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@counter-style missing-shapes {
system: cyclic;
symbols: '♥︎' '♤';
range:
1 2,
5 6,
9 10;
}

ul {
list-style: missing-shapes;
}
9 changes: 9 additions & 0 deletions live-examples/css-examples/@counter-style/suffix.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@counter-style octal {
system: numeric;
symbols: '0' '1' '2' '3' '4' '5' '6' '7';
suffix: ': ';
}

ul {
list-style: octal;
}
8 changes: 8 additions & 0 deletions live-examples/css-examples/@counter-style/symbols.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@counter-style cool-symbols {
system: symbolic;
symbols: '*' '\21C9' ▲ 🐉 '🥲''"' ❎ 💓;
}

ul {
list-style: cool-symbols;
}
8 changes: 8 additions & 0 deletions live-examples/css-examples/@counter-style/system.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@counter-style smiles {
system: fixed;
symbols: 😀 😂 🙂 😍 😘 🤪;
}

ul {
list-style: smiles;
}
2 changes: 1 addition & 1 deletion live-examples/css-examples/fonts/font-size.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<section id="example-choice-list" class="example-choice-list" data-property="font-size">
<div class="example-choice" initial-choice="true">
<pre><code class="language-css">font-size: 1.2em;</code></pre>
<pre><code class="language-css">font-size: 1.2rem;</code></pre>
<button type="button" class="copy hidden" aria-hidden="true">
<span class="visually-hidden">Copy to Clipboard</span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions live-examples/css-examples/fonts/font.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<section id="example-choice-list" class="example-choice-list" data-property="font">
<div class="example-choice" initial-choice="true">
<pre><code class="language-css">font: 1.2em "Fira Sans", sans-serif;</code></pre>
<pre><code class="language-css">font: 1.2rem "Fira Sans", sans-serif;</code></pre>
<button type="button" class="copy hidden" aria-hidden="true">
<span class="visually-hidden">Copy to Clipboard</span>
</button>
</div>

<div class="example-choice">
<pre><code class="language-css">font: italic 1.2em "Fira Sans", serif;</code></pre>
<pre><code class="language-css">font: italic 1.2rem "Fira Sans", serif;</code></pre>
<button type="button" class="copy hidden" aria-hidden="true">
<span class="visually-hidden">Copy to Clipboard</span>
</button>
Expand Down
29 changes: 19 additions & 10 deletions live-examples/css-examples/pseudo-class/first-child.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
<p>NBA players with most championships:</p>
<p>Track &amp; field champions:</p>
<ul>
<li>Bill Russell</li>
<li>Sam Jones</li>
<li>Tom Heinsohn</li>
<li>K. C. Jones</li>
<li>Satch Sanders</li>
<li>John Havlicek</li>
<li>Jim Loscutoff</li>
<li>Frank Ramsey</li>
<li>Robert Horry</li>
<li>Adhemar da Silva</li>
<li>Wang Junxia</li>
<li>Wilma Rudolph</li>
<li>Babe Didrikson-Zaharias</li>
<li>Betty Cuthbert</li>
<li>Fanny Blankers-Koen</li>
<li>Florence Griffith-Joyner</li>
<li>Irena Szewinska</li>
<li>Jackie Joyner-Kersee</li>
<li>Shirley Strickland</li>
<li>Carl Lewis</li>
<li>Emil Zatopek</li>
<li>Haile Gebrselassie</li>
<li>Jesse Owens</li>
<li>Jim Thorpe</li>
<li>Paavo Nurmi</li>
<li>Sergei Bubka</li>
<li>Usain Bolt</li>
</ul>
29 changes: 19 additions & 10 deletions live-examples/css-examples/pseudo-class/last-child.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
<p>NBA players with most championships:</p>
<p>Track &amp; field champions:</p>
<ul>
<li>Bill Russell</li>
<li>Sam Jones</li>
<li>Tom Heinsohn</li>
<li>K. C. Jones</li>
<li>Satch Sanders</li>
<li>John Havlicek</li>
<li>Jim Loscutoff</li>
<li>Frank Ramsey</li>
<li>Robert Horry</li>
<li>Adhemar da Silva</li>
<li>Wang Junxia</li>
<li>Wilma Rudolph</li>
<li>Babe Didrikson-Zaharias</li>
<li>Betty Cuthbert</li>
<li>Fanny Blankers-Koen</li>
<li>Florence Griffith-Joyner</li>
<li>Irena Szewinska</li>
<li>Jackie Joyner-Kersee</li>
<li>Shirley Strickland</li>
<li>Carl Lewis</li>
<li>Emil Zatopek</li>
<li>Haile Gebrselassie</li>
<li>Jesse Owens</li>
<li>Jim Thorpe</li>
<li>Paavo Nurmi</li>
<li>Sergei Bubka</li>
<li>Usain Bolt</li>
</ul>
Loading

0 comments on commit 8702e57

Please sign in to comment.