Merge branch 'matrix-two' into matrixtwo/previews

.storybook/main.js

@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 module.exports = {
     stories: ['../src/**/*.stories.tsx'],
     addons: [
@@ -13,3 +29,4 @@ module.exports = {
         '@storybook/addon-backgrounds/register',
     ],
 };
+

.storybook/preview.js

@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import React from 'react';
 import { addDecorator } from '@storybook/react';
 import { withA11y } from '@storybook/addon-a11y';
@@ -7,8 +23,6 @@ import { addParameters } from '@storybook/react';
 
 import SingleColumn from '../src/layouts/SingleColumn';
 
-
-
 // Default styles
 import "../src/index.scss";
 
@@ -28,3 +42,4 @@ addParameters({
         {name: 'white', value: '#FFFFFF'},
     ],
 });
+

src/components/CreateLinkTile.stories.tsx

@@ -23,8 +23,7 @@ export default {
     parameters: {
         design: {
             type: "figma",
-            url:
+            url: "https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A1",
-                "https://www.figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A1",
         },
     },
 };

src/components/Input.stories.tsx

@@ -25,8 +25,7 @@ export default {
     parameters: {
         design: {
             type: "figma",
-            url:
+            url: "https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A1",
-                "https://www.figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=59%3A1",
         },
     },
     decorators: [withDesign],

src/components/TextButton.stories.tsx

@@ -23,8 +23,7 @@ export default {
     parameters: {
         design: {
             type: "figma",
-            url:
+            url: "https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=149%3A10756",
-                "https://www.figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=149%3A10756",
         },
     },
 };

src/components/Tile.stories.tsx

@@ -23,8 +23,7 @@ export default {
     parameters: {
         design: {
             type: "figma",
-            url:
+            url: "https://figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=143%3A5853",
-                "https://www.figma.com/file/WSXjCGc1k6FVI093qhlzOP/04-Recieving-share-link?node-id=143%3A5853",
         },
     },
 };