diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..afc63ba1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..f1b0b948 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,9 @@ +# This file is used to request PR reviews from the appropriate team. +# +# Order is important; the last matching pattern takes precedence. +# Each rule is more specific than the previous rules. +# For more information, see: +# https://docs.github.com/en/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/about-code-owners + +# Default +* @mdn/core-yari-content diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml new file mode 100644 index 00000000..5640bef1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -0,0 +1,36 @@ +name: "Issue report" +description: Report an unexpected problem or unintended behavior. +labels: ["needs triage"] +body: + - type: markdown + attributes: + value: | + ### Before you start + + **Want to fix the problem yourself?** This project is open source and we welcome fixes and improvements from the community! + + ↩ Check the project [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md) guide to see how to get started. + + --- + - type: textarea + id: problem + attributes: + label: What was incorrect, unhelpful, or incomplete? + validations: + required: true + - type: textarea + id: expected + attributes: + label: What did you expect to see? + validations: + required: true + - type: textarea + id: references + attributes: + label: Do you have any supporting links, references, or citations? + description: Link to information that helps us confirm your issue. + - type: textarea + id: more-info + attributes: + label: Do you have anything more you want to share? + description: For example, steps to reproduce, screenshots, screen recordings, or sample code. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..5cd3f68e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,11 @@ +blank_issues_enabled: false +contact_links: + - name: MDN GitHub Discussions + url: https://github.com/orgs/mdn/discussions + about: Does the issue involve a lot of pages, or are you not sure how it can be split into actionable tasks? Consider starting a discussion first. + - name: MDN Web Docs on Discourse + url: https://discourse.mozilla.org/c/mdn/learn/250 + about: Need help with assessments on MDN Web Docs? We have a support community for this purpose on Discourse. + - name: Help with code + url: https://stackoverflow.com/ + about: If you are stuck and need help with code, StackOverflow is a great resource. diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE new file mode 100644 index 00000000..d85c3d5c --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE @@ -0,0 +1,21 @@ + + +**Description:** + + + +**Motivation:** + + + +**Additional details:** + + + +**Related issues and pull requests:** + + + + + + diff --git a/.github/workflows/idle-issues.yml b/.github/workflows/idle-issues.yml new file mode 100644 index 00000000..0daf455a --- /dev/null +++ b/.github/workflows/idle-issues.yml @@ -0,0 +1,10 @@ +name: "Mark issues and pull requests as idle" +on: + schedule: + - cron: "49 11,23 * * *" + +jobs: + idle: + uses: mdn/workflows/.github/workflows/idle.yml@main + with: + target-repo: "mdn/css-examples" diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml new file mode 100644 index 00000000..33c6a521 --- /dev/null +++ b/.github/workflows/lock-closed.yml @@ -0,0 +1,10 @@ +name: "Lock old issues and pull requests" +on: + schedule: + - cron: "0 9 1 * *" + +jobs: + lock: + uses: mdn/workflows/.github/workflows/lock-closed.yml@main + with: + target-repo: "mdn/css-examples" diff --git a/.github/workflows/new-issues.yml b/.github/workflows/new-issues.yml new file mode 100644 index 00000000..373f82ca --- /dev/null +++ b/.github/workflows/new-issues.yml @@ -0,0 +1,17 @@ +name: "Mark new issues with needs-triage label" + +on: + issues: + types: + - reopened + - opened + +jobs: + label-new-issues: + runs-on: ubuntu-latest + steps: + - name: initial labelling + uses: andymckay/labeler@master + with: + add-labels: "needs triage" + ignore-if-assigned: true diff --git a/.github/workflows/pr-merge-conflicts.yml b/.github/workflows/pr-merge-conflicts.yml new file mode 100644 index 00000000..f94b9feb --- /dev/null +++ b/.github/workflows/pr-merge-conflicts.yml @@ -0,0 +1,14 @@ +name: "Label PRs with conflicts" + +on: + push: + pull_request_target: + types: [synchronize] + +jobs: + label-merge-conflicts: + uses: mdn/workflows/.github/workflows/pr-rebase-needed.yml@main + with: + target-repo: "mdn/css-examples" + secrets: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc new file mode 100644 index 00000000..3395ac2b --- /dev/null +++ b/.markdownlint-cli2.jsonc @@ -0,0 +1,12 @@ +{ + "config": { + "extends": "./.markdownlint.jsonc" + }, + "ignores": [ + "node_modules", + ".git", + ".github", + "tests", + "editable-samples/codemirror" + ] +} diff --git a/.markdownlint.jsonc b/.markdownlint.jsonc new file mode 100644 index 00000000..4431899c --- /dev/null +++ b/.markdownlint.jsonc @@ -0,0 +1,8 @@ +// This file defines our configuration for Markdownlint. See +// https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md +// for more details on each rule. + +{ + "first-line-heading": false, + "line-length": false +} diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..6ca2a321 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +editable-samples/codemirror/**/* +editable-samples-2/js/ +.markdownlint* diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 00000000..9c1044f6 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,3 @@ +{ + "bracketSameLine": true +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..f65a45cd --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,60 @@ +# Contribution guide + +This repository accompany various CSS documentation pages on [MDN Web Docs](https://developer.mozilla.org). +This document will help you get started with contributions! + +## Types of contribution + +> [!NOTE] +> You can include an example directly in MDN pages using [`{{EmbedLiveSample()}}` macros](https://developer.mozilla.org/en-US/docs/MDN/Writing_guidelines/Page_structures/Macros/Commonly_used_macros#code_samples) or regular Markdown code blocks. +> These methods are simpler to maintain as the code lives beside the rest of the content. +> Only add examples to this repository if your example doesn't easily run on MDN pages for technical or security reasons. + +There are many ways you can help improve this repository! For example: + +- **Write a new example.** If you would like to add a new example, make sure this feature is supported by a stable version of modern browsers. +- **Improve an existing example.** You could make improvements or add some other changes which would make example more helpful to the users. +- **Fix a bug:** we have a list of [issues](https://github.com/mdn/css-examples/issues), or maybe you found your own. + +## Getting started + +You will need to have Git and GitHub set up to be able to contribute. + +### Set up Git and GitHub + +For more information on setting up Git on your machine, [read this article](https://help.github.com/articles/set-up-git/). +With the above dependencies satisfied, [create your new account on GitHub](https://github.com/join). + +Next up, you need to fork and clone the repo to be able to contribute to it. +You can [learn about forking on GitHub](https://help.github.com/articles/fork-a-repo). +Once you have your own fork, [clone it to your local machine](https://help.github.com/articles/cloning-a-repository/). + +### Serving + +You should serve your example locally to see the results before submitting your changes. +There are a few different ways to do this depending on your preferred tooling methods. +See [Running a simple local HTTP server](https://developer.mozilla.org/en-US/docs/Learn/Common_questions/Tools_and_setup/set_up_a_local_testing_server#running_a_simple_local_http_server) for information on setting up a server. + +```bash +cd my-cool-example +python3 -m http.server +``` + +### Open a pull request + +Once you're satisfied, the final step is to [submit your pull request](https://help.github.com/articles/creating-a-pull-request/). +You can find more information about submitting pull requests in our [Community guidelines](https://developer.mozilla.org/en-US/docs/MDN/Community/Pull_requests) docs. + +### Including your example on MDN + +After your pull request is reviewed and merged, you can link to your example from MDN Web Docs. +For example, the demo is referenced in MDN content like so: + +```markdown +See more examples on the [demo page](https://mdn.github.io/css-examples/counter-style-demo/). +``` + +## Thank you + +Thanks a lot for your contribution! +If you'd like to ask questions or get in touch, feel free to drop by in [Discord](https://developer.mozilla.org/discord) or say hello in one of [our communication channels](https://developer.mozilla.org/en-US/docs/MDN/Community/Communication_channels). diff --git a/README.md b/README.md index 6c994e91..fb5301d0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ # css-examples -This repository contains examples of CSS usage. +Code examples that accompany various MDN CSS documentation pages. + +> [!NOTE] +> You can include an example directly in MDN pages using [`{{EmbedLiveSample()}}` macros](https://developer.mozilla.org/en-US/docs/MDN/Writing_guidelines/Page_structures/Macros/Commonly_used_macros#code_samples) or regular Markdown code blocks. +> These methods are simpler to maintain as the code lives beside the rest of the content. +> Only add examples to this repository if your example doesn't easily run on MDN pages for technical or security reasons. The "animation-frames-timing-function" directory contains a simple example that demonstrates the difference between the steps() timing function available for CSS animations and transitions, and the new frames() timing function. [Run the example live](http://mdn.github.io/css-examples/animation-frames-timing-function/). You can also find versions that show the same timing function [used with transitions](http://mdn.github.io/css-examples/animation-frames-timing-function/index-transitions.html), and used with the [Web Animations API](http://mdn.github.io/css-examples/animation-frames-timing-function/index-waa.html). @@ -10,10 +15,24 @@ The "moz-context-properties" directory contains a demo for the [-moz-context-pro The "editable-examples" directory contains CSS examples that are intended to be embedded in MDN pages as live editable samples. -The "object-fit-basics" directory contains a simple page demonstrating typical usage of different object-fit and object-position values. [Run example live](http://mdn.github.io/css-examples/object-fit-basics/). +The "object-fit-basics" directory contains a simple page demonstrating typical usage of different `object-fit` and `object-position` values. [Run example live](http://mdn.github.io/css-examples/object-fit-basics/). -The "object-fit-gallery" directory contains a fun image gallery that uses object-fit to display the images more nicely, both in thumbnail and full size view. [Run the example live](http://mdn.github.io/css-examples/object-fit-gallery/). +The "object-fit-gallery" directory contains a fun image gallery that uses `object-fit` to display the images more nicely, both in thumbnail and full size view. [Run the example live](http://mdn.github.io/css-examples/object-fit-gallery/). -The "overscroll-behavior" directory contains a simple page demonstrating typical usage of different overscroll-behavior values. [Run example live](http://mdn.github.io/css-examples/overscroll-behavior/). +The "overscroll-behavior" directory contains a simple page demonstrating typical usage of different `overscroll-behavior` values. [Run example live](http://mdn.github.io/css-examples/overscroll-behavior/). The "tools" directory contains various tools for working with CSS, including a [color picker](http://mdn.github.io/css-examples/tools/color-picker/) and a [box shadow generator](http://mdn.github.io/css-examples/tools/box-shadow-generator/). + +## Contribute to MDN Web Docs + +You can contribute to MDN Web Docs and be a part of our community through content contributions, engineering, or translation work. +The MDN Web Docs project welcomes contributions from everyone who shares our goals and wants to contribute constructively and respectfully within our community. + +To find out how to get started, see the [CONTRIBUTING.md](CONTRIBUTING.md) document in this repository. +By participating in and contributing to our projects and discussions, you acknowledge that you have read and agree to our [Code of Conduct](CODE_OF_CONDUCT.md). + +## Get in touch + +You can communicate with the MDN Web Docs team and community using the [communication channels][]. + +[communication channels]: https://developer.mozilla.org/en-US/docs/MDN/Community/Communication_channels diff --git a/assets/styles.css b/assets/styles.css index 11945fee..f46d5bc4 100644 --- a/assets/styles.css +++ b/assets/styles.css @@ -1,10 +1,10 @@ /* Some default styling for cookbook examples */ /* -rgb(53,43,34) -rgb(75,70,74) -rgb(95,97,110) -rgb(137,151,188) -rgb(160,178,226) +rgb(53 43 34) +rgb(75 70 74) +rgb(95 97 110) +rgb(137 151 188) +rgb(160 178 226) */ body { background-color: #fff; diff --git a/backdrop/index.html b/backdrop/index.html index 2d9d8474..61df9a65 100644 --- a/backdrop/index.html +++ b/backdrop/index.html @@ -20,8 +20,7 @@ controls src="https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4" poster="https://peach.blender.org/wp-content/uploads/title_anouncement.jpg?x11217" - width="620" - > + width="620"> Sorry, your browser doesn't support embedded videos. Time to upgrade! diff --git a/backdrop/script.js b/backdrop/script.js index 404a2958..3f99bd9b 100644 --- a/backdrop/script.js +++ b/backdrop/script.js @@ -36,7 +36,7 @@ function toggleFullscreen() { if (!document.fullscreenElement) { elem .requestFullscreen() - .then({}) + .then(() => {}) .catch((err) => { alert( `Error attempting to enable full-screen mode: ${err.message} (${err.name})`, diff --git a/backdrop/styles.css b/backdrop/styles.css index 11945fee..f46d5bc4 100644 --- a/backdrop/styles.css +++ b/backdrop/styles.css @@ -1,10 +1,10 @@ /* Some default styling for cookbook examples */ /* -rgb(53,43,34) -rgb(75,70,74) -rgb(95,97,110) -rgb(137,151,188) -rgb(160,178,226) +rgb(53 43 34) +rgb(75 70 74) +rgb(95 97 110) +rgb(137 151 188) +rgb(160 178 226) */ body { background-color: #fff; diff --git a/box-alignment/flexbox/auto-margins.html b/box-alignment/flexbox/auto-margins.html index b1d9394a..0f2aca8a 100644 --- a/box-alignment/flexbox/auto-margins.html +++ b/box-alignment/flexbox/auto-margins.html @@ -61,14 +61,14 @@ .box { width: 500px; - border: 2px dotted rgb(96, 139, 168); + border: 2px dotted rgb(96 139 168); } .box > * { padding: 20px; - border: 2px solid rgb(96, 139, 168); + border: 2px solid rgb(96 139 168); border-radius: 5px; - background-color: rgba(96, 139, 168, 0.2); + background-color: rgb(96 139 168 / 0.2); } diff --git a/css-cookbook/columns-flexbox.html b/css-cookbook/columns-flexbox.html index cbcd6c5a..f1921840 100644 --- a/css-cookbook/columns-flexbox.html +++ b/css-cookbook/columns-flexbox.html @@ -11,14 +11,14 @@ diff --git a/css-cookbook/columns-grid--download.html b/css-cookbook/columns-grid--download.html index 91349f2d..be9b851e 100644 --- a/css-cookbook/columns-grid--download.html +++ b/css-cookbook/columns-grid--download.html @@ -21,7 +21,7 @@ } .container { - border: 2px solid rgb(75, 70, 74); + border: 2px solid rgb(75 70 74); border-radius: 0.5em; padding: 20px; width: 500px; @@ -32,7 +32,7 @@ .container > * { padding: 10px; - border: 2px solid rgb(95, 97, 110); + border: 2px solid rgb(95 97 110); border-radius: 0.5em; margin: 0; } diff --git a/css-cookbook/columns-grid.html b/css-cookbook/columns-grid.html index ffbc7af1..75ec4044 100644 --- a/css-cookbook/columns-grid.html +++ b/css-cookbook/columns-grid.html @@ -11,7 +11,7 @@ diff --git a/css-cookbook/columns-multicol.html b/css-cookbook/columns-multicol.html index e8bea1af..b6794a8d 100644 --- a/css-cookbook/columns-multicol.html +++ b/css-cookbook/columns-multicol.html @@ -11,7 +11,7 @@ @@ -51,7 +51,7 @@ diff --git a/css-cookbook/grid-wrapper--download.html b/css-cookbook/grid-wrapper--download.html index 7c5706a0..95dfc3f0 100644 --- a/css-cookbook/grid-wrapper--download.html +++ b/css-cookbook/grid-wrapper--download.html @@ -31,7 +31,7 @@ } .grid > * { - border: 2px solid rgb(95, 97, 110); + border: 2px solid rgb(95 97 110); border-radius: 0.5em; padding: 20px; } diff --git a/css-cookbook/grid-wrapper.html b/css-cookbook/grid-wrapper.html index 166418bb..62802904 100644 --- a/css-cookbook/grid-wrapper.html +++ b/css-cookbook/grid-wrapper.html @@ -17,7 +17,7 @@ } .grid > * { - border: 2px solid rgb(95, 97, 110); + border: 2px solid rgb(95 97 110); border-radius: 0.5em; padding: 20px; } diff --git a/css-cookbook/list-group-badges.html b/css-cookbook/list-group-badges.html index 88bc6dae..fb0a441f 100644 --- a/css-cookbook/list-group-badges.html +++ b/css-cookbook/list-group-badges.html @@ -72,7 +72,8 @@ display: flex; justify-content: space-between; align-items: center; -} +} +} +} - +} +} +} +} +} +} +
- London. Michaelmas term lately over, and the Lord Chancellor sitting in Lincoln's Inn Hall. Implacable November weather. As much mud in the streets as if the waters had but newly retired from the face of the earth, and it would not be wonderful to meet a Megalosaurus, forty feet long or so, waddling like an elephantine lizard up Holborn Hill. Smoke lowering down from chimney-pots, making a soft black drizzle, with flakes of soot in it as big as full-grown snowflakes—gone into mourning, one might imagine, for the death of the sun. Dogs, undistinguishable in mire. Horses, scarcely better; splashed to their very blinkers. Foot passengers, jostling one another's umbrellas in a general infection of ill temper, and losing their foot-hold at street-corners, where tens of thousands of other foot passengers have been slipping and sliding since the day broke (if this day ever broke), adding new deposits to the crust upon crust of mud, sticking at those points tenaciously to the pavement, and accumulating at compound interest. + London. Michaelmas term lately over, and the Lord Chancellor sitting in + Lincoln's Inn Hall. Implacable November weather. As much mud in the + streets as if the waters had but newly retired from the face of the + earth, and it would not be wonderful to meet a Megalosaurus, forty feet + long or so, waddling like an elephantine lizard up Holborn Hill. Smoke + lowering down from chimney-pots, making a soft black drizzle, with + flakes of soot in it as big as full-grown snowflakes—gone into mourning, + one might imagine, for the death of the sun. Dogs, undistinguishable in + mire. Horses, scarcely better; splashed to their very blinkers. Foot + passengers, jostling one another's umbrellas in a general infection of + ill temper, and losing their foot-hold at street-corners, where tens of + thousands of other foot passengers have been slipping and sliding since + the day broke (if this day ever broke), adding new deposits to the crust + upon crust of mud, sticking at those points tenaciously to the pavement, + and accumulating at compound interest.
- + - - - + diff --git a/editable-samples/pages/font/js/font.js b/editable-samples/pages/font/js/font.js index 4390e579..87605075 100644 --- a/editable-samples/pages/font/js/font.js +++ b/editable-samples/pages/font/js/font.js @@ -1 +1 @@ -var cmInitContent = 'font: italic 1.5em cursive;\n\n'; +var cmInitContent = "font: italic 1.5em cursive;\n\n"; diff --git a/editable-samples/pages/transform/index-old.html b/editable-samples/pages/transform/index-old.html index 03b6db02..5c9bf751 100644 --- a/editable-samples/pages/transform/index-old.html +++ b/editable-samples/pages/transform/index-old.html @@ -1,20 +1,20 @@ - + - + - - - + + + - +
- +
@@ -26,10 +26,8 @@ - + - - - + diff --git a/editable-samples/pages/transform/index.html b/editable-samples/pages/transform/index.html index b79fe3ee..f646eca0 100644 --- a/editable-samples/pages/transform/index.html +++ b/editable-samples/pages/transform/index.html @@ -1,36 +1,33 @@ - + - + - - - + + + - + -
- +
- + - - - + diff --git a/editable-samples/pages/transform/js/transform.js b/editable-samples/pages/transform/js/transform.js index 2ed178fe..ff876721 100644 --- a/editable-samples/pages/transform/js/transform.js +++ b/editable-samples/pages/transform/js/transform.js @@ -1 +1 @@ -var cmInitContent = 'transform: skew(30deg, 20deg);\n\n'; +var cmInitContent = "transform: skew(30deg, 20deg);\n\n"; diff --git a/feature-queries/and.html b/feature-queries/and.html index c77848dd..3e6004b6 100644 --- a/feature-queries/and.html +++ b/feature-queries/and.html @@ -14,8 +14,8 @@ } @supports (display: grid) and (shape-outside: circle()) { .box { - border: 4px solid red; - color: red; + border: 4px dashed darkgreen; + color: darkgreen; } } @@ -25,7 +25,7 @@
If your browser supports display: grid and shape-outside: circle(), the - text and border will be red. + content will be darkgreen with a dashed border.
@@ -36,15 +36,15 @@ } @supports (display: grid) and (shape-outside: circle()) { .box { - border: 4px solid red; - color: red; + border: 4px dashed darkgreen; + color: darkgreen; } } diff --git a/feature-queries/not.html b/feature-queries/not.html index dc5eda8b..c3866ceb 100644 --- a/feature-queries/not.html +++ b/feature-queries/not.html @@ -14,8 +14,8 @@ } @supports not (row-gap: 10px) { .box { - border: 4px solid red; - color: red; + border: 4px dashed darkgreen; + color: darkgreen; } } @@ -24,8 +24,8 @@
- If your browser does not support row-gap, the text and border will be - red. + If your browser does not support row-gap, the content will be darkgreen + with a dashed border.
@@ -36,14 +36,15 @@ } @supports not (row-gap: 10px) { .box { - border: 4px solid red; - color: red; + border: 4px dashed darkgreen; + color: darkgreen; } -} +} diff --git a/feature-queries/or.html b/feature-queries/or.html index a221b2e0..74160661 100644 --- a/feature-queries/or.html +++ b/feature-queries/or.html @@ -12,10 +12,10 @@ border: 4px solid blue; color: blue; } - @supports (display: grid) or (display: -ms-grid) { + @supports (font-smooth: always) or (-webkit-font-smoothing: antialiased) { .box { - border: 4px solid red; - color: red; + border: 4px dashed darkgreen; + color: darkgreen; } } @@ -24,8 +24,8 @@
- If your browser supports display: grid or display: -ms-grid, the text - and border will be red. + The text and border will be green if your browser supports font + smoothing.
@@ -34,16 +34,17 @@ border: 4px solid blue; color: blue; } -@supports (display: grid) or (display: -ms-grid) { +@supports (font-smooth: always) or (-webkit-font-smoothing: antialiased) { .box { - border: 4px solid red; - color: red; + border: 4px dashed darkgreen; + color: darkgreen; } -} +} diff --git a/feature-queries/simple.html b/feature-queries/simple.html index c56f40ab..d0883825 100644 --- a/feature-queries/simple.html +++ b/feature-queries/simple.html @@ -14,7 +14,7 @@ } @supports (row-gap: 10px) { .box { - border: 4px solid red; + border: 4px dashed darkgreen; color: red; } } @@ -24,7 +24,8 @@
- If your browser supports row-gap, the text and border will be red. + If your browser supports row-gap, border will be be dashed and text will + be red
@@ -35,14 +36,15 @@ } @supports (row-gap: 10px) { .box { - border: 4px solid red; + border: 4px dashed darkgreen; color: red; } -} +} diff --git a/feature-queries/step1.html b/feature-queries/step1.html index bb56c48c..e390d100 100644 --- a/feature-queries/step1.html +++ b/feature-queries/step1.html @@ -18,7 +18,7 @@ .box { float: left; width: 33%; - border: 2px solid rgb(95, 97, 110); + border: 2px solid rgb(95 97 110); border-radius: 0.5em; padding: 20px; } @@ -41,10 +41,11 @@ .box { float: left; width: 33%; - border: 2px solid rgb(95, 97, 110); + border: 2px solid rgb(95 97 110); border-radius: .5em; padding: 20px; -} +} +} +} +} -

