Merge branch 'os1-rc' into mp/os1/launch

pkg/interface/chat/src/js/components/lib/invite-search.js

@@ -36,7 +36,9 @@ export class InviteSearch extends Component {
     let peers = [],
     peerSet = new Set();
     Object.keys(this.props.groups).map(group => {
+      if (this.props.groups[group].size > 0) {
         peerSet.add(...this.props.groups[group]);
+      }
     });
     peers = Array.from(peerSet);
 

pkg/interface/publish/src/css/custom.css

@@ -176,3 +176,38 @@ a {
 .no-scrollbar::-webkit-scrollbar {
   display: none;
 }
+
+.md h1, .md h2, .md h3, .md h4, .md h5, .md p, .md a, .md ul, .md blockquote,.md code,.md pre {
+  font-size: 14px;
+  margin-bottom: 16px;
+}
+
+.md h2, .md h3, .md h4, .md h5, .md p, .md a, .md ul {
+  font-weight: 400;
+}
+
+.md h1 {
+  font-weight: 600;
+}
+
+.md h2, .md h3, .md h4, .md h5 {
+  color:var(--gray);
+}
+
+.md p {
+  line-height: 1.5;
+}
+.md code, .md pre {
+  font-family: "Source Code Pro", mono;
+}
+.md ul>li {
+  line-height: 1.5;
+}
+.md a {
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+}
+
+md img {
+  margin-bottom: 8px;
+}

pkg/interface/publish/src/js/components/lib/comments.js

@@ -45,7 +45,7 @@ export class Comments extends Component {
 
             </textarea>
           </div>
-          <button onClick={this.commentSubmit} className="f9 pa2 bg-white br1 ba b--gray2 gray2">
+          <button onClick={this.commentSubmit} className="f9 pa2 bg-white br1 ba b--gray2 gray2 pointer">
             Add comment
           </button>
         </div>

pkg/interface/publish/src/js/components/lib/note-navigation.js

@@ -51,7 +51,7 @@ export class NoteNavigation extends Component {
     }
 
     return (
-        <div className="flex mt4">
+        <div className="flex pt4">
           {prevComponent}
           {nextComponent}
         </div>

pkg/interface/publish/src/js/components/lib/note.js

@@ -2,8 +2,7 @@ import React, { Component } from 'react';
 import { Comments } from './comments';
 import { NoteNavigation } from './note-navigation';
 import moment from 'moment';
-import ReactMarkdown from 'react-markdown'
-// import test from 'test.json';
+import ReactMarkdown from 'react-markdown';
 //TODO ask for note if we don't have it
 //TODO initialise note if no state
 
@@ -129,13 +128,14 @@ export class Note extends Component {
           <div className="w-100 mw6">
             <div className="flex flex-column">
               <div className="f9 mb1">{title}</div>
-              <div className="flex">
+              <div className="flex mb6">
                 <div className="di f9 mono gray2 mr2">{author}</div>
                 <div className="di f9 gray2">{date}</div>
               </div>
             </div>
-
+            <div className="md">
               <ReactMarkdown source={newfile} />
+            </div>
             <NoteNavigation
               prev={prev}
               next={next}