Content/fix header structure #301
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
# Conflicts: # src/_includes/layouts/members-home.liquid
edwinm
approved these changes
Jan 20, 2024
anneke
added a commit
that referenced
this pull request
Jan 20, 2024
commit 9c9e759 Merge: 420267c 722bdc9 Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 16:08:02 2024 +0100 Merge branch 'check-redirects' into main-copy Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> # Conflicts: # _redirects # src/en/activities/2020/2020-12-02.md # src/en/activities/2021/2021-01-01.md # src/en/activities/2021/2021-01-02.md # src/en/conference/index.md # src/en/jobs/post-job-opening/index.md # src/en/join-us/index.md # src/en/join-us/terms-and-conditions/index.md # src/en/members/anneke-sinnema.md # src/en/organisation/board/index.md # src/en/organisation/committees/index.md # src/en/organisation/contact/index.md # src/en/organisation/history/index.md # src/en/organisation/history/names/index.md # src/en/organisation/index.md # src/en/organisation/members-meeting/index.md # src/en/organisation/statutes/index.md # src/nl/activiteiten/2007/fabrique.md # src/nl/activiteiten/2007/info-nl.md # src/nl/activiteiten/2007/lost-boys.md # src/nl/activiteiten/2007/mangrove.md # src/nl/activiteiten/2008/concept7.md # src/nl/activiteiten/2008/everyweb-solutions.md # src/nl/activiteiten/2008/mangrove.md # src/nl/activiteiten/2009/mediact.md # src/nl/activiteiten/2009/mirabeau.md # src/nl/activiteiten/2011/80beans.md # src/nl/activiteiten/2011/lessius.md # src/nl/activiteiten/2014/nucleus.md # src/nl/activiteiten/2014/trifork.md # src/nl/activiteiten/2015/maastricht.md # src/nl/activiteiten/2015/nieuwjaarsborrel-2016.md # src/nl/activiteiten/2016/schiphol.md # src/nl/activiteiten/2017/teamleader.md # src/nl/activiteiten/2019/meetup-bij-we-are-you.md # src/nl/blog/2011/02/bijeenkomst-maart.md # src/nl/blog/2011/10/bijeenkomst-lessius.md # src/nl/blog/2011/12/3d-graphics.md # src/nl/blog/2011/12/acteurs-schilders-en-technici.md # src/nl/blog/2011/12/clients-from-heaven.md # src/nl/blog/2011/12/closure-tools.md # src/nl/blog/2011/12/deferred-en-promise-in-jquery.md # src/nl/blog/2011/12/dr-strangescope.md # src/nl/blog/2011/12/een-tik-op-de-neus.md # src/nl/blog/2011/12/geharnast-javascript.md # src/nl/blog/2011/12/het-is-al-goud-wiens-cursor-blinkt.md # src/nl/blog/2011/12/html5-video-een-overzicht.md # src/nl/blog/2011/12/javascript-pret-met-alle-karakters-in-een-string.md # src/nl/blog/2011/12/kijk-mama-zonder-afbeeldingen-grafische-elementen-maken-met-css.md # src/nl/blog/2011/12/learn-you-a-flexbox-for-great-good.md # src/nl/blog/2011/12/patronen-voor-de-groei.md # src/nl/blog/2011/12/responsive-images-een-experiment.md # src/nl/blog/2011/12/scalable-vector-graphics-en-responsive-web.md # src/nl/blog/2011/12/waarom-een-slicer-een-front-end-developer-is-geworden.md # src/nl/blog/2011/12/waarom-standaarden-essentieel-zijn.md # src/nl/blog/2011/12/webrichtlijnen-2-de-nieuwe-standaard.md # src/nl/blog/2011/12/welkom-op-het-audiologische-internet.md # src/nl/blog/2014/11/nieuwjaarsborrel-2015.md # src/nl/blog/2014/12/hallo-frontenders.md # src/nl/blog/2015/01/css-resets.md # src/nl/blog/2015/05/ontwikkelen-met-progressive-enhancement.md # src/nl/blog/2018/12/begin-met-regular-expressions.md # src/nl/blog/2018/12/beginnen-met-webbluetooth.md # src/nl/blog/2018/12/code-in-style.md # src/nl/blog/2018/12/css-statistieken-om-je-codebase-te-verbeteren.md # src/nl/blog/2018/12/een-api-schrijven-als-een-front-end-developer.md # src/nl/blog/2018/12/fuck-the-system-be-nice.md # src/nl/blog/2018/12/hoe-een-blinde-klant-zich-heel-even-miljonair-waande.md # src/nl/blog/2018/12/hoe-test-ik-de-toegankelijkheid-van-mijn-website.md # src/nl/blog/2018/12/ik-doe-ook-front-end.md # src/nl/blog/2018/12/in-evenwicht.md # src/nl/blog/2018/12/inclusive-design-is-design.md # src/nl/blog/2018/12/lettertypes-op-het-web-wat-kan-ik-ermee.md # src/nl/blog/2018/12/min-of-meer-toegankelijk.md # src/nl/blog/2018/12/mooi-rood-is-niet-lelijk.md # src/nl/blog/2018/12/over-websites-en-lekkende-kranen.md # src/nl/blog/2018/12/prettier-de-eigenzinnige-code-opmaker.md # src/nl/blog/2018/12/pump-up-the-jam.md # src/nl/blog/2018/12/schrijf-eens-iets-anders-dan-code.md # src/nl/blog/2018/12/twaalf-geschenken-van-fronteers.md # src/nl/blog/2018/12/wat-ik-leerde-van-twaalf-uur-tekenen-tijdens-fronteers.md # src/nl/blog/2018/12/webdeveloper-worden-zonder-dure-opleiding.md # src/nl/blog/2018/12/word-een-front-end-developer.md # src/nl/blog/2019/12/8-rare-tips-waarvan-toegankelijkheidsexperts-niet-willen-dat-u-ze-weet.md # src/nl/blog/2019/12/cliches-op-het-web.md # src/nl/blog/2019/12/css-custom-properties-cascading-variables-en-het-einde-van-de-stijl.md # src/nl/blog/2019/12/cybersecurity-4-tips-voor-developers.md # src/nl/blog/2019/12/een-eigen-kalendercomponent.md # src/nl/blog/2019/12/goeie-docs-happy-devs.md # src/nl/blog/2019/12/het-belang-van-een-style-guide.md # src/nl/blog/2019/12/hoe-ik-zelf-een-browser-schreef.md # src/nl/blog/2019/12/maak-deze-kerst-een-vriend-blij-met-lekker-makkelijke-collapsibles.md # src/nl/blog/2019/12/toegankelijkheid-begint-bij-het-eerste-design.md # src/nl/blog/2019/12/waarom-een-hobbyproject-niet-belangrijk-is.md # src/nl/blog/2022/12/valkuilen-van-toegankelijke-componenten.md # src/nl/blog/2022/12/wees-niet-slim-en-gebruik-webstandaarden.md # src/nl/congres/index.md # src/nl/leden/anneke-sinnema.md # src/nl/vereniging/bestuur/index.md # src/nl/vereniging/bestuur/notulen/02-12-2014.md # src/nl/vereniging/bestuur/notulen/03-11-2011.md # src/nl/vereniging/bestuur/notulen/07-12-2011.md # src/nl/vereniging/bestuur/notulen/10-09-2013.md # src/nl/vereniging/bestuur/notulen/11-12-2008.md # src/nl/vereniging/bestuur/notulen/12-02-2013.md # src/nl/vereniging/bestuur/notulen/15-01-2008.md # src/nl/vereniging/bestuur/notulen/16-07-2013.md # src/nl/vereniging/bestuur/notulen/18-09-2007.md # src/nl/vereniging/bestuur/notulen/22-11-2012.md # src/nl/vereniging/bestuur/notulen/23-04-2013.md # src/nl/vereniging/bestuur/notulen/23-10-2012.md # src/nl/vereniging/bestuur/notulen/24-11-2010.md # src/nl/vereniging/bestuur/notulen/25-11-2013.md # src/nl/vereniging/bestuur/notulen/notulen-alv-19-oktober-2018.md # src/nl/vereniging/bestuur/notulen/notulen-alv-25-oktober-2021.md # src/nl/vereniging/bestuur/notulen/notulen-alv-30-november-2017.md # src/nl/vereniging/bestuur/notulen/notulen-bestuursvergadering-10-oktober-2018.md # src/nl/vereniging/bestuur/notulen/notulen-bestuursvergadering-16-januari-2020.md # src/nl/vereniging/bestuur/notulen/notulen-bestuursvergadering-2-juli-2018.md # src/nl/vereniging/bestuur/notulen/notulen-bestuursvergadering-24-mei-2023.md # src/nl/vereniging/commissies/index.md # src/nl/vereniging/commissies/online-community/index.md # src/nl/vereniging/contact/index.md # src/nl/vereniging/geschiedenis/index.md # src/nl/vereniging/index.md # src/nl/vereniging/statuten/index.md # src/nl/werk-en-freelance/vacature-plaatsen/index.md # src/nl/word-lid/community/index.md commit 420267c Merge: 9249bc2 d20c519 Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 13:56:19 2024 +0100 Merge pull request #309 from fronteers/fix/inmprove-metadata Fix/inmprove metadata commit 9249bc2 Merge: 99c8f7f 40fa8f2 Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 13:56:05 2024 +0100 Merge pull request #312 from maniflames/remove-junk-comment Remove junk comment commit 40fa8f2 Author: Imani Dap <imani.dap@gmail.com> Date: Sat Jan 20 13:52:15 2024 +0100 Remove junk comment Sorry I forgot to clean up some of my code after fixing a a11y related issue commit 99c8f7f Merge: 6b78c4f 18a78d0 Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 13:33:44 2024 +0100 Merge pull request #305 from fronteers/fix/198-blog-category-badges-by-language [#198] Fixes i18n bug with language badges on blog overview page commit 6b78c4f Merge: cc43618 f3c1a8d Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 13:22:27 2024 +0100 Merge pull request #310 from maniflames/fix-en-freelance-navigation Fix en navigation to the freelancers page commit 18a78d0 Merge: 1579733 7c85bfa Author: Christian Schaefer <schaepp@gmx.de> Date: Sat Jan 20 13:09:40 2024 +0100 Merge remote-tracking branch 'origin/fix/198-blog-category-badges-by-language' into fix/198-blog-category-badges-by-language # Conflicts: # .eleventy.js commit 1579733 Author: Christian Schaefer <schaepp@gmx.de> Date: Sat Jan 20 13:08:35 2024 +0100 [#198] Fixes bug that each language's blog page would list categories from all posts from all languages, not just the ones used in its own language commit f3c1a8d Author: Imani Dap <imani.dap@gmail.com> Date: Sat Jan 20 13:06:41 2024 +0100 Fix en navigation to the freelancers page commit 5ec7c85 Author: Christian Schaefer <schaepp@gmx.de> Date: Sat Jan 20 12:09:13 2024 +0100 [#198] Fixes bug that each language's blog page would list categories from all posts from all languages, not just the ones used in its own language commit d20c519 Merge: 45c273f cc43618 Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:57:25 2024 +0100 Merge branch 'main' into fix/inmprove-metadata commit 45c273f Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:53:54 2024 +0100 Move feeds in own folder, add to metadata, small improvements commit cc43618 Merge: 04ba8ed 9ca6049 Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:49:41 2024 +0100 Merge pull request #308 from fronteers/check-redirects Try redirect that just redirects all pages to /nl/ commit 9ca6049 Merge: b79a885 04ba8ed Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 12:34:21 2024 +0100 Merge branch 'main' into check-redirects commit 04ba8ed Merge: 528e416 326d7ec Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:30:40 2024 +0100 Merge pull request #307 from fronteers/check-redirects Check redirects commit 528e416 Merge: 79c35ad aa6f9ea Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:29:47 2024 +0100 Merge pull request #306 from maniflames/282-a11y-navigation-fixes Merge navigation open and close triggers commit 79c35ad Merge: 53001da 697fdd3 Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 12:24:37 2024 +0100 Merge pull request #304 from fronteers/feature/analytics Add Plausible analytics commit 326d7ec Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 12:23:46 2024 +0100 Try redirect that just redirects all pages to /nl/ Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit aa6f9ea Author: Imani Dap <imani.dap@gmail.com> Date: Sat Jan 20 12:18:59 2024 +0100 Merge navigation open and close triggers commit 7f9cc7c Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:18:55 2024 +0100 Improve manifest commit c652eaa Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:14:23 2024 +0100 Improve favicon metadata See https://dev.to/masakudamatsu/favicon-nightmare-how-to-maintain-sanity-3al7 commit c6b95c7 Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:12:38 2024 +0100 Add OG title and site name commit 7c85bfa Author: Christian Schaefer <schaepp@gmx.de> Date: Sat Jan 20 12:09:13 2024 +0100 [#198] Fixes bug that each language's blog page would list categories from all posts from all languages, not just the ones used in its own language commit 697fdd3 Merge: 3bb4601 53001da Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:04:32 2024 +0100 Merge branch 'main' into feature/analytics commit 53001da Merge: 3aa51b5 87eeea1 Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:03:42 2024 +0100 Merge pull request #301 from fronteers/content/fix-header-structure Content/fix header structure commit 3bb4601 Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 12:02:12 2024 +0100 Include link for plausible analytics commit 3aa51b5 Merge: 36cd8de d6c41ce Author: Edwin Martin <edwin@bitstorm.org> Date: Sat Jan 20 09:35:49 2024 +0100 Merge pull request #303 from fronteers/dependabot/npm_and_yarn/vite-4.5.2 Bump vite from 4.5.1 to 4.5.2 commit d6c41ce Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Jan 20 05:40:12 2024 +0000 Bump vite from 4.5.1 to 4.5.2 Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.1 to 4.5.2. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> commit 87eeea1 Author: banaan666 <44438203+banaan666@users.noreply.github.com> Date: Mon Oct 16 16:06:45 2023 +0200 Update members-home.liquid commit c6dab5a Author: banaan666 <44438203+banaan666@users.noreply.github.com> Date: Mon Oct 16 16:02:08 2023 +0200 Update members-home.liquid # Conflicts: # src/_includes/layouts/members-home.liquid commit 500bdc3 Author: banaan666 <44438203+banaan666@users.noreply.github.com> Date: Mon Oct 16 15:53:18 2023 +0200 Update members-list.json commit 44fc87d Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 01:47:42 2024 +0100 Fix broken links Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit 9a25fad Merge: a789681 fdb609c Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 01:39:38 2024 +0100 Merge branch '172-check-broken-links' into content/fix-header-structure commit fdb609c Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 01:33:30 2024 +0100 Stop plugin reporting redirects for now Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit 5ea6341 Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 01:31:29 2024 +0100 Fix broken links Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit 0cb47a4 Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 00:51:39 2024 +0100 Add broken links checker plugin Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit a789681 Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 00:44:58 2024 +0100 Highlight the page that is open in the nav Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit 30fa509 Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 00:05:54 2024 +0100 #282 Fix some accessibility issues Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit 62611f5 Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Sat Jan 20 00:01:36 2024 +0100 Fix rendering issues Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit abbc02d Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Fri Jan 19 23:24:49 2024 +0100 Added newest content posted on the old site Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> commit 10fbe73 Author: Anneke Sinnema <mail@annekesinnema.nl> Date: Fri Jan 19 23:19:49 2024 +0100 Fixed header structure of all content files Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl> Signed-off-by: Anneke Sinnema <mail@annekesinnema.nl>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #204 and #296 🎉
Edit: also included #172 because I knew this would cause a lot of merge conflicts