Before that night—a memorable night, as it was to prove—hundreds of millions of people had watched the rising smoke-wreaths of their fires without drawing any special inspiration from the fact.”

diff --git a/flow/formatting-contexts/bfc-flow-root.html b/flow/formatting-contexts/bfc-flow-root.html index 9f071012..a1d4f63e 100644 --- a/flow/formatting-contexts/bfc-flow-root.html +++ b/flow/formatting-contexts/bfc-flow-root.html @@ -62,7 +62,7 @@ @@ -39,7 +39,8 @@ .ordinal { font-variant-numeric: ordinal; font-family: "Source Sans Pro"; -} +} + checked />
@@ -213,8 +212,7 @@ name="demo2_control" id="demo2_control" value="on" - checked - /> + checked />
diff --git a/font-features/font-variant-numeric.html b/font-features/font-variant-numeric.html index 6951caca..36e0412a 100644 --- a/font-features/font-variant-numeric.html +++ b/font-features/font-variant-numeric.html @@ -161,8 +161,7 @@ name="demo1_control" id="demo1_control" value="on" - checked - /> + checked />
@@ -195,8 +194,7 @@ name="demo2_control" id="demo2_control" value="on" - checked - /> + checked />
diff --git a/font-features/font-variant-position.html b/font-features/font-variant-position.html index 0cac0e16..61751a62 100644 --- a/font-features/font-variant-position.html +++ b/font-features/font-variant-position.html @@ -165,8 +165,7 @@ name="demo1_control" id="demo1_control" value="on" - checked - /> + checked />
@@ -201,8 +200,7 @@ name="demo2_control" id="demo2_control" value="on" - checked - /> + checked />
diff --git a/font-features/font-variant.html b/font-features/font-variant.html index da690ed2..e697c355 100644 --- a/font-features/font-variant.html +++ b/font-features/font-variant.html @@ -152,8 +152,7 @@ name="demo1_control" id="demo1_control" value="on" - checked - /> + checked />
@@ -181,8 +180,7 @@ name="demo2_control" id="demo2_control" value="on" - checked - /> + checked />
diff --git a/font-features/styles.css b/font-features/styles.css index 11945fee..f46d5bc4 100644 --- a/font-features/styles.css +++ b/font-features/styles.css @@ -1,10 +1,10 @@ /* Some default styling for cookbook examples */ /* -rgb(53,43,34) -rgb(75,70,74) -rgb(95,97,110) -rgb(137,151,188) -rgb(160,178,226) +rgb(53 43 34) +rgb(75 70 74) +rgb(95 97 110) +rgb(137 151 188) +rgb(160 178 226) */ body { background-color: #fff; diff --git a/grid/docs/autoplacement.html b/grid/docs/autoplacement.html index 8ae6ee09..eb60ecd9 100644 --- a/grid/docs/autoplacement.html +++ b/grid/docs/autoplacement.html @@ -65,7 +65,8 @@ .wrapper li.landscape { grid-column-end: span 2; -} +} +} +} +} +} +} +} +} +} +} +} +} +} +} + box-shadow: 5px 5px 10px 2px rgb(0 0 0 / .8); +} +} +} +} +} +} +} +} diff --git a/howto/transition-button.html b/howto/transition-button.html index 929d3978..acd80a97 100644 --- a/howto/transition-button.html +++ b/howto/transition-button.html @@ -69,7 +69,8 @@ .fade:active { background-color: black; transition: none; -} +} +} +} +} +} - - - -
- -
- - - +} + + + +
+ +
+ + diff --git a/learn/backgrounds-borders/borders.html b/learn/backgrounds-borders/borders.html index 314439cf..53e1a9d1 100644 --- a/learn/backgrounds-borders/borders.html +++ b/learn/backgrounds-borders/borders.html @@ -1,45 +1,44 @@ + + + Backgrounds and Borders: border + + - .box { - width: 500px; - padding: 0.5em; - } - + + - h2 { - border-top: 2px dotted rebeccapurple; - border-bottom: 1em double rgb(24 163 78); - } - - + +
+
+

