diff --git a/res/home/images/icons-directory.svg b/res/home/images/icons-directory.svg deleted file mode 100644 index 2688b84713..0000000000 --- a/res/home/images/icons-directory.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - icons_directory - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/home/rooms/bridging.png b/res/home/rooms/bridging.png deleted file mode 100644 index 6b3a55e7bb..0000000000 Binary files a/res/home/rooms/bridging.png and /dev/null differ diff --git a/res/home/rooms/dendrite-dev.png b/res/home/rooms/dendrite-dev.png deleted file mode 100644 index 1d96bd84a7..0000000000 Binary files a/res/home/rooms/dendrite-dev.png and /dev/null differ diff --git a/res/home/rooms/dendrite.png b/res/home/rooms/dendrite.png deleted file mode 100644 index 1d96bd84a7..0000000000 Binary files a/res/home/rooms/dendrite.png and /dev/null differ diff --git a/res/home/rooms/e2e.png b/res/home/rooms/e2e.png deleted file mode 100644 index a2bda4bc68..0000000000 Binary files a/res/home/rooms/e2e.png and /dev/null differ diff --git a/res/home/rooms/homeowners.png b/res/home/rooms/homeowners.png deleted file mode 100644 index ed45f11ceb..0000000000 Binary files a/res/home/rooms/homeowners.png and /dev/null differ diff --git a/res/home/rooms/identity.jpg b/res/home/rooms/identity.jpg deleted file mode 100644 index f2e1505634..0000000000 Binary files a/res/home/rooms/identity.jpg and /dev/null differ diff --git a/res/home/rooms/identity.png b/res/home/rooms/identity.png deleted file mode 100644 index de1ea60d54..0000000000 Binary files a/res/home/rooms/identity.png and /dev/null differ diff --git a/res/home/rooms/irc.png b/res/home/rooms/irc.png deleted file mode 100644 index 5f611d12a4..0000000000 Binary files a/res/home/rooms/irc.png and /dev/null differ diff --git a/res/home/rooms/matrix-dev.png b/res/home/rooms/matrix-dev.png deleted file mode 100644 index fa54f00cb2..0000000000 Binary files a/res/home/rooms/matrix-dev.png and /dev/null differ diff --git a/res/home/rooms/matrix.png b/res/home/rooms/matrix.png deleted file mode 100644 index fa54f00cb2..0000000000 Binary files a/res/home/rooms/matrix.png and /dev/null differ diff --git a/res/home/rooms/riot-android.png b/res/home/rooms/riot-android.png deleted file mode 100644 index fa2bec8e3e..0000000000 Binary files a/res/home/rooms/riot-android.png and /dev/null differ diff --git a/res/home/rooms/riot-bot.png b/res/home/rooms/riot-bot.png deleted file mode 100644 index 9efd4a3c21..0000000000 Binary files a/res/home/rooms/riot-bot.png and /dev/null differ diff --git a/res/home/rooms/riot-dev.png b/res/home/rooms/riot-dev.png deleted file mode 100644 index ff8b21ad1a..0000000000 Binary files a/res/home/rooms/riot-dev.png and /dev/null differ diff --git a/res/home/rooms/riot-ios.png b/res/home/rooms/riot-ios.png deleted file mode 100644 index 6a0c598fe5..0000000000 Binary files a/res/home/rooms/riot-ios.png and /dev/null differ diff --git a/res/home/rooms/riot-translations.png b/res/home/rooms/riot-translations.png deleted file mode 100644 index 2ae95836e7..0000000000 Binary files a/res/home/rooms/riot-translations.png and /dev/null differ diff --git a/res/home/rooms/riot.png b/res/home/rooms/riot.png deleted file mode 100644 index 4daa2e4ef7..0000000000 Binary files a/res/home/rooms/riot.png and /dev/null differ diff --git a/res/home/rooms/synapse.png b/res/home/rooms/synapse.png deleted file mode 100644 index ee0f855895..0000000000 Binary files a/res/home/rooms/synapse.png and /dev/null differ diff --git a/res/home/rooms/vr.png b/res/home/rooms/vr.png deleted file mode 100644 index 98b77802df..0000000000 Binary files a/res/home/rooms/vr.png and /dev/null differ diff --git a/res/home/rooms/webrtc.png b/res/home/rooms/webrtc.png deleted file mode 100644 index 98b790f9ae..0000000000 Binary files a/res/home/rooms/webrtc.png and /dev/null differ diff --git a/res/home.html b/res/welcome.html similarity index 93% rename from res/home.html rename to res/welcome.html index cabeb12887..d4d7c9689d 100644 --- a/res/home.html +++ b/res/welcome.html @@ -141,23 +141,23 @@ h1::after { } .mx_Button_iconSignIn { - background-image: url('home/images/icon-sign-in.svg'); + background-image: url('welcome/images/icon-sign-in.svg'); } .mx_Button_iconCreateAccount { - background-image: url('home/images/icon-create-account.svg'); + background-image: url('welcome/images/icon-create-account.svg'); } .mx_Button_iconHelp { - background-image: url('home/images/icon-help.svg'); + background-image: url('welcome/images/icon-help.svg'); } .mx_Button_iconRoomDirectory { - background-image: url('home/images/icon-room-directory.svg'); + background-image: url('welcome/images/icon-room-directory.svg'); }
- +

