diff --git a/.vscode/settings.json b/.vscode/settings.json index c5f3f6b9c..b84f89c38 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "interactive", + "java.compile.nullAnalysis.mode": "automatic" } \ No newline at end of file diff --git a/docusaurus.config.js b/docusaurus.config.js index 60f05c59d..ecc607e9b 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -16,7 +16,7 @@ const config = { onBrokenLinks: 'throw', onBrokenMarkdownLinks: 'warn', trailingSlash: true, - favicon: 'images/favicon.png', + favicon: 'images/logo_23/rascal_logo_64px.png', organizationName: 'usethesource', // Usually your GitHub org/user name. projectName: 'rascal-website', // Usually your repo name. deploymentBranch: 'gh-pages-v2', @@ -75,7 +75,7 @@ const config = { title: 'The Rascal Meta Programming Language', logo: { alt: 'Rascal logo', - src: 'images/rascal_large_no_text.png', + src: 'images/logo_23/rascal_beeldmerk.png', }, items: [ { diff --git a/src/css/custom.css b/src/css/custom.css index 3a6ef6825..f3261c0a2 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -6,14 +6,14 @@ /* You can override the default Infima variables here. */ :root { - --ifm-color-primary: #0c77cf; + --ifm-color-primary: #8ca4b4; --ifm-code-font-size: 95%; --docusaurus-highlighted-code-line-bg: var(--ifm-color-primary-lightest); } /* For readability concerns, you should choose a lighter palette in dark mode. */ [data-theme='dark'] { - --ifm-color-primary: #5f5f5f; + --ifm-color-primary: #768c9c; --docusaurus-highlighted-code-line-bg: var(--ifm-color-primary); } diff --git a/src/pages/index.js b/src/pages/index.js index 61087716c..896ea9d50 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -12,7 +12,7 @@ function HomepageHeader() {
-
+

{siteConfig.tagline}

diff --git a/src/pages/team.md b/src/pages/team.md index a2182ba91..706f620be 100644 --- a/src/pages/team.md +++ b/src/pages/team.md @@ -30,9 +30,11 @@ UseTheSource is a collection of open-source projects related to [metaprogramming | Title | Author | Image | | ---- | ---- | ----- | -| First logo | [Tobias Baanders](https://honingen.com/kunstenaar/tobias-baanders/) | original Rascal logo | -| Current logo [PNG](/images/rascal_logo.png) | [Kitty Molenaar](https://www.kittymolenaar.nl) | ![current Rascal logo](/images/rascal_logo.png) | -| Current logo [SVG](/images/rascal_logo.svg) | [Kitty Molenaar](https://www.kittymolenaar.nl) | ![current Rascal logo](/images/rascal_logo.svg) | +| First logo | [Tobias Baanders](https://honingen.com/kunstenaar/tobias-baanders/) | original Rascal logo | +| 2nd logo [PNG](/images/logo_22/rascal_logo.png) | [Kitty Molenaar](https://www.kittymolenaar.nl) | ![2nd Rascal logo](/images/logo_22/rascal_logo.png) | +| 2nd logo [SVG](/images/logo_22/rascal_logo.svg) | [Kitty Molenaar](https://www.kittymolenaar.nl) | ![2nd Rascal logo](/images/logo_22/rascal_logo.svg) | +| Current logo [PNG](/images/logo_23/rascal_logo.png) | [Kitty Molenaar](https://www.kittymolenaar.nl) | current Rascal logo | +| Current logo [SVG](/images/logo_23/rascal_logo.svg) | [Kitty Molenaar](https://www.kittymolenaar.nl) | current Rascal logo | # Contributors diff --git a/static/images/favicon.png b/static/images/logo_22/favicon.png similarity index 100% rename from static/images/favicon.png rename to static/images/logo_22/favicon.png diff --git a/static/images/rascal_large_no_text.png b/static/images/logo_22/rascal_large_no_text.png similarity index 100% rename from static/images/rascal_large_no_text.png rename to static/images/logo_22/rascal_large_no_text.png diff --git a/static/images/rascal_logo.png b/static/images/logo_22/rascal_logo.png similarity index 100% rename from static/images/rascal_logo.png rename to static/images/logo_22/rascal_logo.png diff --git a/static/images/rascal_logo.svg b/static/images/logo_22/rascal_logo.svg similarity index 100% rename from static/images/rascal_logo.svg rename to static/images/logo_22/rascal_logo.svg diff --git a/static/images/logo_23/rascal_beeldmerk.jpg b/static/images/logo_23/rascal_beeldmerk.jpg new file mode 100644 index 000000000..c3c9bd529 Binary files /dev/null and b/static/images/logo_23/rascal_beeldmerk.jpg differ diff --git a/static/images/logo_23/rascal_beeldmerk.png b/static/images/logo_23/rascal_beeldmerk.png new file mode 100644 index 000000000..716c58a01 Binary files /dev/null and b/static/images/logo_23/rascal_beeldmerk.png differ diff --git a/static/images/logo_23/rascal_logo.jpg b/static/images/logo_23/rascal_logo.jpg new file mode 100644 index 000000000..5c47d2aa2 Binary files /dev/null and b/static/images/logo_23/rascal_logo.jpg differ diff --git a/static/images/logo_23/rascal_logo.png b/static/images/logo_23/rascal_logo.png new file mode 100644 index 000000000..72703d742 Binary files /dev/null and b/static/images/logo_23/rascal_logo.png differ diff --git a/static/images/logo_23/rascal_logo.svg b/static/images/logo_23/rascal_logo.svg new file mode 100644 index 000000000..510cfa0e4 --- /dev/null +++ b/static/images/logo_23/rascal_logo.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/logo_23/rascal_logo_16px.png b/static/images/logo_23/rascal_logo_16px.png new file mode 100644 index 000000000..04b2d1d63 Binary files /dev/null and b/static/images/logo_23/rascal_logo_16px.png differ diff --git a/static/images/logo_23/rascal_logo_32px.png b/static/images/logo_23/rascal_logo_32px.png new file mode 100644 index 000000000..b8d16a7e1 Binary files /dev/null and b/static/images/logo_23/rascal_logo_32px.png differ diff --git a/static/images/logo_23/rascal_logo_64px.png b/static/images/logo_23/rascal_logo_64px.png new file mode 100644 index 000000000..b5b264a56 Binary files /dev/null and b/static/images/logo_23/rascal_logo_64px.png differ diff --git a/static/images/old-rascal-logo.png b/static/images/logo_pre/old-rascal-logo.png similarity index 100% rename from static/images/old-rascal-logo.png rename to static/images/logo_pre/old-rascal-logo.png