diff --git a/res/css/structures/ErrorView.pcss b/res/css/structures/ErrorView.pcss index afb51023e4..8ead257e72 100644 --- a/res/css/structures/ErrorView.pcss +++ b/res/css/structures/ErrorView.pcss @@ -46,7 +46,7 @@ limitations under the License. margin-left: 4px; margin-right: 4px; min-width: 80px; - background-color: #03b381; + background-color: #1161fe; color: #fff; cursor: pointer; padding: 12px 22px; diff --git a/res/manifest.json b/res/manifest.json index f6f1e91bf4..fbc3b6805f 100644 --- a/res/manifest.json +++ b/res/manifest.json @@ -84,7 +84,7 @@ }, { "platform": "itunes", - "url": "https://apps.apple.com/app/vector/id1083446067" + "url": "https://apps.apple.com/app/superhero-chat/id6466815315" } ] } diff --git a/res/themes/superhero/img/backgrounds/gradient-bg.svg b/res/themes/superhero/img/backgrounds/gradient-bg.svg new file mode 100644 index 0000000000..24839ef6b6 --- /dev/null +++ b/res/themes/superhero/img/backgrounds/gradient-bg.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/themes/superhero/img/download/apple.svg b/res/themes/superhero/img/download/apple.svg new file mode 100644 index 0000000000..9de39edc8f --- /dev/null +++ b/res/themes/superhero/img/download/apple.svg @@ -0,0 +1,97 @@ + + Download on the App Store. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/themes/superhero/img/download/fdroid.svg b/res/themes/superhero/img/download/fdroid.svg new file mode 100644 index 0000000000..847196f54b --- /dev/null +++ b/res/themes/superhero/img/download/fdroid.svg @@ -0,0 +1,135 @@ + + Get it on F-Droid. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/themes/superhero/img/download/google.svg b/res/themes/superhero/img/download/google.svg new file mode 100644 index 0000000000..d54aca167c --- /dev/null +++ b/res/themes/superhero/img/download/google.svg @@ -0,0 +1,70 @@ + + Download on the Google Play Store. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/themes/superhero/img/logos/dark-logo.svg b/res/themes/superhero/img/logos/dark-logo.svg new file mode 100644 index 0000000000..6f7ef82972 --- /dev/null +++ b/res/themes/superhero/img/logos/dark-logo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/res/themes/superhero/img/logos/logo-small.svg b/res/themes/superhero/img/logos/logo-small.svg new file mode 100644 index 0000000000..84dc8a0097 --- /dev/null +++ b/res/themes/superhero/img/logos/logo-small.svg @@ -0,0 +1,3 @@ + + + diff --git a/res/themes/superhero/img/logos/superhero-logo.svg b/res/themes/superhero/img/logos/superhero-logo.svg new file mode 100644 index 0000000000..1ff4ef7bfe --- /dev/null +++ b/res/themes/superhero/img/logos/superhero-logo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/res/vector-icons/1024.png b/res/vector-icons/1024.png index 83d6a16b11..ff53090a62 100644 Binary files a/res/vector-icons/1024.png and b/res/vector-icons/1024.png differ diff --git a/res/vector-icons/120.png b/res/vector-icons/120.png index 48b8ecf91c..c70a36deec 100644 Binary files a/res/vector-icons/120.png and b/res/vector-icons/120.png differ diff --git a/res/vector-icons/1240x600.png b/res/vector-icons/1240x600.png index aeaa12de42..379a9ba2b9 100644 Binary files a/res/vector-icons/1240x600.png and b/res/vector-icons/1240x600.png differ diff --git a/res/vector-icons/150.png b/res/vector-icons/150.png index 14d589a026..1eea31127b 100644 Binary files a/res/vector-icons/150.png and b/res/vector-icons/150.png differ diff --git a/res/vector-icons/152.png b/res/vector-icons/152.png index 65d42b33e9..1e3a649a69 100644 Binary files a/res/vector-icons/152.png and b/res/vector-icons/152.png differ diff --git a/res/vector-icons/180.png b/res/vector-icons/180.png index 7de76f75e3..45844c1fd2 100644 Binary files a/res/vector-icons/180.png and b/res/vector-icons/180.png differ diff --git a/res/vector-icons/24.png b/res/vector-icons/24.png index 87355fe9bb..5a59823b51 100644 Binary files a/res/vector-icons/24.png and b/res/vector-icons/24.png differ diff --git a/res/vector-icons/300.png b/res/vector-icons/300.png index 1f1b42f352..ceed24b051 100644 Binary files a/res/vector-icons/300.png and b/res/vector-icons/300.png differ diff --git a/res/vector-icons/44.png b/res/vector-icons/44.png index a60d3a02f2..5a065c43dd 100644 Binary files a/res/vector-icons/44.png and b/res/vector-icons/44.png differ diff --git a/res/vector-icons/50.png b/res/vector-icons/50.png index 23e1eaa397..5d1e70c968 100644 Binary files a/res/vector-icons/50.png and b/res/vector-icons/50.png differ diff --git a/res/vector-icons/620x300.png b/res/vector-icons/620x300.png index 2bf3805f57..cbcc8830da 100644 Binary files a/res/vector-icons/620x300.png and b/res/vector-icons/620x300.png differ diff --git a/res/vector-icons/76.png b/res/vector-icons/76.png index e44a47fc08..509caa6603 100644 Binary files a/res/vector-icons/76.png and b/res/vector-icons/76.png differ diff --git a/res/vector-icons/88.png b/res/vector-icons/88.png index 98e44a9176..3f69e8d6f9 100644 Binary files a/res/vector-icons/88.png and b/res/vector-icons/88.png differ diff --git a/res/vector-icons/apple-touch-icon-114.png b/res/vector-icons/apple-touch-icon-114.png index 16b0b289d5..64522bb9b3 100644 Binary files a/res/vector-icons/apple-touch-icon-114.png and b/res/vector-icons/apple-touch-icon-114.png differ diff --git a/res/vector-icons/apple-touch-icon-120.png b/res/vector-icons/apple-touch-icon-120.png index 1c91a55ef1..c146f7cc5f 100644 Binary files a/res/vector-icons/apple-touch-icon-120.png and b/res/vector-icons/apple-touch-icon-120.png differ diff --git a/res/vector-icons/apple-touch-icon-144.png b/res/vector-icons/apple-touch-icon-144.png index 354259f5d7..4db73cb53d 100644 Binary files a/res/vector-icons/apple-touch-icon-144.png and b/res/vector-icons/apple-touch-icon-144.png differ diff --git a/res/vector-icons/apple-touch-icon-152.png b/res/vector-icons/apple-touch-icon-152.png index dace2c8bc2..e241d6e699 100644 Binary files a/res/vector-icons/apple-touch-icon-152.png and b/res/vector-icons/apple-touch-icon-152.png differ diff --git a/res/vector-icons/apple-touch-icon-180.png b/res/vector-icons/apple-touch-icon-180.png index e9409c84b9..f747caf11e 100644 Binary files a/res/vector-icons/apple-touch-icon-180.png and b/res/vector-icons/apple-touch-icon-180.png differ diff --git a/res/vector-icons/apple-touch-icon-57.png b/res/vector-icons/apple-touch-icon-57.png index d2e5a516b8..edfa467b75 100644 Binary files a/res/vector-icons/apple-touch-icon-57.png and b/res/vector-icons/apple-touch-icon-57.png differ diff --git a/res/vector-icons/apple-touch-icon-60.png b/res/vector-icons/apple-touch-icon-60.png index 7c37f2ec31..a80cd7a45f 100644 Binary files a/res/vector-icons/apple-touch-icon-60.png and b/res/vector-icons/apple-touch-icon-60.png differ diff --git a/res/vector-icons/apple-touch-icon-72.png b/res/vector-icons/apple-touch-icon-72.png index b580cc52c0..f5e03b002c 100644 Binary files a/res/vector-icons/apple-touch-icon-72.png and b/res/vector-icons/apple-touch-icon-72.png differ diff --git a/res/vector-icons/apple-touch-icon-76.png b/res/vector-icons/apple-touch-icon-76.png index e37586cc99..fb091cc8f4 100644 Binary files a/res/vector-icons/apple-touch-icon-76.png and b/res/vector-icons/apple-touch-icon-76.png differ diff --git a/res/vector-icons/favicon.ico b/res/vector-icons/favicon.ico index 6ad5fb0865..e7f14d843c 100644 Binary files a/res/vector-icons/favicon.ico and b/res/vector-icons/favicon.ico differ diff --git a/res/vector-icons/mstile-150.png b/res/vector-icons/mstile-150.png index 79fe7a1bd1..7821f0b0e5 100644 Binary files a/res/vector-icons/mstile-150.png and b/res/vector-icons/mstile-150.png differ diff --git a/res/vector-icons/mstile-310.png b/res/vector-icons/mstile-310.png index cfafd744d7..633c7f31bc 100644 Binary files a/res/vector-icons/mstile-310.png and b/res/vector-icons/mstile-310.png differ diff --git a/res/vector-icons/mstile-310x150.png b/res/vector-icons/mstile-310x150.png index bd001159ec..875a8a4432 100644 Binary files a/res/vector-icons/mstile-310x150.png and b/res/vector-icons/mstile-310x150.png differ diff --git a/res/vector-icons/mstile-70.png b/res/vector-icons/mstile-70.png index 7470321851..4357375f90 100644 Binary files a/res/vector-icons/mstile-70.png and b/res/vector-icons/mstile-70.png differ diff --git a/res/welcome.html b/res/welcome.html index ef2d43bd8f..6014cc4d49 100644 --- a/res/welcome.html +++ b/res/welcome.html @@ -116,7 +116,7 @@ } .mx_ButtonCreateAccount { - background-color: #0dbd8b; + background-color: #1161fe; color: white !important; } @@ -166,10 +166,10 @@ we don't have an account and should hide them. No account == no guest account ei
- + -