Borders

+

Try changing the borders.

+
+
- -
-
-

Borders

-

Try changing the borders.

-
-
- - +} - - -
- -
- - + +
+ +
+ + diff --git a/learn/backgrounds-borders/color.html b/learn/backgrounds-borders/color.html index bdbe199a..5b9bc9dd 100644 --- a/learn/backgrounds-borders/color.html +++ b/learn/backgrounds-borders/color.html @@ -1,46 +1,45 @@ + + + Backgrounds and Borders: background-color + + - .box { - width: 500px; - padding: 0.5em; - } - + + - span { - background-color: rgb(255 255 255 / 50%); - } - - + +
+
+

Background Colors

+

Try changing the background colors.

+
+
- -
-
-

Background Colors

-

Try changing the background colors.

-
-
- - +} - - -
- -
- - + +
+ +
+ + diff --git a/learn/backgrounds-borders/corners.html b/learn/backgrounds-borders/corners.html index a448dd8f..9fb32312 100644 --- a/learn/backgrounds-borders/corners.html +++ b/learn/backgrounds-borders/corners.html @@ -36,7 +36,8 @@

Borders

border: 10px solid rebeccapurple; border-radius: 1em; border-top-right-radius: 10% 30%; -} +} +} - - -
- -
- - + +
+ +
+ + diff --git a/learn/backgrounds-borders/mix-blend-mode.html b/learn/backgrounds-borders/mix-blend-mode.html index 1883c8a2..8bf90b50 100644 --- a/learn/backgrounds-borders/mix-blend-mode.html +++ b/learn/backgrounds-borders/mix-blend-mode.html @@ -78,7 +78,8 @@ .multiply-mix { mix-blend-mode: multiply; -} +} +} +} +} +} + + + Box Model: Borders + + - .box { - padding: 20px; - background-color: lightgray; - } - + + - .box { - border: 1px solid #333333; - border-top-style: dotted; - border-right-width: 20px; - border-bottom-color: hotpink; - } - - + +
+
+
Change my borders.
+
+
- -
-
-
Change my borders.
-
-
- - +} - - -
- -
- - + +
+ +
+ + diff --git a/learn/box-model/box-models.html b/learn/box-model/box-models.html index 4ccf23ef..d026bfc2 100644 --- a/learn/box-model/box-models.html +++ b/learn/box-model/box-models.html @@ -40,7 +40,8 @@ .alternate { box-sizing: border-box; -} +} +} - - -
- -
- - + +
+ +
+ + diff --git a/learn/box-model/margin-collapse.html b/learn/box-model/margin-collapse.html index 04383b50..c33419d8 100644 --- a/learn/box-model/margin-collapse.html +++ b/learn/box-model/margin-collapse.html @@ -43,7 +43,8 @@ .two { margin-top: 30px; -} +} +} +} +} - - -
- -
- - +

