Merge pull request #2285 from vector-im/dbkr/rebrand

Dbkr/rebrand
This commit is contained in:
David Baker 2016-09-19 13:37:02 +01:00 committed by GitHub
commit 0f2c41dddc
8 changed files with 11 additions and 11 deletions

View File

@ -39,9 +39,9 @@ module.exports = React.createClass({
return ( return (
<div className="mx_CompatibilityPage"> <div className="mx_CompatibilityPage">
<div className="mx_CompatibilityPage_box"> <div className="mx_CompatibilityPage_box">
<p>Sorry, your browser is <b>not</b> able to run Vector.</p> <p>Sorry, your browser is <b>not</b> able to run Riot.</p>
<p> <p>
Vector uses many advanced browser features, some of which are not Riot uses many advanced browser features, some of which are not
available or experimental in your current browser. available or experimental in your current browser.
</p> </p>
<p> <p>

View File

@ -34,7 +34,7 @@ module.exports = React.createClass({
<div className="mx_GuestWarningBar"> <div className="mx_GuestWarningBar">
<img className="mx_GuestWarningBar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/> <img className="mx_GuestWarningBar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
<div> <div>
You are using Vector as a guest. <a onClick={this.onRegisterClicked}>Register</a> or <a onClick={this.onLoginClicked}>log in</a> to access more rooms and features. You are Rioting as a guest. <a onClick={this.onRegisterClicked}>Register</a> or <a onClick={this.onLoginClicked}>log in</a> to access more rooms and features.
</div> </div>
</div> </div>
); );

View File

@ -39,7 +39,7 @@ export default function NewVersionBar(props) {
<div className="mx_MatrixToolbar"> <div className="mx_MatrixToolbar">
<img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/> <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
<div className="mx_MatrixToolbar_content"> <div className="mx_MatrixToolbar_content">
A new version of Vector is available. Refresh your browser. A new version of Riot is available. Refresh your browser.
</div> </div>
<button className="mx_MatrixToolbar_action" onClick={onChangelogClicked}>Changelog</button> <button className="mx_MatrixToolbar_action" onClick={onChangelogClicked}>Changelog</button>
</div> </div>

View File

@ -33,7 +33,7 @@ module.exports = React.createClass({
You can use the custom server options to log into other Matrix You can use the custom server options to log into other Matrix
servers by specifying a different Home server URL. servers by specifying a different Home server URL.
<br/> <br/>
This allows you to use Vector with an existing Matrix account on This allows you to use Riot with an existing Matrix account on
a different home server. a different home server.
<br/> <br/>
<br/> <br/>

View File

@ -27,7 +27,7 @@ module.exports = React.createClass({
render: function() { render: function() {
return ( return (
<div className="mx_Login_logo"> <div className="mx_Login_logo">
<img src="img/logo.png" width="249" height="78" alt="vector"/> <img src="img/logo.png" width="200" height="200" alt="Riot"/>
</div> </div>
); );
} }

View File

@ -132,7 +132,7 @@ module.exports = React.createClass({
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Error saving email notification preferences", title: "Error saving email notification preferences",
description: "Vector was unable to save your email notification preferences.", description: "An error occurred whilst saving your email notification preferences.",
}); });
}); });
}, },
@ -784,7 +784,7 @@ module.exports = React.createClass({
<div> <div>
<h3>Advanced notifications settings</h3> <h3>Advanced notifications settings</h3>
There are advanced notifications which are not shown here.<br/> There are advanced notifications which are not shown here.<br/>
You might have configured them in another client than Vector. You cannot tune them in Vector but they still apply. You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply.
<ul> <ul>
{ externalRules } { externalRules }
</ul> </ul>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -208,13 +208,13 @@ async function loadApp() {
if (!preventRedirect) { if (!preventRedirect) {
if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) { if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
if (confirm("Vector is not supported on mobile web. Install the app?")) { if (confirm("Riot is not supported on mobile web. Install the app?")) {
window.location = "https://itunes.apple.com/us/app/vector.im/id1083446067"; window.location = "https://itunes.apple.com/us/app/vector.im/id1083446067";
return; return;
} }
} }
else if (/Android/.test(navigator.userAgent)) { else if (/Android/.test(navigator.userAgent)) {
if (confirm("Vector is not supported on mobile web. Install the app?")) { if (confirm("Riot is not supported on mobile web. Install the app?")) {
window.location = "https://play.google.com/store/apps/details?id=im.vector.alpha"; window.location = "https://play.google.com/store/apps/details?id=im.vector.alpha";
return; return;
} }