Merge pull request #735 from oddbird/no-workshop

oddbird · Nov 4, 2024 · e9a59bb · e9a59bb
2 parents 3f5aa54 + d9eb200
commit e9a59bb
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 28 deletions.
diff --git a/content/_includes/page/base.njk b/content/_includes/page/base.njk
@@ -32,16 +32,6 @@
     </div>
   {%- endif %}
 
-  {%- set show_workshop = feature_workshop or (tags and (('CSS' in tags) or ('_talk' in tags))) or oss -%}
-  {%- set fw = collections._talk | findPage('data.feature', 'workshop') -%}
-  {%- set is_workshop = page.url == fw.url -%}
-  {%- if fw and show_workshop and not is_workshop -%}
-    <section data-typeset>
-      {% import "page/workshop.macros.njk" as workshop %}
-      {{ workshop.feature(fw) }}
-    </section>
-  {%- endif -%}
-
   {% include 'page/mentions.njk' %}
 
   {% if oss or sponsors %}

diff --git a/content/index.njk b/content/index.njk
@@ -48,12 +48,6 @@ tools:
 {{ embed.logos(work, collections.all) }}
 {{ layout.section_link('View work samples', '/work/') }}
 
-{% set fw = collections._talk | findPage('data.feature', 'workshop') %}
-{% if fw %}
-  {% import "page/workshop.macros.njk" as workshop %}
-  {{ workshop.feature(fw) }}
-{% endif %}
-
 {{ post.homepage_posts(
    collections,
    class='preview'

diff --git a/content/oddnews.njk b/content/oddnews.njk
@@ -29,7 +29,7 @@ summary: |
   - **JavaScript** - Guide to Sass's new Node.js package importer
   - **App Development** - Web apps vs. PWAs vs. Native apps
   - **UX Design** - Strategies for designing more intuitive websites
-  - **Workshop** - Register for [Cascading Layouts CSS Workshop](/workshops/cascading-layouts/)
+  - **Workshop** - Details about upcoming workshops
   - **Bird of the Month** - Introduction to the oddest of birds
 {%- endset -%}
 

diff --git a/content/services/index.njk b/content/services/index.njk
@@ -1,5 +1,4 @@
 ---
-feature_workshop: true
 title: Services
 banner: OddBird's Services
 services:

diff --git a/content/talks.njk b/content/talks.njk
@@ -22,12 +22,6 @@ summary: |
 {% import 'talks.macros.njk' as talks %}
 {% import 'post.macros.njk' as post %}
 
-{% set fw = collections._talk | findPage('data.feature', 'workshop') %}
-{% if fw %}
-  {% import "page/workshop.macros.njk" as workshop %}
-  {{ workshop.feature(fw) }}
-{% endif %}
-
 {{ quotes.find(
   collections.all,
   slugs=['spot-on', 'popular-tutorial']

diff --git a/content/tools/index.njk b/content/tools/index.njk
@@ -2,7 +2,6 @@
 title: Tools
 banner: Open Source Tools
 sub: We build tools that millions of developers rely on
-cta: workshop
 action:
   text: Related posts »
   url: /tags/oddtools/

diff --git a/content/workshops/cascading-styles-deep.md b/content/workshops/cascading-styles-deep.md
@@ -4,9 +4,6 @@ title: Cascading Style Systems
 sub: A workshop on resilient & maintainable CSS
 author: miriam
 date: 2024-10-14
-action:
-  text: Register for the October workshop »
-  url: 'https://smashingconf.com/online-workshops/workshops/modern-css-miriam-suzanne'
 image:
   src: talks/mia-smashing-de.jpg
   position: top