_t("welcome_to_element")

+

_t("welcome_to_superhero")

_t("powered_by_matrix_with_logo")

diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx index a9f1cce51a..7b248eb27a 100644 --- a/src/async-components/structures/CompatibilityView.tsx +++ b/src/async-components/structures/CompatibilityView.tsx @@ -136,8 +136,8 @@ const CompatibilityView: React.FC = ({ onAccept }) => {

- - {_t("go_to_element_io")} + + {_t("go_to_chat_superhero_com")}

diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx index 25ce1465c0..5d4db71669 100644 --- a/src/async-components/structures/ErrorView.tsx +++ b/src/async-components/structures/ErrorView.tsx @@ -34,7 +34,7 @@ const ErrorView: React.FC = ({ title, messages }) => {
- Element + Superhero

{_t("failed_to_start")}

@@ -48,8 +48,8 @@ const ErrorView: React.FC = ({ title, messages }) => {

- - {_t("go_to_element_io")} + + {_t("go_to_chat_superhero_com")}

diff --git a/src/components/views/auth/VectorAuthFooter.tsx b/src/components/views/auth/VectorAuthFooter.tsx index a2082992f4..d170ca3ca4 100644 --- a/src/components/views/auth/VectorAuthFooter.tsx +++ b/src/components/views/auth/VectorAuthFooter.tsx @@ -23,9 +23,9 @@ import { _t } from "../../../languageHandler"; const VectorAuthFooter = (): ReactElement => { const brandingConfig = SdkConfig.getObject("branding"); const links = brandingConfig?.get("auth_footer_links") ?? [ - { text: "Blog", url: "https://element.io/blog" }, - { text: "Twitter", url: "https://twitter.com/element_hq" }, - { text: "GitHub", url: "https://github.com/vector-im/element-web" }, + { text: "Blog", url: "https://superhero.com" }, + { text: "Twitter", url: "https://twitter.com/superhero" }, + { text: "GitHub", url: "https://github.com/superhero-com/element-web" }, ]; const authFooterLinks: JSX.Element[] = []; diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx index e04dfcefd7..5636816f93 100644 --- a/src/components/views/auth/VectorAuthPage.tsx +++ b/src/components/views/auth/VectorAuthPage.tsx @@ -27,7 +27,7 @@ export default class VectorAuthPage extends React.PureComponent { if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl; const brandingConfig = SdkConfig.getObject("branding"); - VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/lake.jpg"; + VectorAuthPage.welcomeBackgroundUrl = "themes/superhero/img/backgrounds/gradient-bg.svg"; const configuredUrl = brandingConfig?.get("welcome_background_url"); if (configuredUrl) { diff --git a/src/vector/index.html b/src/vector/index.html index 2166bd6299..423548b97f 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -2,7 +2,7 @@ - Element + Superhero @@ -16,8 +16,8 @@ - - + + @@ -55,10 +55,16 @@ <% } } %> + - +
<% diff --git a/src/vector/jitsi/index.pcss b/src/vector/jitsi/index.pcss index e9d90538fe..7f444dd7b4 100644 --- a/src/vector/jitsi/index.pcss +++ b/src/vector/jitsi/index.pcss @@ -84,7 +84,7 @@ html { display: inline-block; font-size: 14px; color: #ffffff; - background-color: #03b381; + background-color: #1161fe; border: 0; } diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index c39041c501..39330d472a 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -1,7 +1,7 @@ - Element Mobile Guide + Superhero Mobile Guide @@ -27,7 +27,7 @@ margin-left: 4px; margin-right: 4px; min-width: 80px; - background-color: #03b381; + background-color: #1161fe; color: #fff; cursor: pointer; padding: 12px 22px; @@ -96,7 +96,7 @@ } .mx_FooterLink { - color: #0dbd8b; + color: #1161fe; text-decoration: none; } @@ -150,29 +150,29 @@ fill-rule="evenodd" clip-rule="evenodd" d="M13.08 8.68C13.08 7.75216 13.8321 7 14.76 7C20.9456 7 25.96 12.0144 25.96 18.2C25.96 19.1278 25.2078 19.88 24.28 19.88C23.3521 19.88 22.6 19.1278 22.6 18.2C22.6 13.8701 19.0899 10.36 14.76 10.36C13.8321 10.36 13.08 9.60784 13.08 8.68Z" - fill="#0DBD8B" + fill="#1161fe" /> -

Set up Element on iOS or Android

+

Set up Superhero on iOS or Android

@@ -180,7 +180,7 @@

Install the app

iOS (iPhone or iPad)

@@ -318,7 +318,7 @@

Android

diff --git a/src/vector/static/incompatible-browser.html b/src/vector/static/incompatible-browser.html index 38d3ee18af..b956705735 100644 --- a/src/vector/static/incompatible-browser.html +++ b/src/vector/static/incompatible-browser.html @@ -27,7 +27,7 @@ margin-left: 4px; margin-right: 4px; min-width: 80px; - background-color: #03b381; + background-color: #1161fe; color: #fff; cursor: pointer; padding: 12px 22px; @@ -87,7 +87,7 @@ } .mx_FooterLink { - color: #0dbd8b; + color: #1161fe; text-decoration: none; } @@ -139,25 +139,25 @@ fill-rule="evenodd" clip-rule="evenodd" d="M13.08 8.68C13.08 7.75216 13.8321 7 14.76 7C20.9456 7 25.96 12.0144 25.96 18.2C25.96 19.1278 25.2078 19.88 24.28 19.88C23.3521 19.88 22.6 19.1278 22.6 18.2C22.6 13.8701 19.0899 10.36 14.76 10.36C13.8321 10.36 13.08 9.60784 13.08 8.68Z" - fill="#0DBD8B" + fill="#1161fe" /> @@ -166,10 +166,10 @@
-

Your browser can't run Element

+

Your browser can't run Superhero

- Element uses many advanced browser features, some of which are not available or experimental in - your current browser. + Superhero uses many advanced browser features, some of which are not available or experimental + in your current browser.

Please install Chrome, @@ -182,9 +182,13 @@

-

Use Element on mobile

+

Use Superhero on mobile

iOS (iPhone or iPad)

- +

Android

@@ -768,7 +772,9 @@
diff --git a/src/vector/static/unable-to-load.html b/src/vector/static/unable-to-load.html index 5cb007a1a7..ed59193e38 100644 --- a/src/vector/static/unable-to-load.html +++ b/src/vector/static/unable-to-load.html @@ -27,7 +27,7 @@ margin-left: 4px; margin-right: 4px; min-width: 80px; - background-color: #03b381; + background-color: #1161fe; color: #fff; cursor: pointer; padding: 12px 22px; @@ -97,7 +97,7 @@ } .mx_FooterLink { - color: ##0dbd8b; + color: ##1161fe; text-decoration: none; } @@ -153,25 +153,25 @@ fill-rule="evenodd" clip-rule="evenodd" d="M13.08 8.68C13.08 7.75216 13.8321 7 14.76 7C20.9456 7 25.96 12.0144 25.96 18.2C25.96 19.1278 25.2078 19.88 24.28 19.88C23.3521 19.88 22.6 19.1278 22.6 18.2C22.6 13.8701 19.0899 10.36 14.76 10.36C13.8321 10.36 13.08 9.60784 13.08 8.68Z" - fill="#0DBD8B" + fill="#1161fe" /> @@ -180,14 +180,16 @@
-

Element can't load

-

Something went wrong and Element was unable to load.

+

Superhero can't load

+

Something went wrong and Superhero was unable to load.

diff --git a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap index 9af471f05b..029208905a 100644 --- a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap +++ b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap @@ -15,9 +15,9 @@ exports[` should match snapshot 1`] = ` class="mx_HomePage_logo" > Element

@@ -53,10 +53,10 @@ exports[` should match snapshot 1`] = ` > - Go to element.io + Go to chat.superhero.com

diff --git a/test/unit-tests/components/views/auth/__snapshots__/VectorAuthFooter-test.tsx.snap b/test/unit-tests/components/views/auth/__snapshots__/VectorAuthFooter-test.tsx.snap index 04d04c4570..9e914d07b6 100644 --- a/test/unit-tests/components/views/auth/__snapshots__/VectorAuthFooter-test.tsx.snap +++ b/test/unit-tests/components/views/auth/__snapshots__/VectorAuthFooter-test.tsx.snap @@ -7,21 +7,21 @@ exports[` should match snapshot 1`] = ` role="contentinfo" > Blog Twitter diff --git a/test/unit-tests/components/views/auth/__snapshots__/VectorAuthPage-test.tsx.snap b/test/unit-tests/components/views/auth/__snapshots__/VectorAuthPage-test.tsx.snap index ebf6c5c305..f63c42d833 100644 --- a/test/unit-tests/components/views/auth/__snapshots__/VectorAuthPage-test.tsx.snap +++ b/test/unit-tests/components/views/auth/__snapshots__/VectorAuthPage-test.tsx.snap @@ -23,21 +23,21 @@ exports[` should match snapshot 1`] = ` role="contentinfo" > Blog Twitter