Merge branch 'master' into common-good

This commit is contained in:
Cinnamon 2020-01-23 11:10:22 -08:00 committed by GitHub
commit 9064e2fe2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 5 deletions

View File

@ -32,6 +32,8 @@ Most people should install Oasis with [npm](https://npmjs.org/).
npm --global install @fraction/oasis@latest
```
Please make sure that your Node.js version is the [**current** or **active LTS** release](https://nodejs.org/en/about/releases/).
Want more? Check out [`install.md`](https://github.com/fraction/oasis/blob/master/docs/install.md).
## Resources

4
src/assets/favicon.svg Normal file
View File

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15">
<title>oasis favicon</title>
<text x="0" y="15">🏝️</text>
</svg>

After

Width:  |  Height:  |  Size: 139 B

View File

@ -237,10 +237,14 @@ exports.metaView = ({ status, peers, theme, themeNames }) => {
button({ type: "submit" }, "set theme")
),
base16Elements,
h2("Status"),
h3("Indexes"),
progressElements,
peerList.length > 0 ? [h3("Peers"), ul(peerList)] : null
h2('Status'),
h3('Peer Connections 💻⚡️💻'),
p('Your computer is syncing data with these other computers. It will connect to any scuttlebutt pub and peer it can find, even if you have no relationship with them, as it looks for data from your friends.'),
peerList.length > 0
? ul(peerList)
: code('no peers connected'),
h3('Indexes'),
progressElements
)
);
};

View File

@ -25,10 +25,11 @@ module.exports = (...elements) => {
const nodes = html(
{ lang: "en" },
head(
title("🏝️ Oasis"),
title("Oasis"),
link({ rel: "stylesheet", href: "/theme.css" }),
link({ rel: "stylesheet", href: "/assets/style.css" }),
link({ rel: "stylesheet", href: "/assets/highlight.css" }),
link({ rel: 'icon', type: 'image/svg+xml', href: '/assets/favicon.svg' }),
meta({ charset: "utf-8" }),
meta({
name: "description",