Merge branch 'main' into add_tsukuyomi_submodule

keep-starknet-strange · Aug 3, 2023 · 5e165cf · 5e165cf
2 parents 449eeea + 8011c96
commit 5e165cf
Show file tree

Hide file tree

Showing 36 changed files with 334 additions and 3 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,7 @@
 target
 typescript-api
 cairo-contracts/build
+madara-app
+madara-dev-explorer
+madara-docs
+madara-infra
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,3 +7,4 @@
 - ci: add `CHANGELOG.md` and enforce it is edited for each PR on `main`
 - feat: add a `genesis_loader` for the node and mocking
 - feat: add `madara_tsukuyomi` as a submodule
+- branding: use new logo in the README
diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
 <!-- markdownlint-disable -->
 <div align="center">
-  <img src="docs/images/madara-no-bg.png" height="128">
+  <img src="docs/images/logo/PNGs/Madara logo - Red - Duotone.png" height="128">
+</div>
+<div align="center">
+  <img src="docs/images/logo/PNGs/Madara wordmark - Red.png" height="128">
 </div>
-
 <div align="center">
 <br />
 <!-- markdownlint-restore -->

diff --git a/docs/images/logo/PNGs/Madara Wordmark - Black.png b/docs/images/logo/PNGs/Madara Wordmark - Black.png
diff --git a/docs/images/logo/PNGs/Madara logo - Black - Duotone.png b/docs/images/logo/PNGs/Madara logo - Black - Duotone.png
diff --git a/docs/images/logo/PNGs/Madara logo - Black.png b/docs/images/logo/PNGs/Madara logo - Black.png
diff --git a/docs/images/logo/PNGs/Madara logo - Red - Duotone.png b/docs/images/logo/PNGs/Madara logo - Red - Duotone.png
diff --git a/docs/images/logo/PNGs/Madara logo - Red.png b/docs/images/logo/PNGs/Madara logo - Red.png
diff --git a/docs/images/logo/PNGs/Madara logo - White - Duotone.png b/docs/images/logo/PNGs/Madara logo - White - Duotone.png
diff --git a/docs/images/logo/PNGs/Madara logo - White.png b/docs/images/logo/PNGs/Madara logo - White.png
diff --git a/docs/images/logo/PNGs/Madara logomark - Black - Duotone.png b/docs/images/logo/PNGs/Madara logomark - Black - Duotone.png
diff --git a/docs/images/logo/PNGs/Madara logomark - Black.png b/docs/images/logo/PNGs/Madara logomark - Black.png
diff --git a/docs/images/logo/PNGs/Madara logomark - Red - Duotone.png b/docs/images/logo/PNGs/Madara logomark - Red - Duotone.png
diff --git a/docs/images/logo/PNGs/Madara logomark - Red.png b/docs/images/logo/PNGs/Madara logomark - Red.png
diff --git a/docs/images/logo/PNGs/Madara logomark - White - Duotone.png b/docs/images/logo/PNGs/Madara logomark - White - Duotone.png
diff --git a/docs/images/logo/PNGs/Madara logomark - White.png b/docs/images/logo/PNGs/Madara logomark - White.png
diff --git a/docs/images/logo/PNGs/Madara wordmark - Red.png b/docs/images/logo/PNGs/Madara wordmark - Red.png
diff --git a/docs/images/logo/PNGs/Madara wordmark - White.png b/docs/images/logo/PNGs/Madara wordmark - White.png
diff --git a/docs/images/logo/SVGs/Madara Wordmark - Black.svg b/docs/images/logo/SVGs/Madara Wordmark - Black.svg
diff --git a/docs/images/logo/SVGs/Madara logo - Black - Duotone.svg b/docs/images/logo/SVGs/Madara logo - Black - Duotone.svg
diff --git a/docs/images/logo/SVGs/Madara logo - Black.svg b/docs/images/logo/SVGs/Madara logo - Black.svg