Merge pull request #219 from matrix-org/t3chguy/msc3266

matrix-org · Aug 13, 2021 · c25a9da · c25a9da
2 parents 2acec4f + acd8813
commit c25a9da
Show file tree

Hide file tree

Showing 33 changed files with 834 additions and 804 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 build
 *.tar.gz
+/.idea
diff --git a/css/main.css b/css/main.css
@@ -21,31 +21,31 @@ limitations under the License.
 @import url('open.css');
 
 :root {
-	--app-background: #f4f4f4;
-	--background: #ffffff;
-	--foreground: #000000;
-	--font: #333333;
-	--grey: #666666;
-	--accent: #0098d4;
-	--error: #d6001c;
-	--link: #0098d4;
-	--borders: #f4f4f4;
+    --app-background: #f4f4f4;
+    --background: #ffffff;
+    --foreground: #000000;
+    --font: #333333;
+    --grey: #666666;
+    --accent: #0098d4;
+    --error: #d6001c;
+    --link: #0098d4;
+    --borders: #f4f4f4;
     --lightgrey: #E6E6E6;
     --spinner-stroke-size: 2px;
 }
 
 html {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 body {
-	background-color: var(--app-background);
-	background-image: url('../images/background.svg');
+    background-color: var(--app-background);
+    background-image: url('../images/background.svg');
     background-attachment: fixed;
-	background-repeat: no-repeat;
-	background-size: auto;
-	background-position: center -50px;
+    background-repeat: no-repeat;
+    background-size: auto;
+    background-position: center -50px;
     height: 100%;
     width: 100%;
     font-size: 14px;
@@ -89,12 +89,12 @@ input[type="checkbox"], input[type="radio"] {
 
 .RootView {
     margin: 0 auto;
-	max-width: 480px;
-	width: 100%;
+    max-width: 480px;
+    width: 100%;
 }
 
 .card {
-	background-color: var(--background);
+    background-color: var(--background);
     border-radius: 16px;
     box-shadow: 0px 18px 24px rgba(0, 0, 0, 0.06);
 }
@@ -104,20 +104,20 @@ input[type="checkbox"], input[type="radio"] {
 }
 
 .hidden {
-	display: none !important;
+    display: none !important;
 }
 
 
 @media screen and (max-width: 480px) {
     body {
-    	background-image: none;
-    	background-color: var(--background);
-    	padding: 0;
+        background-image: none;
+        background-color: var(--background);
+        padding: 0;
     }
 
     .card {
-    	border-radius: unset;
-    	box-shadow: unset;
+        border-radius: unset;
+        box-shadow: unset;
     }
 }
 
@@ -141,7 +141,7 @@ input[type="checkbox"], input[type="radio"] {
 }
 
 a, button.text {
-	color: var(--link);
+    color: var(--link);
 }
 
 button.text {

diff --git a/css/preview.css b/css/preview.css
@@ -22,6 +22,10 @@
     height: 64px;
 }
 
+.PreviewView .mxSpace .avatar {
+    border-radius: 12px;
+}
+
 .PreviewView .defaultAvatar {
     width: 64px;
     height: 64px;

diff --git a/images/client-icons/fluffychat.svg b/images/client-icons/fluffychat.svg
diff --git a/index.html b/index.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<meta charset="utf-8">
-	<title>You're invited to talk on Matrix</title>
-	<meta name="description" content="You're invited to talk on Matrix">
-	<meta name="viewport" content="width=device-width, user-scalable=no">
-	<link rel="stylesheet" type="text/css" href="css/main.css">
+    <meta charset="utf-8">
+    <title>You're invited to talk on Matrix</title>
+    <meta name="description" content="You're invited to talk on Matrix">
+    <meta name="viewport" content="width=device-width, user-scalable=no">
+    <link rel="stylesheet" type="text/css" href="css/main.css">
 </head>
 <body>
-	<script id="main" type="module">
-		import {main} from "./src/main.js";
-		main(document.body);
-	</script>
+    <script id="main" type="module">
+        import {main} from "./src/main.js";
+        main(document.body);
+    </script>
     <noscript>
         <h1>Please enable javascript</h1>
         <p>Matrix.to is a preview service from chat rooms, people and communities on <a href="https://matrix.org">Matrix</a>.</p>

diff --git a/scripts/serve-local.js b/scripts/serve-local.js
@@ -23,25 +23,26 @@ const projectDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), ".
 
 // Serve up parent directory with cache disabled
 const serve = serveStatic(
-	projectDir,
-	{
-		etag: false,
-		setHeaders: res => {
-			res.setHeader("Pragma", "no-cache");
-			res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
-			res.setHeader("Expires", "Wed, 21 Oct 2015 07:28:00 GMT");
+    projectDir,
+    {
+        etag: false,
+        setHeaders: res => {
+            res.setHeader("Pragma", "no-cache");
+            res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+            res.setHeader("Expires", "Wed, 21 Oct 2015 07:28:00 GMT");
             // same CSP as matrix.to server is using, so local testing happens under similar environment
             res.setHeader("Content-Security-Policy", "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src * data:; connect-src *; font-src 'self'; manifest-src 'self'; form-action 'self'; navigate-to *;");
-		},
-		index: ['index.html', 'index.htm']
-	}
+        },
+        index: ['index.html', 'index.htm']
+    }
 );
 
 // Create server
 const server = http.createServer(function onRequest (req, res) {
     console.log(req.method, req.url);
-	serve(req, res, finalhandler(req, res))
+    serve(req, res, finalhandler(req, res))
 });
 
 // Listen
 server.listen(5000);
+console.log("Listening on port 5000");