_t("Welcome to Riot.im")

_t("Decentralised, encrypted chat & collaboration powered by [matrix]")

diff --git a/res/home/images/icon-create-account.svg b/res/welcome/images/icon-create-account.svg similarity index 100% rename from res/home/images/icon-create-account.svg rename to res/welcome/images/icon-create-account.svg diff --git a/res/home/images/icon-help.svg b/res/welcome/images/icon-help.svg similarity index 100% rename from res/home/images/icon-help.svg rename to res/welcome/images/icon-help.svg diff --git a/res/home/images/icon-room-directory.svg b/res/welcome/images/icon-room-directory.svg similarity index 100% rename from res/home/images/icon-room-directory.svg rename to res/welcome/images/icon-room-directory.svg diff --git a/res/home/images/icon-sign-in.svg b/res/welcome/images/icon-sign-in.svg similarity index 100% rename from res/home/images/icon-sign-in.svg rename to res/welcome/images/icon-sign-in.svg diff --git a/res/home/images/logo.svg b/res/welcome/images/logo.svg similarity index 100% rename from res/home/images/logo.svg rename to res/welcome/images/logo.svg diff --git a/res/home/images/matrix.svg b/res/welcome/images/matrix.svg similarity index 99% rename from res/home/images/matrix.svg rename to res/welcome/images/matrix.svg index 5c7dfbb5e3..13adcab25a 100644 --- a/res/home/images/matrix.svg +++ b/res/welcome/images/matrix.svg @@ -1,153 +1,153 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 012cdf794b..9bfebb0ca3 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -50,9 +50,9 @@ const INCLUDE_LANGS = [ // "dest/b/...". const COPY_LIST = [ ["res/manifest.json", "webapp"], - ["res/home.html", "webapp"], + ["res/welcome.html", "webapp"], ["res/home-status.html", "webapp"], - ["res/home/**", "webapp/home"], + ["res/welcome/**", "webapp/welcome"], ["res/themes/**", "webapp/themes"], ["res/vector-icons/**", "webapp/vector-icons"], ["node_modules/matrix-react-sdk/res/media/**", "webapp/media"], diff --git a/src/components/structures/VectorEmbeddedPage.js b/src/components/structures/VectorEmbeddedPage.js index aa4f4e8142..fa100f539d 100644 --- a/src/components/structures/VectorEmbeddedPage.js +++ b/src/components/structures/VectorEmbeddedPage.js @@ -30,7 +30,7 @@ export default class VectorEmbeddedPage extends EmbeddedPage { s = sanitizeHtml(_t(s)); // ugly fix for https://github.com/vector-im/riot-web/issues/4243 s = s.replace(/Riot\.im/, 'Riot.im'); - s = s.replace(/\[matrix\]/, '[matrix]'); + s = s.replace(/\[matrix\]/, '[matrix]'); return s; } }