diff --git a/res/themes/element/img/logos/opengraph.png b/res/themes/element/img/logos/opengraph.png index 4750c77ad3..20f87bd5cd 100644 Binary files a/res/themes/element/img/logos/opengraph.png and b/res/themes/element/img/logos/opengraph.png differ diff --git a/res/themes/element/img/logos/riot-im-logo-black-text.png b/res/themes/element/img/logos/riot-im-logo-black-text.png deleted file mode 100644 index a21bb93e77..0000000000 Binary files a/res/themes/element/img/logos/riot-im-logo-black-text.png and /dev/null differ diff --git a/res/themes/element/img/logos/riot-im-logo-black-text.svg b/res/themes/element/img/logos/riot-im-logo-black-text.svg deleted file mode 100644 index ce50d65d49..0000000000 --- a/res/themes/element/img/logos/riot-im-logo-black-text.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - alt black logotype - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/res/themes/element/img/logos/riot-im-logo.png b/res/themes/element/img/logos/riot-im-logo.png deleted file mode 100644 index 8fdd2ce4c9..0000000000 Binary files a/res/themes/element/img/logos/riot-im-logo.png and /dev/null differ diff --git a/res/themes/element/img/logos/riot-im-logo.svg b/res/themes/element/img/logos/riot-im-logo.svg deleted file mode 100644 index 8a7956cc65..0000000000 --- a/res/themes/element/img/logos/riot-im-logo.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - animatedLogo-0 - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/res/themes/element/img/logos/riot-logo.svg b/res/themes/element/img/logos/riot-logo.svg deleted file mode 100644 index ac1e547234..0000000000 --- a/res/themes/element/img/logos/riot-logo.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/welcome/images/logo.svg b/res/welcome/images/logo.svg index 79039b70d0..b30aafe1f6 100644 --- a/res/welcome/images/logo.svg +++ b/res/welcome/images/logo.svg @@ -1,16 +1,6 @@ - - - - - - - - - + + + + + diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx index b032214a99..07bee042ee 100644 --- a/src/async-components/structures/CompatibilityView.tsx +++ b/src/async-components/structures/CompatibilityView.tsx @@ -30,7 +30,7 @@ const CompatibilityView: React.FC = ({ onAccept }) => {
- Riot + Element

{ _t("Unsupported browser") }

@@ -72,20 +72,20 @@ const CompatibilityView: React.FC = ({ onAccept }) => {
-

Use Riot on mobile

+

Use Element on mobile

iOS (iPhone or iPad)

- Apple App Store + Apple App Store

Android

- Google Play Store + Google Play Store - F-Droid + F-Droid
diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx index 3c2d1e41bd..3f0cca2dbb 100644 --- a/src/async-components/structures/ErrorView.tsx +++ b/src/async-components/structures/ErrorView.tsx @@ -32,7 +32,7 @@ const ErrorView: React.FC = ({title, messages}) => {
- Riot + Element

{ _t("Failed to start") }

diff --git a/src/components/views/auth/VectorAuthHeaderLogo.js b/src/components/views/auth/VectorAuthHeaderLogo.js index 04973fe2ed..821d38e687 100644 --- a/src/components/views/auth/VectorAuthHeaderLogo.js +++ b/src/components/views/auth/VectorAuthHeaderLogo.js @@ -30,14 +30,14 @@ export default class VectorAuthHeaderLogo extends React.PureComponent { render() { const brandingConfig = SdkConfig.get().branding; - let logoUrl = "themes/riot/img/logos/riot-im-logo-black-text.svg"; + let logoUrl = "themes/element/img/logos/element-logo.svg"; if (brandingConfig && brandingConfig.authHeaderLogoUrl) { logoUrl = brandingConfig.authHeaderLogoUrl; } return (
- Riot + Element
); } diff --git a/src/components/views/auth/VectorAuthPage.js b/src/components/views/auth/VectorAuthPage.js index 3e1b059bc0..76d94302c8 100644 --- a/src/components/views/auth/VectorAuthPage.js +++ b/src/components/views/auth/VectorAuthPage.js @@ -28,7 +28,7 @@ export default class VectorAuthPage extends React.PureComponent { if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl; const brandingConfig = SdkConfig.get().branding; - VectorAuthPage.welcomeBackgroundUrl = "themes/riot/img/backgrounds/valley.jpg"; + VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/valley.jpg"; if (brandingConfig && brandingConfig.welcomeBackgroundUrl) { if (Array.isArray(brandingConfig.welcomeBackgroundUrl)) { const index = Math.floor(Math.random() * brandingConfig.welcomeBackgroundUrl.length); diff --git a/webpack.config.js b/webpack.config.js index 698fae7bda..d88fad2567 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,7 +6,7 @@ const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const webpack = require("webpack"); let og_image_url = process.env.RIOT_OG_IMAGE_URL; -if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/opengraph.png'; +if (!og_image_url) og_image_url = 'https://app.element.io/themes/element/img/logos/opengraph.png'; module.exports = (env, argv) => { if (process.env.CI_PACKAGE) {