Box shadow

+
+ +
+ + diff --git a/learn/images/layout.html b/learn/images/layout.html index 7d21d56e..8eb01544 100644 --- a/learn/images/layout.html +++ b/learn/images/layout.html @@ -46,7 +46,8 @@ .wrapper > div { background-color: rebeccapurple; border-radius: .5em; -} +} +@layer site, page;

font-style: italic; font-weight: bold !important; } -} +} +} + + + + + Media Queries: a simple mobile first design, adding a grid component + + - - - -
-
- -
-
-
-
-

Veggies!

-

- Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi - welsh onion daikon amaranth tatsoi tomatillo melon azuki bean - garlic. -

- -

- Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot - courgette tatsoi pea sprouts fava bean collard greens dandelion - okra wakame tomato. Dandelion cucumber earthnut pea peanut soko - zucchini. -

- -
    -
  • -

    Card 1

    -

    - Turnip greens yarrow ricebean rutabaga endive cauliflower sea - lettuce kohlrabi amaranth water spinach avocado daikon napa - cabbage asparagus winter purslane kale. -

    -
  • -
  • -

    Card 2

    -

    - Celery potato scallion desert raisin horseradish spinach - carrot soko. -

    -
  • + + @media screen and (min-width: 40em) { + article { + display: grid; + grid-template-columns: 3fr 1fr; + column-gap: 20px; + } + + nav ul { + display: flex; + } + + nav li { + flex: 1; + } + } + + @media screen and (min-width: 70em) { + main { + display: grid; + grid-template-columns: 3fr 1fr; + column-gap: 20px; + } + + article { + margin-bottom: 0; + } + + footer { + border-top: 1px solid #ccc; + margin-top: 2em; + } + } + + + + +
    +
    + +
    +
    +
    +
    +

    Veggies!

    +

    + Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi + welsh onion daikon amaranth tatsoi tomatillo melon azuki bean + garlic. +

    + +

    + Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot + courgette tatsoi pea sprouts fava bean collard greens dandelion + okra wakame tomato. Dandelion cucumber earthnut pea peanut soko + zucchini. +

    + +
      +
    • +

      Card 1

      +

      + Turnip greens yarrow ricebean rutabaga endive cauliflower sea + lettuce kohlrabi amaranth water spinach avocado daikon napa + cabbage asparagus winter purslane kale. +

      +
    • +
    • +

      Card 2

      +

      + Celery potato scallion desert raisin horseradish spinach + carrot soko. +

      +
    • +
    • +

      Card 3

      +

      + Lotus root water spinach fennel kombu maize bamboo shoot green + bean swiss chard seakale pumpkin onion chickpea gram corn pea. +

      +
    • +
    • +

      Card 4

      +

      + Brussels sprout coriander water chestnut gourd swiss chard + wakame kohlrabi beetroot carrot watercress. +

      +
    • +
    • +

      Card 5

      +

      + Corn amaranth salsify bunya nuts nori azuki bean chickweed + potato bell pepper artichoke. +

      +
    • +
    +
    + +
    + +
    - -
- - -
- -
-

©2019

-
-
- + +
+

©2019

+
+ + diff --git a/learn/media-queries/step1.html b/learn/media-queries/step1.html index c53f46aa..59458ae6 100644 --- a/learn/media-queries/step1.html +++ b/learn/media-queries/step1.html @@ -1,144 +1,150 @@ - - - - - Media Queries: a simple mobile first design, step 1 - - - - -
-
- -
-
-
-
-

Veggies!

-

- Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi - welsh onion daikon amaranth tatsoi tomatillo melon azuki bean - garlic. -

- -

- Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot - courgette tatsoi pea sprouts fava bean collard greens dandelion - okra wakame tomato. Dandelion cucumber earthnut pea peanut soko - zucchini. -

- -

- Turnip greens yarrow ricebean rutabaga endive cauliflower sea - lettuce kohlrabi amaranth water spinach avocado daikon napa - cabbage asparagus winter purslane kale. Celery potato scallion - desert raisin horseradish spinach carrot soko. Lotus root water - spinach fennel kombu maize bamboo shoot green bean swiss chard - seakale pumpkin onion chickpea gram corn pea. Brussels sprout - coriander water chestnut gourd swiss chard wakame kohlrabi - beetroot carrot watercress. Corn amaranth salsify bunya nuts nori - azuki bean chickweed potato bell pepper artichoke. -

- -

- Nori grape silver beet broccoli kombu beet greens fava bean potato - quandong celery. Bunya nuts black-eyed pea prairie turnip leek - lentil turnip greens parsnip. Sea lettuce lettuce water chestnut - eggplant winter purslane fennel azuki bean earthnut pea sierra - leone bologi leek soko chicory celtuce parsley jícama salsify. -

-
-
- - -
- -
-

©2019

-
-
- + +
+

©2019

+
+ + diff --git a/learn/media-queries/step2.html b/learn/media-queries/step2.html index 23072652..7d52b07a 100644 --- a/learn/media-queries/step2.html +++ b/learn/media-queries/step2.html @@ -1,160 +1,166 @@ + + + + Media Queries: a simple mobile first design, step 2 + - - - -
-
- -
-
-
-
-

Veggies!

-

- Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi - welsh onion daikon amaranth tatsoi tomatillo melon azuki bean - garlic. -

- -

- Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot - courgette tatsoi pea sprouts fava bean collard greens dandelion - okra wakame tomato. Dandelion cucumber earthnut pea peanut soko - zucchini. -

- -

- Turnip greens yarrow ricebean rutabaga endive cauliflower sea - lettuce kohlrabi amaranth water spinach avocado daikon napa - cabbage asparagus winter purslane kale. Celery potato scallion - desert raisin horseradish spinach carrot soko. Lotus root water - spinach fennel kombu maize bamboo shoot green bean swiss chard - seakale pumpkin onion chickpea gram corn pea. Brussels sprout - coriander water chestnut gourd swiss chard wakame kohlrabi - beetroot carrot watercress. Corn amaranth salsify bunya nuts nori - azuki bean chickweed potato bell pepper artichoke. -

- -

- Nori grape silver beet broccoli kombu beet greens fava bean potato - quandong celery. Bunya nuts black-eyed pea prairie turnip leek - lentil turnip greens parsnip. Sea lettuce lettuce water chestnut - eggplant winter purslane fennel azuki bean earthnut pea sierra - leone bologi leek soko chicory celtuce parsley jícama salsify. -

-
-
- - -
- -
-

©2019

-
-
- + +
+

©2019

+
+ + diff --git a/learn/media-queries/step3.html b/learn/media-queries/step3.html index 67c859f9..654e351d 100644 --- a/learn/media-queries/step3.html +++ b/learn/media-queries/step3.html @@ -1,177 +1,183 @@ + + + + Media Queries: a simple mobile first design, step 3 + - - - -
-
- -
-
-
-
-

Veggies!

-

- Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi - welsh onion daikon amaranth tatsoi tomatillo melon azuki bean - garlic. -

- -

- Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot - courgette tatsoi pea sprouts fava bean collard greens dandelion - okra wakame tomato. Dandelion cucumber earthnut pea peanut soko - zucchini. -

- -

- Turnip greens yarrow ricebean rutabaga endive cauliflower sea - lettuce kohlrabi amaranth water spinach avocado daikon napa - cabbage asparagus winter purslane kale. Celery potato scallion - desert raisin horseradish spinach carrot soko. Lotus root water - spinach fennel kombu maize bamboo shoot green bean swiss chard - seakale pumpkin onion chickpea gram corn pea. Brussels sprout - coriander water chestnut gourd swiss chard wakame kohlrabi - beetroot carrot watercress. Corn amaranth salsify bunya nuts nori - azuki bean chickweed potato bell pepper artichoke. -

- -

- Nori grape silver beet broccoli kombu beet greens fava bean potato - quandong celery. Bunya nuts black-eyed pea prairie turnip leek - lentil turnip greens parsnip. Sea lettuce lettuce water chestnut - eggplant winter purslane fennel azuki bean earthnut pea sierra - leone bologi leek soko chicory celtuce parsley jícama salsify. -

-
-
- - -
- -
-

©2019

-
-
- + +
+

©2019

+
+ + diff --git a/learn/overflow/auto.html b/learn/overflow/auto.html index 0133ba70..7caf0c78 100644 --- a/learn/overflow/auto.html +++ b/learn/overflow/auto.html @@ -32,7 +32,8 @@ width: 350px; height: 100px; overflow: auto; -} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} +} - - -
- -
- - + +
+ +
+ + diff --git a/learn/tasks/float/marking.md b/learn/tasks/float/marking.md index 878c004e..d60c0c32 100644 --- a/learn/tasks/float/marking.md +++ b/learn/tasks/float/marking.md @@ -6,7 +6,7 @@ The aim of the tasks are to demonstrate an understanding of the properties cover This task covers understanding of the basic float property, and the values `left` and `right`. The following should be all they need to do. -``` +```css .float1 { float: left; } @@ -14,14 +14,13 @@ This task covers understanding of the basic float property, and the values `left .float2 { float: right; } - ``` ## Task 2 In task 2 we check that the student understands how to clear an element from a floated item. They need to flow the item left, then add `clear: left` to the class for the second paragraph. -``` +```css .float { float: left; } @@ -33,9 +32,9 @@ In task 2 we check that the student understands how to clear an element from a f ## Task 3 -In the final task the student is asked to use the most up to date method of clearing the box underneath the floated item. Therefore they should add `display: flow-root` to the class for `.box`. Other methods might be to use `overflow` or a clearfix hack, however the learning materials detail the `flow-root` method as the modern way to achieve this. +In the final task the student is asked to use the most up-to-date method of clearing the box underneath the floated item. Therefore they should add `display: flow-root` to the class for `.box`. Other methods might be to use `overflow` or a clearfix hack, however the learning materials detail the `flow-root` method as the modern way to achieve this. -``` +```css .box { display: flow-root; } diff --git a/learn/tasks/grid/grid2-download.html b/learn/tasks/grid/grid2-download.html index 4ce1e221..f84b1ccd 100644 --- a/learn/tasks/grid/grid2-download.html +++ b/learn/tasks/grid/grid2-download.html @@ -1,58 +1,56 @@ - - - - - - Grid: task 2 - - - - - - - -
-
One
-
Two
-
- - + + + + + Grid: task 2 + + + + + + + +
+
One
+
Two
+
+ diff --git a/learn/tasks/grid/grid2.html b/learn/tasks/grid/grid2.html index 33a7f143..9f0fd4c4 100644 --- a/learn/tasks/grid/grid2.html +++ b/learn/tasks/grid/grid2.html @@ -1,56 +1,57 @@ - - - - - - Grid: task 2 - - - - - - - - - -
-
-
One
-
Two
-
-
- - + - - -
- -
- - + +
+ +
+ + diff --git a/learn/tasks/grid/marking.md b/learn/tasks/grid/marking.md index b4b229de..9ad0fc71 100644 --- a/learn/tasks/grid/marking.md +++ b/learn/tasks/grid/marking.md @@ -4,7 +4,7 @@ The aim of this task is to show understanding of the basics of creating a grid with a gap between the items. -``` +```css .grid { display: grid; grid-template-columns: 1fr 1fr 1fr; @@ -18,15 +18,15 @@ The aim of this task is to demonstrate an understanding of placing an item betwe I have used the shorthands below, however it would be correct for the student to use the longhand `grid-row-start` for example. -``` +```css .item1 { - grid-column: 1 / 4; - grid-row: 1 / 3; + grid-column: 1 / 4; + grid-row: 1 / 3; } .item2 { - grid-column: 2 / 5; - grid-row: 2 / 4; + grid-column: 2 / 5; + grid-row: 2 / 4; } ``` @@ -34,32 +34,33 @@ I have used the shorthands below, however it would be correct for the student to This extra question requires a little bit of research. One way of achieving this would be to use `order`, which we've encountered in the flexbox tutorial. -``` +```css .item1 { - order: 1; + order: 1; } ``` Another valid solution is to use `z-index`: -``` +```css .item1 { - z-index: 1; + z-index: 1; } ``` ## Grid Layout Three -This task requires that the student gives each part of the layout a name using the `grid-area` property, then uses `grid-template-areas` to lay them out. Possible areas of confusion would be not realising they should place a `.` to leave a cell empty, or that they should repeat the name to cause an element to span more than one track. +This task requires that the student gives each part of the layout a name using the `grid-area` property, then uses `grid-template-areas` to lay them out. Possible areas of confusion would be not realizing they should place a `.` to leave a cell empty, or that they should repeat the name to cause an element to span more than one track. -``` +```css .grid { display: grid; gap: 20px; grid-template-columns: 1fr 2fr; - grid-template-areas: "aa aa" - "bb cc" - ". dd"; + grid-template-areas: + "aa aa" + "bb cc" + ". dd"; } .one { @@ -89,7 +90,7 @@ The ul for the tags needs to be a flex container as tags are not lined up in col The student may try to use flexbox on the container and restrict the cards with percentage values. They may also try to make the items into a grid layout in which case you should point out that the items are not aligned in two dimensions so flexbox isn't the best choice. -``` +```css .container { display: grid; gap: 10px; diff --git a/learn/tasks/images/form.html b/learn/tasks/images/form.html index 204e2685..2791be11 100644 --- a/learn/tasks/images/form.html +++ b/learn/tasks/images/form.html @@ -34,7 +34,8 @@ .myform { border: 2px solid #000; padding: 5px; -} +} +} +} +} +} +} - - -
- -
- - + +
+ +
+ + diff --git a/learn/tasks/position/position2-download.html b/learn/tasks/position/position2-download.html index 6f2370d1..6afdc105 100644 --- a/learn/tasks/position/position2-download.html +++ b/learn/tasks/position/position2-download.html @@ -1,79 +1,77 @@ + + + Position: Task 2 + + - .content { - padding: 1em; - margin-left: 160px; - } - - - - -
- -
-

- Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi welsh - onion daikon amaranth tatsoi tomatillo melon azuki bean garlic. -

-

- Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot - courgette tatsoi pea sprouts fava bean collard greens dandelion okra - wakame tomato. Dandelion cucumber earthnut pea peanut soko zucchini. -

-

- Turnip greens yarrow ricebean rutabaga endive cauliflower sea lettuce - kohlrabi amaranth water spinach avocado daikon napa cabbage asparagus - winter purslane kale. Celery potato scallion desert raisin horseradish - spinach carrot soko. Lotus root water spinach fennel kombu maize - bamboo shoot green bean swiss chard seakale pumpkin onion chickpea - gram corn pea. Brussels sprout coriander water chestnut gourd swiss - chard wakame kohlrabi beetroot carrot watercress. Corn amaranth - salsify bunya nuts nori azuki bean chickweed potato bell pepper - artichoke. -

+ +
+ +
+

+ Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi welsh + onion daikon amaranth tatsoi tomatillo melon azuki bean garlic. +

+

+ Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot + courgette tatsoi pea sprouts fava bean collard greens dandelion okra + wakame tomato. Dandelion cucumber earthnut pea peanut soko zucchini. +

+

+ Turnip greens yarrow ricebean rutabaga endive cauliflower sea lettuce + kohlrabi amaranth water spinach avocado daikon napa cabbage asparagus + winter purslane kale. Celery potato scallion desert raisin horseradish + spinach carrot soko. Lotus root water spinach fennel kombu maize + bamboo shoot green bean swiss chard seakale pumpkin onion chickpea + gram corn pea. Brussels sprout coriander water chestnut gourd swiss + chard wakame kohlrabi beetroot carrot watercress. Corn amaranth + salsify bunya nuts nori azuki bean chickweed potato bell pepper + artichoke. +

+
-
- - + diff --git a/learn/tasks/position/position2.html b/learn/tasks/position/position2.html index b323ef28..2cbef90e 100644 --- a/learn/tasks/position/position2.html +++ b/learn/tasks/position/position2.html @@ -1,88 +1,90 @@ + + + Position: Task 2 + + - .content { - padding: 1em; - margin-left: 160px; - } - + + - .sidebar {} - - - - -
-
- -
-

- Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi - welsh onion daikon amaranth tatsoi tomatillo melon azuki bean - garlic. -

-

- Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot - courgette tatsoi pea sprouts fava bean collard greens dandelion okra - wakame tomato. Dandelion cucumber earthnut pea peanut soko zucchini. -

-

- Turnip greens yarrow ricebean rutabaga endive cauliflower sea - lettuce kohlrabi amaranth water spinach avocado daikon napa cabbage - asparagus winter purslane kale. Celery potato scallion desert raisin - horseradish spinach carrot soko. Lotus root water spinach fennel - kombu maize bamboo shoot green bean swiss chard seakale pumpkin - onion chickpea gram corn pea. Brussels sprout coriander water - chestnut gourd swiss chard wakame kohlrabi beetroot carrot - watercress. Corn amaranth salsify bunya nuts nori azuki bean - chickweed potato bell pepper artichoke. -

+ +
+
+ +
+

+ Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi + welsh onion daikon amaranth tatsoi tomatillo melon azuki bean + garlic. +

+

+ Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot + courgette tatsoi pea sprouts fava bean collard greens dandelion okra + wakame tomato. Dandelion cucumber earthnut pea peanut soko zucchini. +

+

+ Turnip greens yarrow ricebean rutabaga endive cauliflower sea + lettuce kohlrabi amaranth water spinach avocado daikon napa cabbage + asparagus winter purslane kale. Celery potato scallion desert raisin + horseradish spinach carrot soko. Lotus root water spinach fennel + kombu maize bamboo shoot green bean swiss chard seakale pumpkin + onion chickpea gram corn pea. Brussels sprout coriander water + chestnut gourd swiss chard wakame kohlrabi beetroot carrot + watercress. Corn amaranth salsify bunya nuts nori azuki bean + chickweed potato bell pepper artichoke. +

+
-
-
+ - +} - +
-
- -
- - - - \ No newline at end of file +
+ +
+ + + diff --git a/learn/tasks/rwd/marking.md b/learn/tasks/rwd/marking.md index 1a445e5d..dbd59bfc 100644 --- a/learn/tasks/rwd/marking.md +++ b/learn/tasks/rwd/marking.md @@ -4,9 +4,9 @@ The aim of the tasks are to demonstrate an understanding of the properties cover This task not only asks the student to implement media queries correctly, they will also need to use the things they have learned about CSS Layout. -There is no one right answer however the following code demontrates how simply the task can be achieved, and this is really what we are looking for as it is easy to complicate this task. Using modern layout methods of flexbox and grid means that we only need one media query. +There is no one right answer however the following code demonstrates how simply the task can be achieved, and this is really what we are looking for as it is easy to complicate this task. Using modern layout methods of flexbox and grid means that we only need one media query. -``` +```css @media screen and (min-width: 60em) { header { display: flex; /* separate the nav and title */ @@ -27,10 +27,10 @@ There is no one right answer however the following code demontrates how simply t } main { - display: grid; /* a two column grid layout for the main content and sidebar */ - grid-template-columns: 3fr 1fr; - gap: 20px; - margin-top: 20px; + display: grid; /* a two column grid layout for the main content and sidebar */ + grid-template-columns: 3fr 1fr; + gap: 20px; + margin-top: 20px; } .cards { diff --git a/learn/tasks/selectors/attribute-links-download.html b/learn/tasks/selectors/attribute-links-download.html index 9a48d763..330b57fd 100644 --- a/learn/tasks/selectors/attribute-links-download.html +++ b/learn/tasks/selectors/attribute-links-download.html @@ -45,7 +45,7 @@ Link 1
  • - Link 2 + Link 2
  • Link 3 diff --git a/learn/tasks/selectors/attribute-links.html b/learn/tasks/selectors/attribute-links.html index 3af2286b..47badcab 100644 --- a/learn/tasks/selectors/attribute-links.html +++ b/learn/tasks/selectors/attribute-links.html @@ -34,7 +34,7 @@