Skip to content

Commit

Permalink
Merge branch 'main' into oddnews-sign-up
Browse files Browse the repository at this point in the history
  • Loading branch information
sanajaved7 committed May 29, 2023
2 parents c296d09 + f842605 commit 1a8c1bd
Show file tree
Hide file tree
Showing 7 changed files with 608 additions and 550 deletions.
2 changes: 1 addition & 1 deletion content/_data/webmentions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lastFetched": "2023-05-08T08:05:15.940Z",
"lastFetched": "2023-05-29T08:05:39.017Z",
"children": [
{
"type": "entry",
Expand Down
4 changes: 2 additions & 2 deletions content/blog/2014/jqcon.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ To use the more substantive features (e.g. template strings, default
parameters, modules), compile ES6 code into ES5 using Google's [Traceur]
(probably with [gulp-traceur] or [grunt-traceur]).

HT: [John K. Paul] for his [talk][1] encouraging devs to use ES6 now.
HT: [John K. Paul] for his [talk][talk] encouraging devs to use ES6 now.

[ecmascript 6]: https://262.ecma-international.org/6.0/
[helpful summary]: https://github.com/lukehoban/es6features#readme
Expand All @@ -130,7 +130,7 @@ HT: [John K. Paul] for his [talk][1] encouraging devs to use ES6 now.
[gulp-traceur]: https://github.com/sindresorhus/gulp-traceur
[grunt-traceur]: https://github.com/aaronfrost/grunt-traceur
[john k. paul]: https://twitter.com/johnkpaul
[1]: https://twitter.com/johnkpaul
[talk]: https://twitter.com/johnkpaul

## Throw More Errors

Expand Down
4 changes: 2 additions & 2 deletions content/blog/2017/get-started-designing.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ testing contrast.

{{ embed.img('blog/2017/get-started-designing/xd.jpg', 'Adobe Experience Design') }}

My new favorite UX design tool, [Adobe Experience Design][1], is still
My new favorite UX design tool, [Adobe Experience Design], is still
in beta. XD has a built-in tutorial that’s fun, beautiful, and takes
less than an hour to complete. I use XD prototypes to flesh out my
sketches, and to play with colors, typography, and layout. XD is also an
Expand All @@ -120,5 +120,5 @@ excellent tool for working out how users will flow through the content.
What design tools and tutorials have you found most useful? I’d love to
hear your recommendations. Join the conversation on [Twitter].

[1]: https://www.adobe.com/products/xd.html
[Adobe Experience Design]: https://www.adobe.com/products/xd.html
[Twitter]: https://twitter.com/oddbird
9 changes: 4 additions & 5 deletions content/blog/2017/serializing-things.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ cost. But in any case, it's worth keeping in mind.
## What If I Need Something That's Not a Model?

Perhaps you have business-logic class instances which are never stored
in the database[1]. If you can't, won't, or don't want to use the DB as
in the database[^1]. If you can't, won't, or don't want to use the DB as
a persistent store for your data – which you then inflate into a full
object – there are other ways to pass objects through the task-broker
bottleneck.
Expand Down Expand Up @@ -246,10 +246,9 @@ deserialized_objects = deserialize('json', json_version)
# deserialized_objects[i].object
```

[1] You are keeping in mind that your *data model* and your Django
*Models* aren't the same, right? Django models are persistence-layer
mappings that you can bolt some additional logic to. Your data model may
be much more!
[^1]: You are keeping in mind that your *data model* and your Django *Models*
aren't the same, right? Django models are persistence-layer mappings that you
can bolt some additional logic to. Your data model may be much more!

[attrs]: https://attrs.readthedocs.io/en/stable/
[Twitter]: https://twitter.com/oddbird
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
"@11ty/eleventy-img": "^3.1.0",
"@11ty/eleventy-plugin-rss": "^1.2.0",
"@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
"@babel/core": "^7.21.8",
"@babel/preset-env": "^7.21.5",
"@babel/core": "^7.22.1",
"@babel/preset-env": "^7.22.2",
"@netlify/plugin-a11y": "^1.0.0-beta.1",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-commonjs": "^24.1.0",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-node-resolve": "^15.0.2",
"@rollup/plugin-terser": "^0.4.1",
"@rollup/plugin-terser": "^0.4.3",
"@tommoor/remove-markdown": "^0.3.2",
"@typescript-eslint/parser": "^5.59.2",
"@typescript-eslint/parser": "^5.59.7",
"autoprefixer": "^10.4.14",
"babel-jest": "^29.5.0",
"chalk": "^4.1.2",
Expand All @@ -76,7 +76,7 @@
"date-fns-tz": "^2.0.0",
"dotenv": "^16.0.3",
"doxray": "^0.10.1",
"eslint": "^8.40.0",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-node": "^0.3.7",
"eslint-import-resolver-typescript": "^3.5.5",
Expand All @@ -97,17 +97,17 @@
"netlify-plugin-11ty": "^1.3.0",
"node-fetch": "^2.6.7",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.23",
"postcss": "^8.4.24",
"prettier": "^2.8.8",
"rimraf": "^3.0.2",
"rollup": "^3.21.5",
"rollup": "^3.23.0",
"sanitize-html": "^2.10.0",
"sass": "^1.62.1",
"sassdoc": "^2.7.4",
"sassdoc-theme-herman": "^5.0.1",
"slugify": "^1.6.6",
"striptags": "^3.2.0",
"stylelint": "^15.6.1",
"stylelint": "^15.6.2",
"stylelint-config-standard-scss": "^9.0.0",
"truncate-html": "^1.0.4",
"typescript": "^5.0.4",
Expand Down
1 change: 1 addition & 0 deletions src/scss/patterns/_offset-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ $break: 'wide-break';

img {
flex: 1 0 auto;
height: 100%;
object-fit: cover;
}
}
Loading

0 comments on commit 1a8c1bd

Please sign in to comment.