Merge pull request #2237 from urbit/jy/markdown-note

Jy/markdown note
This commit is contained in:
matildepark 2020-02-05 19:03:59 -05:00 committed by GitHub
commit 89619b6666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 9 deletions

View File

@ -176,3 +176,38 @@ a {
.no-scrollbar::-webkit-scrollbar { .no-scrollbar::-webkit-scrollbar {
display: none; 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;
}

View File

@ -45,7 +45,7 @@ export class Comments extends Component {
</textarea> </textarea>
</div> </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 Add comment
</button> </button>
</div> </div>

View File

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

View File

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