Merge remote-tracking branch 'origin/develop' into element

Merge pull request #14472 from vector-im/t3chguy/clean-up
Remove redundant enum
2020-07-15 10:35:45 +01:00 · 2020-07-15 09:58:12 +01:00 · 2020-07-15 09:46:39 +01:00 · 2020-07-15 08:41:47 +00:00 · 2020-07-15 09:38:55 +01:00 · 2020-07-14 15:04:48 -06:00
21 changed files with 62 additions and 150 deletions
--- a/config.sample.json
+++ b/config.sample.json
@@ -27,7 +27,6 @@
    "showLabsSettings": false,
    "features": {
        "feature_new_spinner": "labs",
-        "feature_font_scaling": "labs",
        "feature_pinning": "labs",
        "feature_custom_status": "labs",
        "feature_custom_tags": "labs",
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -11,11 +11,6 @@ dropped. Ask in the room if you are unclear about any details here.**

 Replaces the old spinner image with a new, svg-based one featuring a sleeker design.

-## Font scaling (`feature_font_scaling`)
-
-Enables font scaling options for accessibility. To alter the scale check the
-appearance tab in settings.
-
 ## Message pinning (`feature_pinning`)

 Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message
@@ -100,8 +95,19 @@ theme definition.

 For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).

-## New room list (`feature_new_room_list`)
+## New room list

 A complete rewrite of the room list is underway to increase performance, stability,
-and general usability. This is still rapidly changing, but feel free to give it a test.
+and general usability.
+
+In the event the new room list needs to be disabled, add this to your config.json:
+```json
+{
+    "settingDefaults": {
+        "feature_new_room_list": false
+    }
+}
+```
+
+**Note**: In a future release the new room list will not be optional.

--- a/element.io/README
+++ b/element.io/README
@@ -1,11 +1,12 @@
 This directory contains the config files and deployment scripts for the official
-riot.im distribution of Riot Web at https://riot.im.
+element.io distribution of Element Web.

 You probably do not want to build with this config unless you're building the
-official riot.im distribution, but these files may be useful if you want to
+official element.io distribution, but these files may be useful if you want to
 inspect the configuration used there.

