From 6df69138a21e0deae8aa91a81f6989e690dc0901 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 11 Oct 2017 16:46:05 +0100 Subject: [PATCH] switch to new logos, and use import rather than VAR Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/login/VectorLoginHeader.js | 7 +- src/skins/vector/img/logos/riot-im-logo-1.svg | 158 +++++++++++++++ src/skins/vector/img/logos/riot-im-logo-2.svg | 165 ++++++++++++++++ src/skins/vector/img/logos/riot-im-logo-3.svg | 173 ++++++++++++++++ src/skins/vector/img/logos/riot-im-logo-4.svg | 185 ++++++++++++++++++ src/skins/vector/img/logos/riot-im-logo-5.svg | 110 +++++++++++ src/skins/vector/img/logos/riot.im logo.svg | 169 ++++++++++++++++ 7 files changed, 964 insertions(+), 3 deletions(-) create mode 100644 src/skins/vector/img/logos/riot-im-logo-1.svg create mode 100644 src/skins/vector/img/logos/riot-im-logo-2.svg create mode 100644 src/skins/vector/img/logos/riot-im-logo-3.svg create mode 100644 src/skins/vector/img/logos/riot-im-logo-4.svg create mode 100644 src/skins/vector/img/logos/riot-im-logo-5.svg create mode 100644 src/skins/vector/img/logos/riot.im logo.svg diff --git a/src/components/views/login/VectorLoginHeader.js b/src/components/views/login/VectorLoginHeader.js index 1b071c6a..3aa8811c 100644 --- a/src/components/views/login/VectorLoginHeader.js +++ b/src/components/views/login/VectorLoginHeader.js @@ -16,10 +16,11 @@ limitations under the License. 'use strict'; -var React = require('react'); +import React from 'react'; +import PropTypes from 'prop-types'; const i = [1, 2, 3, 4, 5][Math.floor(Math.random() * 5)]; -const DEFAULT_LOGO_URI = "img/logos/riot-logo-" + i + ".svg"; +const DEFAULT_LOGO_URI = "img/logos/riot-im-logo-" + i + ".svg"; module.exports = React.createClass({ displayName: 'VectorLoginHeader', @@ -27,7 +28,7 @@ module.exports = React.createClass({ replaces: 'LoginHeader', }, propTypes: { - icon: React.PropTypes.string, + icon: PropTypes.string, }, render: function() { diff --git a/src/skins/vector/img/logos/riot-im-logo-1.svg b/src/skins/vector/img/logos/riot-im-logo-1.svg new file mode 100644 index 00000000..a806c3bf --- /dev/null +++ b/src/skins/vector/img/logos/riot-im-logo-1.svg @@ -0,0 +1,158 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-im-logo-2.svg b/src/skins/vector/img/logos/riot-im-logo-2.svg new file mode 100644 index 00000000..f9cc92f1 --- /dev/null +++ b/src/skins/vector/img/logos/riot-im-logo-2.svg @@ -0,0 +1,165 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-im-logo-3.svg b/src/skins/vector/img/logos/riot-im-logo-3.svg new file mode 100644 index 00000000..7f81dacd --- /dev/null +++ b/src/skins/vector/img/logos/riot-im-logo-3.svg @@ -0,0 +1,173 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-im-logo-4.svg b/src/skins/vector/img/logos/riot-im-logo-4.svg new file mode 100644 index 00000000..307868e6 --- /dev/null +++ b/src/skins/vector/img/logos/riot-im-logo-4.svg @@ -0,0 +1,185 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot-im-logo-5.svg b/src/skins/vector/img/logos/riot-im-logo-5.svg new file mode 100644 index 00000000..2653d7c9 --- /dev/null +++ b/src/skins/vector/img/logos/riot-im-logo-5.svg @@ -0,0 +1,110 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/skins/vector/img/logos/riot.im logo.svg b/src/skins/vector/img/logos/riot.im logo.svg new file mode 100644 index 00000000..5ebd96e8 --- /dev/null +++ b/src/skins/vector/img/logos/riot.im logo.svg @@ -0,0 +1,169 @@ + + + +image/svg+xml \ No newline at end of file