diff --git a/.eleventy.js b/.eleventy.js index 01e1f71ef..62e738499 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -4,13 +4,14 @@ const syntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight"); const pluginRss = require("@11ty/eleventy-plugin-rss"); module.exports = function(eleventyConfig) { - eleventyConfig.setTemplateFormats(["md", "njk", "html", "css", "pdf"]); + eleventyConfig.setTemplateFormats(["md", "njk", "html", "css", "pdf", "liquid"]); eleventyConfig.addPassthroughCopy("CNAME"); eleventyConfig.addPassthroughCopy({"assets/img": "img"}); eleventyConfig.addPassthroughCopy({"assets/svg": "svg"}); eleventyConfig.addPassthroughCopy({"node_modules/reveal.js/dist": "reveal.js/dist"}); eleventyConfig.addPassthroughCopy({"node_modules/reveal.js/plugin": "reveal.js/plugin"}); + eleventyConfig.addPassthroughCopy({"assets/reveal.js-theme": "reveal.js/dist/theme"}); eleventyConfig.addPassthroughCopy({"slides": "slides"}); eleventyConfig.addShortcode("currentYear", () => `${new Date().getFullYear()}`); diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e1dfdda9f..c1229fdd6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,10 +25,6 @@ jobs: npm- - name: Install Node modules run: npm install - - name: Sass - run: npm run sass - - name: Sass Reveal.js - run: npm run sass-revealjs - name: Eleventy run: | npx eleventy --output='_site/' --pathprefix='/' diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8f1146be6..0a417d902 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -30,10 +30,6 @@ jobs: npm- - name: Install Node modules run: npm install - - name: Sass - run: npm run sass - - name: Sass Reveal.js - run: npm run sass-revealjs - name: Eleventy run: | npx eleventy \ diff --git a/.gitignore b/.gitignore index f4c30965e..dcda819c0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ _site/ # npm assets node_modules/ + +# macOS +.DS_Store diff --git a/_data/site.json b/_data/site.json index 844b5666c..0c3ca6210 100644 --- a/_data/site.json +++ b/_data/site.json @@ -1,8 +1,9 @@ { - "tagline": "Servo, the embeddable, independent, memory-safe, modular, parallel web rendering engine", + "tagline": "Servo aims to empower developers with a lightweight, high-performance alternative for embedding web technologies in applications.", "author": "The Servo Project Developers", "favicon": "/img/servo-symbol-color-no-container.png", "logo": "/img/servo-color-positive.png", - "logoNegative": "/img/servo-color-negative-no-container.png", + "logoPositive": "/img/servo-color-positive-no-container.png", + "logoMark": "/img/servo-color.png", "logoLFEurope": "/img/lf-europe-logo.png" } diff --git a/_data/social.json b/_data/social.json index 96b133e88..afc48cbc7 100644 --- a/_data/social.json +++ b/_data/social.json @@ -2,6 +2,5 @@ { "title": "GitHub", "color": "github-color", "url": "https://github.com/servo/servo", "icon": "fab fa-github" }, { "title": "Mastodon", "color": "mastodon-color", "url": "https://floss.social/@servo", "icon": "fab fa-mastodon" }, { "title": "Bluesky", "color": "bluesky-color", "url": "https://bsky.app/profile/servo.org", "icon": "fab fa-bluesky" }, - { "title": "Twitter", "color": "twitter-color", "url": "https://twitter.com/ServoDev", "icon": "fab fa-twitter" }, { "title": "LinkedIn", "color": "linkedin-color", "url": "https://www.linkedin.com/company/servo-project/", "icon": "fab fa-linkedin" } ] diff --git a/_includes/contact.html b/_includes/contact.html new file mode 100644 index 000000000..86ff9dd83 --- /dev/null +++ b/_includes/contact.html @@ -0,0 +1,18 @@ +