-Riot Desktop uses a separate config (see https://github.com/vector-im/riot-desktop/tree/develop/riot.im).
+Element Desktop uses a separate config (see
+https://github.com/vector-im/riot-desktop/tree/develop/element.io).

 Deployment scripts (such as app/deploy.py) are meant to be run on the web server
-hosting the Riot installation.
+hosting the Element installation.
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -1,6 +1,6 @@
 {
    "default_server_name": "matrix.org",
-    "brand": "Riot",
+    "brand": "Element",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
    "integrations_widgets_urls": [
--- a/element.io/app/deploy.py
+++ b/element.io/app/deploy.py
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -1,6 +1,6 @@
 {
    "default_server_name": "matrix.org",
-    "brand": "Riot",
+    "brand": "Element",
    "integrations_ui_url": "https://scalar-staging.vector.im/",
    "integrations_rest_url": "https://scalar-staging.vector.im/api",
    "integrations_widgets_urls": [
@@ -14,7 +14,6 @@
    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
    "features": {
        "feature_new_spinner": "labs",
-        "feature_font_scaling": "labs",
        "feature_pinning": "labs",
        "feature_custom_status": "labs",
        "feature_custom_tags": "labs",
@@ -24,8 +23,7 @@
        "feature_dm_verification": "labs",
        "feature_bridge_state": "labs",
        "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs",
-        "feature_new_room_list": "labs"
+        "feature_custom_themes": "labs"
    },
    "piwik": {
        "url": "https://piwik.riot.im/",
--- a/res/manifest.json
+++ b/res/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name": "Riot - open team collaboration",
-    "short_name": "Riot",
+    "name": "Element",
+    "short_name": "Element",
    "display": "standalone",
    "theme_color": "#76CFA6",
    "start_url": "index.html",
--- a/res/themes/element/img/backgrounds/lake.jpg
+++ b/res/themes/element/img/backgrounds/lake.jpg
--- a/res/themes/element/img/backgrounds/valley.jpg
+++ b/res/themes/element/img/backgrounds/valley.jpg
--- a/res/vector-icons/favicon.ico
+++ b/res/vector-icons/favicon.ico
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -118,7 +118,7 @@ h1::after {
 }

 .mx_ButtonCreateAccount {
-    background-color: #03B381;
+    background-color: #0DBD8B;
    color: white !important;
 }

--- a/res/welcome/images/icon-create-account.svg
+++ b/res/welcome/images/icon-create-account.svg
@@ -1,17 +1,3 @@
-
-<svg width="24px" height="20px" viewBox="0 0 24 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Experiments" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="Home" transform="translate(-880.000000, -478.000000)" stroke="#FFFFFF" stroke-width="1.6">
-            <g id="Group-11" transform="translate(621.000000, 176.000000)">
-                <g id="Group-7-Copy" transform="translate(243.000000, 290.000000)">
-                    <g id="user-plus" transform="translate(17.000000, 13.000000)">
-                        <path d="M15,18 L15,16 C15,13.790861 13.209139,12 11,12 L4,12 C1.790861,12 2.22044605e-16,13.790861 0,16 L0,18" id="Path"></path>
-                        <circle id="Oval" cx="7.5" cy="4" r="4"></circle>
-                        <path d="M19,5 L19,11" id="Path"></path>
-                        <path d="M22,8 L16,8" id="Path"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9C1 4.58172 4.58172 1 9 1C13.4183 1 17 4.58172 17 9ZM5.25 9C5.25 8.58579 5.58579 8.25 6 8.25H8.25V6C8.25 5.58579 8.58579 5.25 9 5.25C9.41421 5.25 9.75 5.58579 9.75 6V8.25H12C12.4142 8.25 12.75 8.58579 12.75 9C12.75 9.41421 12.4142 9.75 12 9.75H9.75V12C9.75 12.4142 9.41421 12.75 9 12.75C8.58579 12.75 8.25 12.4142 8.25 12V9.75H6C5.58579 9.75 5.25 9.41421 5.25 9Z" fill="white"/>
 </svg>
--- a/res/welcome/images/icon-room-directory.svg
+++ b/res/welcome/images/icon-room-directory.svg
@@ -1,19 +1,4 @@
-
-<svg width="20px" height="14px" viewBox="0 0 20 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Experiments" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="Home" transform="translate(-880.000000, -581.000000)" stroke="#000000" stroke-width="1.6">
-            <g id="Group-11" transform="translate(621.000000, 176.000000)">
-                <g id="Group-8" transform="translate(243.000000, 391.000000)">
-                    <g id="list" transform="translate(15.000000, 14.000000)">
-                        <path d="M7,1 L20,1" id="Path"></path>
-                        <path d="M7,7 L20,7" id="Path"></path>
-                        <path d="M7,13 L20,13" id="Path"></path>
-                        <path d="M2,1 L2.02063964,1.02063964" id="Path"></path>
-                        <path d="M2,7 L2,7.03169624" id="Path"></path>
-                        <path d="M2,13 L2,13.0336048" id="Path"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9C1 4.58172 4.58172 1 9 1C13.4183 1 17 4.58172 17 9ZM13.375 5.3266C13.5583 4.92826 13.0716 4.44152 12.6733 4.62491L7.66968 6.9285C7.33893 7.08077 7.08014 7.33956 6.92787 7.67031L4.62428 12.6739C4.44089 13.0722 4.92763 13.559 5.32597 13.3756L10.3295 11.072C10.6603 10.9197 10.9191 10.6609 11.0714 10.3302L13.375 5.3266Z" fill="black"/>
+<path d="M9.8835 9.88413C9.39534 10.3723 8.60389 10.3723 8.11573 9.88413C7.62757 9.39597 7.62757 8.60452 8.11573 8.11636C8.60389 7.62821 9.39534 7.62821 9.8835 8.11636C10.3717 8.60452 10.3717 9.39597 9.8835 9.88413Z" fill="black"/>
 </svg>
--- a/res/welcome/images/icon-sign-in.svg
+++ b/res/welcome/images/icon-sign-in.svg
--- 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/element/img/backgrounds/valley.jpg";
+        VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/lake.jpg";
        if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
            if (Array.isArray(brandingConfig.welcomeBackgroundUrl)) {
                const index = Math.floor(Math.random() * brandingConfig.welcomeBackgroundUrl.length);
@@ -59,7 +59,7 @@ export default class VectorAuthPage extends React.PureComponent {
            right: 0,
            bottom: 0,
            left: 0,
-            filter: 'blur(10px)',
+            filter: 'blur(40px)',
            background: pageStyle.background,
        };

@@ -67,7 +67,7 @@ export default class VectorAuthPage extends React.PureComponent {
            display: 'flex',
            zIndex: 1,
            background: 'rgba(255, 255, 255, 0.59)',
-            borderRadius: '4px',
+            borderRadius: '8px',
        };

        return (
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
@@ -10,11 +10,7 @@
 }

 body {
-    background: #c5e0f7;
-    background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
-    background: -webkit-linear-gradient(top, #c5e0f7 0%,#ffffff 100%);
-    background: linear-gradient(to bottom, #c5e0f7 0%,#ffffff 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c5e0f7', endColorstr='#ffffff',GradientType=0 );
+    background: #f9fafb;
    max-width: 680px;
    margin: auto;
    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
@@ -100,7 +96,7 @@ body {
 }

 .mx_FooterLink {
-    color: #368BD6;
+    color: #0dbd8b;
    text-decoration: none;
 }

@@ -151,16 +147,12 @@ body {
  <div class="mx_HomePage_container">
      <div class="mx_HomePage_header">
          <span class="mx_HomePage_logo">
-              <svg width="34px" height="42px" viewBox="0 0 34 42" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-                  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-                      <g id="blue" transform="translate(1.000000, 1.000000)">
-                          <path d="M11.6756011,11.3799998 L11.6756011,17.149751 L17.5348252,17.1437188 C17.6092313,17.1437188 17.6771226,17.1417081 17.744671,17.1373516 C19.2852547,17.0358104 20.4894678,15.7727453 20.4894678,14.2620269 C20.4894678,12.6725555 19.1669592,11.3799998 17.5406542,11.3799998 L11.6756011,11.3799998 Z M5.88083947,39.8778856 C2.68069092,39.8778856 0.0860778277,37.342372 0.0860778277,34.2143673 L0.0860778277,23.4205057 C0.0651618241,23.2247959 0.0538388139,23.025735 0.0538388139,22.8243282 C0.0535037238,22.6192351 0.0644760535,22.416823 0.0860778277,22.2170918 L0.0860778277,5.71648153 C0.0860778277,2.58847681 2.68069092,0.0526281121 5.88083947,0.0526281121 L17.5406542,0.0526281121 C25.5573126,0.0526281121 32.079334,6.42693471 32.079334,14.2620269 C32.079334,21.7113966 26.1261594,27.9382507 18.5264495,28.4382489 C18.2034515,28.4600316 17.8705099,28.4710906 17.5406542,28.4710906 L11.6756011,28.4767876 L11.6756011,34.2143673 C11.6756011,37.342372 9.08133089,39.8778856 5.88083947,39.8778856 L5.88083947,39.8778856 Z" id="Fill-1" fill="#A2DDEF"></path>
-                          <path d="M11.6756011,11.3799998 L11.6756011,17.149751 L17.5348252,17.1437188 C17.6092313,17.1437188 17.6771226,17.1417081 17.744671,17.1373516 C19.2852547,17.0358104 20.4894678,15.7727453 20.4894678,14.2620269 C20.4894678,12.6725555 19.1669592,11.3799998 17.5406542,11.3799998 L11.6756011,11.3799998 Z M5.88083947,39.8778856 C2.68069092,39.8778856 0.0860778277,37.342372 0.0860778277,34.2143673 L0.0860778277,23.4205057 C0.0651618241,23.2247959 0.0538388139,23.025735 0.0538388139,22.8243282 C0.0535037238,22.6192351 0.0644760535,22.416823 0.0860778277,22.2170918 L0.0860778277,5.71648153 C0.0860778277,2.58847681 2.68069092,0.0526281121 5.88083947,0.0526281121 L17.5406542,0.0526281121 C25.5573126,0.0526281121 32.079334,6.42693471 32.079334,14.2620269 C32.079334,21.7113966 26.1261594,27.9382507 18.5264495,28.4382489 C18.2034515,28.4600316 17.8705099,28.4710906 17.5406542,28.4710906 L11.6756011,28.4767876 L11.6756011,34.2143673 C11.6756011,37.342372 9.08133089,39.8778856 5.88083947,39.8778856 Z" id="Stroke-3" stroke="#368BD6" stroke-width="1.02344117"></path>
-                          <path d="M5.88087375,34.2142667 L5.88087375,5.716381 L17.5406885,5.716381 C22.3695423,5.716381 26.2842638,9.54243948 26.2842638,14.2619264 C26.2842638,18.7857035 22.6877398,22.488438 18.1373089,22.7876997 C17.939807,22.8007693 17.7412764,22.8074717 17.5406885,22.8074717 L5.84864254,22.8188658" id="Stroke-5" stroke="#368BD6" stroke-width="1.02344117" stroke-linecap="round"></path>
-                          <path d="M22.882533,19.5375774 L31.0723484,30.9604582 C32.909185,33.5221111 32.2731328,37.0539347 29.6524604,38.8484992 C28.640263,39.5418613 27.480282,39.8746349 26.3319591,39.8746349 C24.505752,39.8746349 22.709033,39.0334852 21.5812832,37.4607697 L13.3914677,26.0378889 C11.5549741,23.476236 12.1910263,19.9444124 14.8116987,18.1498479 C17.432371,16.3539429 21.0460393,16.9759245 22.882533,19.5375774 Z M10.6558259,2.46823596 C11.5442417,3.70717248 11.8854126,5.21051822 11.6165905,6.69945383 C11.3474256,8.1893948 10.5004989,9.48731234 9.23182325,10.3549365 C6.61252242,12.1461499 2.98925341,11.5224926 1.15515992,8.96452603 C0.266744094,7.72558951 -0.0744267831,6.22257889 0.194738181,4.73297304 C0.463560259,3.24336719 1.31048696,1.94511453 2.57950547,1.07782546 C5.19880631,-0.713387872 8.82173243,-0.08973062 10.6558259,2.46823596 Z" id="Combined-Shape" fill="#368BD6"></path>
-                      </g>
-                  </g>
-              </svg>
+            <svg width="34" height="42" viewBox="0 0 34 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path 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"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M20.92 33.32C20.92 34.2478 20.1679 35 19.24 35C13.0544 35 8.04001 29.9856 8.04001 23.8C8.04001 22.8722 8.79217 22.12 9.72001 22.12C10.6478 22.12 11.4 22.8722 11.4 23.8C11.4 28.1299 14.9101 31.64 19.24 31.64C20.1679 31.64 20.92 32.3922 20.92 33.32Z" fill="#0DBD8B"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M4.68 24.9199C3.75216 24.9199 3 24.1678 3 23.2399C3 17.0543 8.01441 12.0399 14.2 12.0399C15.1278 12.0399 15.88 12.7921 15.88 13.7199C15.88 14.6478 15.1278 15.3999 14.2 15.3999C9.87009 15.3999 6.36 18.91 6.36 23.2399C6.36 24.1678 5.60784 24.9199 4.68 24.9199Z" fill="#0DBD8B"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M29.32 17.0801C30.2478 17.0801 31 17.8322 31 18.7601C31 24.9457 25.9856 29.9601 19.8 29.9601C18.8722 29.9601 18.12 29.2079 18.12 28.2801C18.12 27.3522 18.8722 26.6001 19.8 26.6001C24.1299 26.6001 27.64 23.09 27.64 18.7601C27.64 17.8322 28.3922 17.0801 29.32 17.0801Z" fill="#0DBD8B"/>
+            </svg>    
          </span>
          <p>Set up Element on iOS or Android</p>
      </div>
--- a/src/vector/platform/VectorBasePlatform.ts
+++ b/src/vector/platform/VectorBasePlatform.ts
@@ -23,14 +23,6 @@ import {getVectorConfig} from "../getconfig";

 import Favicon from "../../favicon";

-export const updateCheckStatusEnum = {
-    CHECKING: 'CHECKING',
-    ERROR: 'ERROR',
-    NOTAVAILABLE: 'NOTAVAILABLE',
-    DOWNLOADING: 'DOWNLOADING',
-    READY: 'READY',
-};
-
 /**
 * Vector-specific extensions to the BasePlatform template
 */
--- a/src/vector/platform/WebPlatform.ts
+++ b/src/vector/platform/WebPlatform.ts
@@ -173,8 +173,6 @@ export default class WebPlatform extends VectorBasePlatform {
    }

    getDefaultDeviceDisplayName(): string {
-        return "unknown browser " + Math.round(Number.MAX_SAFE_INTEGER * Math.random());
-
        // strip query-string and fragment from uri
        const u = url.parse(window.location.href);
        u.protocol = "";
--- a/src/vector/static/incompatible-browser.html
+++ b/src/vector/static/incompatible-browser.html
@@ -13,11 +13,7 @@
        }

        body {
-            background: #c5e0f7;
-            background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
-            background: -webkit-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
-            background: linear-gradient(to bottom, #c5e0f7 0%, #ffffff 100%);
-            filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#c5e0f7', endColorstr='#ffffff', GradientType=0);
+            background: #f9fafb;
            max-width: 680px;
            margin: auto;
            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
@@ -94,7 +90,7 @@
        }

        .mx_FooterLink {
-            color: #368BD6;
+            color: #0dbd8b;
            text-decoration: none;
        }

@@ -143,25 +139,12 @@
 <div class="mx_HomePage_container">
    <div class="mx_HomePage_header">
          <span class="mx_HomePage_logo">
-              <svg width="34px" height="42px" viewBox="0 0 34 42" version="1.1" xmlns="http://www.w3.org/2000/svg"
-                   xmlns:xlink="http://www.w3.org/1999/xlink">
-                  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-                      <g id="blue" transform="translate(1.000000, 1.000000)">
-                          <path
-                              d="M11.6756011,11.3799998 L11.6756011,17.149751 L17.5348252,17.1437188 C17.6092313,17.1437188 17.6771226,17.1417081 17.744671,17.1373516 C19.2852547,17.0358104 20.4894678,15.7727453 20.4894678,14.2620269 C20.4894678,12.6725555 19.1669592,11.3799998 17.5406542,11.3799998 L11.6756011,11.3799998 Z M5.88083947,39.8778856 C2.68069092,39.8778856 0.0860778277,37.342372 0.0860778277,34.2143673 L0.0860778277,23.4205057 C0.0651618241,23.2247959 0.0538388139,23.025735 0.0538388139,22.8243282 C0.0535037238,22.6192351 0.0644760535,22.416823 0.0860778277,22.2170918 L0.0860778277,5.71648153 C0.0860778277,2.58847681 2.68069092,0.0526281121 5.88083947,0.0526281121 L17.5406542,0.0526281121 C25.5573126,0.0526281121 32.079334,6.42693471 32.079334,14.2620269 C32.079334,21.7113966 26.1261594,27.9382507 18.5264495,28.4382489 C18.2034515,28.4600316 17.8705099,28.4710906 17.5406542,28.4710906 L11.6756011,28.4767876 L11.6756011,34.2143673 C11.6756011,37.342372 9.08133089,39.8778856 5.88083947,39.8778856 L5.88083947,39.8778856 Z"
-                              id="Fill-1" fill="#A2DDEF"></path>
-                          <path
-                              d="M11.6756011,11.3799998 L11.6756011,17.149751 L17.5348252,17.1437188 C17.6092313,17.1437188 17.6771226,17.1417081 17.744671,17.1373516 C19.2852547,17.0358104 20.4894678,15.7727453 20.4894678,14.2620269 C20.4894678,12.6725555 19.1669592,11.3799998 17.5406542,11.3799998 L11.6756011,11.3799998 Z M5.88083947,39.8778856 C2.68069092,39.8778856 0.0860778277,37.342372 0.0860778277,34.2143673 L0.0860778277,23.4205057 C0.0651618241,23.2247959 0.0538388139,23.025735 0.0538388139,22.8243282 C0.0535037238,22.6192351 0.0644760535,22.416823 0.0860778277,22.2170918 L0.0860778277,5.71648153 C0.0860778277,2.58847681 2.68069092,0.0526281121 5.88083947,0.0526281121 L17.5406542,0.0526281121 C25.5573126,0.0526281121 32.079334,6.42693471 32.079334,14.2620269 C32.079334,21.7113966 26.1261594,27.9382507 18.5264495,28.4382489 C18.2034515,28.4600316 17.8705099,28.4710906 17.5406542,28.4710906 L11.6756011,28.4767876 L11.6756011,34.2143673 C11.6756011,37.342372 9.08133089,39.8778856 5.88083947,39.8778856 Z"
-                              id="Stroke-3" stroke="#368BD6" stroke-width="1.02344117"></path>
-                          <path
-                              d="M5.88087375,34.2142667 L5.88087375,5.716381 L17.5406885,5.716381 C22.3695423,5.716381 26.2842638,9.54243948 26.2842638,14.2619264 C26.2842638,18.7857035 22.6877398,22.488438 18.1373089,22.7876997 C17.939807,22.8007693 17.7412764,22.8074717 17.5406885,22.8074717 L5.84864254,22.8188658"
-                              id="Stroke-5" stroke="#368BD6" stroke-width="1.02344117" stroke-linecap="round"></path>
-                          <path
-                              d="M22.882533,19.5375774 L31.0723484,30.9604582 C32.909185,33.5221111 32.2731328,37.0539347 29.6524604,38.8484992 C28.640263,39.5418613 27.480282,39.8746349 26.3319591,39.8746349 C24.505752,39.8746349 22.709033,39.0334852 21.5812832,37.4607697 L13.3914677,26.0378889 C11.5549741,23.476236 12.1910263,19.9444124 14.8116987,18.1498479 C17.432371,16.3539429 21.0460393,16.9759245 22.882533,19.5375774 Z M10.6558259,2.46823596 C11.5442417,3.70717248 11.8854126,5.21051822 11.6165905,6.69945383 C11.3474256,8.1893948 10.5004989,9.48731234 9.23182325,10.3549365 C6.61252242,12.1461499 2.98925341,11.5224926 1.15515992,8.96452603 C0.266744094,7.72558951 -0.0744267831,6.22257889 0.194738181,4.73297304 C0.463560259,3.24336719 1.31048696,1.94511453 2.57950547,1.07782546 C5.19880631,-0.713387872 8.82173243,-0.08973062 10.6558259,2.46823596 Z"
-                              id="Combined-Shape" fill="#368BD6"></path>
-                      </g>
-                  </g>
-              </svg>
+            <svg width="34" height="42" viewBox="0 0 34 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path 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"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M20.92 33.32C20.92 34.2478 20.1679 35 19.24 35C13.0544 35 8.04001 29.9856 8.04001 23.8C8.04001 22.8722 8.79217 22.12 9.72001 22.12C10.6478 22.12 11.4 22.8722 11.4 23.8C11.4 28.1299 14.9101 31.64 19.24 31.64C20.1679 31.64 20.92 32.3922 20.92 33.32Z" fill="#0DBD8B"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M4.68 24.9199C3.75216 24.9199 3 24.1678 3 23.2399C3 17.0543 8.01441 12.0399 14.2 12.0399C15.1278 12.0399 15.88 12.7921 15.88 13.7199C15.88 14.6478 15.1278 15.3999 14.2 15.3999C9.87009 15.3999 6.36 18.91 6.36 23.2399C6.36 24.1678 5.60784 24.9199 4.68 24.9199Z" fill="#0DBD8B"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M29.32 17.0801C30.2478 17.0801 31 17.8322 31 18.7601C31 24.9457 25.9856 29.9601 19.8 29.9601C18.8722 29.9601 18.12 29.2079 18.12 28.2801C18.12 27.3522 18.8722 26.6001 19.8 26.6001C24.1299 26.6001 27.64 23.09 27.64 18.7601C27.64 17.8322 28.3922 17.0801 29.32 17.0801Z" fill="#0DBD8B"/>
+            </svg>   
          </span>
        <h1>Unsupported browser</h1>
    </div>
--- a/src/vector/static/unable-to-load.html
+++ b/src/vector/static/unable-to-load.html
@@ -1,3 +1,4 @@
+
 <meta name="viewport" content="width=device-width, initial-scale=1.0">

 <head>
@@ -13,11 +14,7 @@
        }

        body {
-            background: #c5e0f7;
-            background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
-            background: -webkit-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
-            background: linear-gradient(to bottom, #c5e0f7 0%, #ffffff 100%);
-            filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#c5e0f7', endColorstr='#ffffff', GradientType=0);
+            background: #f9fafb;
            max-width: 680px;
            margin: auto;
            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
@@ -104,7 +101,7 @@
        }

        .mx_FooterLink {
-            color: #368BD6;
+            color: ##0dbd8b;
            text-decoration: none;
        }

@@ -157,25 +154,12 @@
 <div class="mx_HomePage_container">
    <div class="mx_HomePage_header">
          <span class="mx_HomePage_logo">
-              <svg width="34px" height="42px" viewBox="0 0 34 42" version="1.1" xmlns="http://www.w3.org/2000/svg"
-                   xmlns:xlink="http://www.w3.org/1999/xlink">
-                  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-                      <g id="blue" transform="translate(1.000000, 1.000000)">
-                          <path
-                              d="M11.6756011,11.3799998 L11.6756011,17.149751 L17.5348252,17.1437188 C17.6092313,17.1437188 17.6771226,17.1417081 17.744671,17.1373516 C19.2852547,17.0358104 20.4894678,15.7727453 20.4894678,14.2620269 C20.4894678,12.6725555 19.1669592,11.3799998 17.5406542,11.3799998 L11.6756011,11.3799998 Z M5.88083947,39.8778856 C2.68069092,39.8778856 0.0860778277,37.342372 0.0860778277,34.2143673 L0.0860778277,23.4205057 C0.0651618241,23.2247959 0.0538388139,23.025735 0.0538388139,22.8243282 C0.0535037238,22.6192351 0.0644760535,22.416823 0.0860778277,22.2170918 L0.0860778277,5.71648153 C0.0860778277,2.58847681 2.68069092,0.0526281121 5.88083947,0.0526281121 L17.5406542,0.0526281121 C25.5573126,0.0526281121 32.079334,6.42693471 32.079334,14.2620269 C32.079334,21.7113966 26.1261594,27.9382507 18.5264495,28.4382489 C18.2034515,28.4600316 17.8705099,28.4710906 17.5406542,28.4710906 L11.6756011,28.4767876 L11.6756011,34.2143673 C11.6756011,37.342372 9.08133089,39.8778856 5.88083947,39.8778856 L5.88083947,39.8778856 Z"
-                              id="Fill-1" fill="#A2DDEF"></path>
-                          <path
-                              d="M11.6756011,11.3799998 L11.6756011,17.149751 L17.5348252,17.1437188 C17.6092313,17.1437188 17.6771226,17.1417081 17.744671,17.1373516 C19.2852547,17.0358104 20.4894678,15.7727453 20.4894678,14.2620269 C20.4894678,12.6725555 19.1669592,11.3799998 17.5406542,11.3799998 L11.6756011,11.3799998 Z M5.88083947,39.8778856 C2.68069092,39.8778856 0.0860778277,37.342372 0.0860778277,34.2143673 L0.0860778277,23.4205057 C0.0651618241,23.2247959 0.0538388139,23.025735 0.0538388139,22.8243282 C0.0535037238,22.6192351 0.0644760535,22.416823 0.0860778277,22.2170918 L0.0860778277,5.71648153 C0.0860778277,2.58847681 2.68069092,0.0526281121 5.88083947,0.0526281121 L17.5406542,0.0526281121 C25.5573126,0.0526281121 32.079334,6.42693471 32.079334,14.2620269 C32.079334,21.7113966 26.1261594,27.9382507 18.5264495,28.4382489 C18.2034515,28.4600316 17.8705099,28.4710906 17.5406542,28.4710906 L11.6756011,28.4767876 L11.6756011,34.2143673 C11.6756011,37.342372 9.08133089,39.8778856 5.88083947,39.8778856 Z"
-                              id="Stroke-3" stroke="#368BD6" stroke-width="1.02344117"></path>
-                          <path
-                              d="M5.88087375,34.2142667 L5.88087375,5.716381 L17.5406885,5.716381 C22.3695423,5.716381 26.2842638,9.54243948 26.2842638,14.2619264 C26.2842638,18.7857035 22.6877398,22.488438 18.1373089,22.7876997 C17.939807,22.8007693 17.7412764,22.8074717 17.5406885,22.8074717 L5.84864254,22.8188658"
-                              id="Stroke-5" stroke="#368BD6" stroke-width="1.02344117" stroke-linecap="round"></path>
-                          <path
-                              d="M22.882533,19.5375774 L31.0723484,30.9604582 C32.909185,33.5221111 32.2731328,37.0539347 29.6524604,38.8484992 C28.640263,39.5418613 27.480282,39.8746349 26.3319591,39.8746349 C24.505752,39.8746349 22.709033,39.0334852 21.5812832,37.4607697 L13.3914677,26.0378889 C11.5549741,23.476236 12.1910263,19.9444124 14.8116987,18.1498479 C17.432371,16.3539429 21.0460393,16.9759245 22.882533,19.5375774 Z M10.6558259,2.46823596 C11.5442417,3.70717248 11.8854126,5.21051822 11.6165905,6.69945383 C11.3474256,8.1893948 10.5004989,9.48731234 9.23182325,10.3549365 C6.61252242,12.1461499 2.98925341,11.5224926 1.15515992,8.96452603 C0.266744094,7.72558951 -0.0744267831,6.22257889 0.194738181,4.73297304 C0.463560259,3.24336719 1.31048696,1.94511453 2.57950547,1.07782546 C5.19880631,-0.713387872 8.82173243,-0.08973062 10.6558259,2.46823596 Z"
-                              id="Combined-Shape" fill="#368BD6"></path>
-                      </g>
-                  </g>
-              </svg>
+            <svg width="34" height="42" viewBox="0 0 34 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path 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"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M20.92 33.32C20.92 34.2478 20.1679 35 19.24 35C13.0544 35 8.04001 29.9856 8.04001 23.8C8.04001 22.8722 8.79217 22.12 9.72001 22.12C10.6478 22.12 11.4 22.8722 11.4 23.8C11.4 28.1299 14.9101 31.64 19.24 31.64C20.1679 31.64 20.92 32.3922 20.92 33.32Z" fill="#0DBD8B"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M4.68 24.9199C3.75216 24.9199 3 24.1678 3 23.2399C3 17.0543 8.01441 12.0399 14.2 12.0399C15.1278 12.0399 15.88 12.7921 15.88 13.7199C15.88 14.6478 15.1278 15.3999 14.2 15.3999C9.87009 15.3999 6.36 18.91 6.36 23.2399C6.36 24.1678 5.60784 24.9199 4.68 24.9199Z" fill="#0DBD8B"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M29.32 17.0801C30.2478 17.0801 31 17.8322 31 18.7601C31 24.9457 25.9856 29.9601 19.8 29.9601C18.8722 29.9601 18.12 29.2079 18.12 28.2801C18.12 27.3522 18.8722 26.6001 19.8 26.6001C24.1299 26.6001 27.64 23.09 27.64 18.7601C27.64 17.8322 28.3922 17.0801 29.32 17.0801Z" fill="#0DBD8B"/>
+            </svg>
          </span>
        <h1>Unable to load</h1>
    </div>
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -40,8 +40,8 @@ module.exports = (env, argv) => {
            "usercontent": "./node_modules/matrix-react-sdk/src/usercontent/index.js",

            // CSS themes
-            "theme-element": "./node_modules/matrix-react-sdk/res/themes/element/css/element.scss",
-            "theme-element-dark": "./node_modules/matrix-react-sdk/res/themes/element-dark/css/element-dark.scss",
+            "theme-legacy": "./node_modules/matrix-react-sdk/res/themes/legacy-light/css/legacy-light.scss",
+            "theme-legacy-dark": "./node_modules/matrix-react-sdk/res/themes/legacy-dark/css/legacy-dark.scss",
            "theme-light": "./node_modules/matrix-react-sdk/res/themes/light/css/light.scss",
            "theme-dark": "./node_modules/matrix-react-sdk/res/themes/dark/css/dark.scss",
            "theme-light-custom": "./node_modules/matrix-react-sdk/res/themes/light-custom/css/light-custom.scss",
Author	SHA1	Message	Date
J. Ryan Stinnett	b720c8a138	Merge remote-tracking branch 'origin/develop' into element	2020-07-15 10:35:45 +01:00
Michael Telatynski	989c4a3acc	Merge pull request #14472 from vector-im/t3chguy/clean-up Remove redundant enum	2020-07-15 09:58:12 +01:00
Michael Telatynski	18aab5f655	Remove redundant enum Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-15 09:46:39 +01:00
J. Ryan Stinnett	4ec679aaed	Merge branch 'jryans/restore-device-name' into 'element' Restore device name See merge request new-vector/element/element-web/element-web!11	2020-07-15 08:41:47 +00:00
J. Ryan Stinnett	715a4f8dac	Restore device name	2020-07-15 09:38:55 +01:00
Travis Ralston	970859629b	Merge branch 'develop' into element	2020-07-14 15:04:48 -06:00
Jorik Schellekens	219a190e96	Merge pull request #14355 from vector-im/joriks/delabs-font-scaling Remove font scaling from labs	2020-07-14 22:01:22 +01:00
J. Ryan Stinnett	1d90820b10	Merge branch 'jryans/device-name' into 'element' Use a safe but sane device name See merge request new-vector/element/element-web/element-web!10	2020-07-14 20:56:11 +00:00
J. Ryan Stinnett	0fa2941188	Use a safe but sane device name	2020-07-14 21:54:44 +01:00
Jorik Schellekens	f5209c0d7e	Merge branch 'develop' of github.com:vector-im/riot-web into joriks/delabs-font-scaling	2020-07-14 21:51:41 +01:00
Matthew Hodgson	225d2ad931	new wallpaper	2020-07-14 21:44:26 +01:00
J. Ryan Stinnett	f70f3c7796	Merge branch 'bwindels/polish' into 'element' update accent color See merge request new-vector/element/element-web/element-web!9	2020-07-14 19:35:46 +00:00
J. Ryan Stinnett	f23e017463	Merge branch 'nadonomy/reskin-static' into 'element' Reskin static pages to look less riotous See merge request new-vector/element/element-web/element-web!8	2020-07-14 18:54:33 +00:00
Nad Chishtie	80d389dfb4	Reskin static pages to look less riotous	2020-07-14 19:52:39 +01:00
Bruno Windels	f1d144a159	update accent color	2020-07-14 20:37:05 +02:00
Bruno Windels	00273d01b1	Merge branch 'bwindels/restyle-blurry-login-box' into 'element' style blurry login box See merge request new-vector/element/element-web/element-web!7	2020-07-14 18:22:41 +00:00
Bruno Windels	cb0184398a	style blurry login box	2020-07-14 20:18:23 +02:00
J. Ryan Stinnett	74e15ab892	Merge branch 'nadonomy/favicon' into 'element' Update favicon to have rounded corners, better spacing See merge request new-vector/element/element-web/element-web!6	2020-07-14 18:10:10 +00:00
Nad Chishtie	2e4e8f4d1c	Update favicon to have rounded corners, better spacing	2020-07-14 19:07:40 +01:00
Bruno Windels	a1f9f6c77a	Merge branch 'element-update-icons' into 'element' update welcome icons See merge request new-vector/element/element-web/element-web!5	2020-07-14 17:54:13 +00:00
Bruno Windels	a3998eb804	update welcome icons	2020-07-14 19:47:58 +02:00
J. Ryan Stinnett	0f5621b010	Update manifest names	2020-07-14 17:58:33 +01:00
Bruno Windels	5bce586b04	Merge branch 'element-rename-theme' into 'element' Rename element theme See merge request new-vector/element/element-web/element-web!4	2020-07-14 16:46:49 +00:00
Bruno Windels	29a1862912	rename element theme to light/dark to apply old prefs	2020-07-14 18:40:57 +02:00
J. Ryan Stinnett	8d0f57d62d	Merge branch 'jryans/remove-brand' into 'element' Move config files, update brand See merge request new-vector/element/element-web/element-web!3	2020-07-13 20:44:18 +00:00
J. Ryan Stinnett	847d40f83b	Merge branch 'jryans/rename-strings' into 'element' Update many brand name strings and URLs See merge request new-vector/element/element-web/element-web!2	2020-07-13 20:43:45 +00:00
J. Ryan Stinnett	fff29d5663	Merge remote-tracking branch 'origin/develop' into element	2020-07-13 18:48:34 +01:00
J. Ryan Stinnett	e3e2bd1e7b	Update brand to new name	2020-07-13 18:43:02 +01:00
J. Ryan Stinnett	e737fccd5a	Move app config files to new name	2020-07-13 18:34:46 +01:00
Travis Ralston	c94f55ecaf	Merge pull request #14375 from vector-im/travis/room-list/enable Update documentation and remove labs flag for new room list	2020-07-13 06:56:28 -06:00
Travis Ralston	e6706b0e7b	Merge branch 'develop' into travis/room-list/enable	2020-07-10 21:34:42 -06:00
Travis Ralston	28b5b0b552	Update labs.md for new room list	2020-07-07 14:00:52 -06:00
Travis Ralston	81f8a81105	Remove labs flag from config	2020-07-07 13:58:10 -06:00
Jorik Schellekens	817759f590	Remove font scaling from labs	2020-07-06 15:45:30 +01:00