urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-06 21:18:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

theme: cleaning up a few mismatches

Browse Source
This commit is contained in:
Hunter Miller 2021-12-08 17:00:25 -06:00
parent 81a45608a0
commit 3ee9132416
4 changed files with 18768 additions and 10434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/interface/webterm/app.tsx
View File

@ -13,7 +13,7 @@ import { Terminal, ITerminalOptions, ITheme } from 'xterm';
import { FitAddon } from 'xterm-addon-fit'; import { FitAddon } from 'xterm-addon-fit';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import { Box, Col } from '@tlon/indigo-react'; import { Box, Col, Reset, _dark, _light } from '@tlon/indigo-react';
import 'xterm/css/xterm.css'; import 'xterm/css/xterm.css';
@ -23,6 +23,7 @@ import {
} from '@urbit/api/term'; } from '@urbit/api/term';
import bel from './lib/bel'; import bel from './lib/bel';
import { ThemeProvider } from 'styled-components';
type TermAppProps = { type TermAppProps = {
ship: string; ship: string;
@ -32,7 +33,7 @@ const makeTheme = (dark: boolean): ITheme => {
let fg, bg: string; let fg, bg: string;
if (dark) { if (dark) {
fg = 'white'; fg = 'white';
bg = 'black'; bg = 'rgb(26,26,26)';
} else { } else {
fg = 'black'; fg = 'black';
bg = 'white'; bg = 'white';
@ -57,7 +58,8 @@ const termConfig: ITerminalOptions = {
cols: 80, cols: 80,
scrollback: 10000, scrollback: 10000,
// //
fontFamily: '"Source Code Pro","Roboto mono","Courier New",monospace', fontFamily: '"Source Code Pro", "Roboto mono", "Courier New", monospace',
fontWeight: 400,
// NOTE theme colors configured dynamically // NOTE theme colors configured dynamically
// //
bellStyle: 'sound', bellStyle: 'sound',
@ -444,17 +446,19 @@ export default function TermApp(props: TermAppProps) {
return ( return (
<> <>
<ThemeProvider theme={dark ? _dark : _light}>
<Reset />
<Box <Box
width='100%' width='100%'
height='100%' height='100%'
px={['0','3']} p={['0','3']}
pb={['0','3']}
display='flex' display='flex'
id='outer' bg='white'
fontFamily='mono'
> >
<Col <Col
id='inner'
width='100%' width='100%'
height='100%'
minHeight='0' minHeight='0'
color='washedGray' color='washedGray'
borderRadius={['0','2px']} borderRadius={['0','2px']}
@ -464,6 +468,7 @@ export default function TermApp(props: TermAppProps) {
> >
</Col> </Col>
</Box> </Box>
</ThemeProvider>
</> </>
); );
} }

12
pkg/interface/webterm/index.html
View File

@ -18,21 +18,15 @@
"display": "standalone", "display": "standalone",
"background_color": "%23FFFFFF", "background_color": "%23FFFFFF",
"theme_color": "%23000000"}' /> "theme_color": "%23000000"}' />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro&display=swap" rel="stylesheet">
<style> <style>
body, #root { body, #root {
height: 100vh; height: 100vh;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#outer {
box-sizing: border-box;
padding: 16px;
width: 100%;
height: 100%;
}
#inner {
height: 100%;
}
</style> </style>
</head> </head>
<body> <body>

29076
pkg/interface/webterm/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

59
pkg/interface/webterm/package.json
View File

@ -6,60 +6,18 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@reach/disclosure": "^0.10.5",
"@reach/menu-button": "^0.10.5", "@reach/menu-button": "^0.10.5",
"@reach/tabs": "^0.10.5",
"@react-spring/web": "^9.1.1",
"@tlon/indigo-dark": "^1.0.6",
"@tlon/indigo-light": "^1.0.7",
"@tlon/indigo-react": "^1.2.23", "@tlon/indigo-react": "^1.2.23",
"@tlon/sigil-js": "^1.4.3",
"@urbit/api": "^1.1.1", "@urbit/api": "^1.1.1",
"@urbit/http-api": "^1.2.1", "@urbit/http-api": "^1.2.1",
"any-ascii": "^0.1.7",
"aws-sdk": "^2.830.0",
"big-integer": "^1.6.48",
"classnames": "^2.2.6",
"codemirror": "^5.59.2",
"css-loader": "^3.6.0",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"formik": "^2.1.5",
"immer": "^9.0.2",
"lodash": "^4.17.21",
"moment": "^2.29.1",
"mousetrap": "^1.6.5",
"mousetrap-global-bind": "^1.1.0",
"normalize-wheel": "1.0.1",
"oembed-parser": "^1.4.5",
"prop-types": "^15.7.2",
"querystring": "^0.2.0",
"react": "^16.14.0", "react": "^16.14.0",
"react-codemirror2": "^6.0.1",
"react-dom": "^16.14.0", "react-dom": "^16.14.0",
"react-helmet": "^6.1.0",
"react-markdown": "^4.3.1",
"react-oembed-container": "^1.0.0",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-use-gesture": "^9.1.3",
"react-virtuoso": "^0.20.3",
"react-visibility-sensor": "^5.1.1",
"remark": "^12.0.0",
"remark-breaks": "^2.0.2",
"remark-disable-tokenizers": "1.1.0",
"stacktrace-js": "^2.0.2",
"style-loader": "^1.3.0",
"styled-components": "^5.1.1", "styled-components": "^5.1.1",
"styled-system": "^5.1.5", "styled-system": "^5.1.5",
"suncalc": "^1.8.0",
"unist-util-visit": "^3.0.0",
"urbit-ob": "^5.0.1",
"workbox-core": "^6.0.2",
"workbox-precaching": "^6.0.2",
"workbox-recipes": "^6.0.2",
"workbox-routing": "^6.0.2",
"xterm": "^4.15.0", "xterm": "^4.15.0",
"xterm-addon-fit": "^0.5.0", "xterm-addon-fit": "^0.5.0",
"yup": "^0.29.3",
"zustand": "^3.5.0" "zustand": "^3.5.0"
}, },
"devDependencies": { "devDependencies": {
@ -71,17 +29,11 @@
"@babel/preset-env": "^7.12.11", "@babel/preset-env": "^7.12.11",
"@babel/preset-react": "^7.12.10", "@babel/preset-react": "^7.12.10",
"@babel/preset-typescript": "^7.12.7", "@babel/preset-typescript": "^7.12.7",
"@storybook/addon-actions": "^6.2.9",
"@storybook/addon-essentials": "^6.2.9",
"@storybook/addon-links": "^6.2.9",
"@storybook/react": "^6.2.9",
"@types/lodash": "^4.14.168",
"@types/react": "^16.14.2", "@types/react": "^16.14.2",
"@types/react-dom": "^16.9.10", "@types/react-dom": "^16.9.10",
"@types/react-router-dom": "^5.1.7", "@types/react-router-dom": "^5.1.7",
"@types/styled-components": "^5.1.7", "@types/styled-components": "^5.1.7",
"@types/styled-system": "^5.1.10", "@types/styled-system": "^5.1.10",
"@types/yup": "^0.29.11",
"@typescript-eslint/eslint-plugin": "^4.15.0", "@typescript-eslint/eslint-plugin": "^4.15.0",
"@typescript-eslint/parser": "^4.24.0", "@typescript-eslint/parser": "^4.24.0",
"@urbit/eslint-config": "^1.0.0", "@urbit/eslint-config": "^1.0.0",
@ -89,9 +41,7 @@
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3", "babel-jest": "^26.6.3",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-root-import": "^6.6.0", "babel-plugin-root-import": "^6.6.0",
"chromatic": "^5.8.3",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": "^3.0.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"eslint": "^7.26.0", "eslint": "^7.26.0",
@ -101,13 +51,7 @@
"husky": "^6.0.0", "husky": "^6.0.0",
"jest": "^26.6.3", "jest": "^26.6.3",
"lint-staged": "^11.0.0", "lint-staged": "^11.0.0",
"loki": "^0.28.1",
"moment-locales-webpack-plugin": "^1.2.0",
"react-hot-loader": "^4.13.0", "react-hot-loader": "^4.13.0",
"sass": "^1.32.5",
"sass-loader": "^8.0.2",
"storybook-addon-designs": "^6.0.0",
"ts-mdast": "^1.0.0",
"typescript": "^4.2.4", "typescript": "^4.2.4",
"webpack": "^4.46.0", "webpack": "^4.46.0",
"webpack-cli": "^3.3.12", "webpack-cli": "^3.3.12",
@ -123,9 +67,6 @@
"start": "webpack-dev-server --config config/webpack.dev.js", "start": "webpack-dev-server --config config/webpack.dev.js",
"test": "tsc && jest", "test": "tsc && jest",
"jest": "jest", "jest": "jest",
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook",
"chromatic": "chromatic --exit-zero-on-changes",
"hook-lint": "eslint --cache --fix" "hook-lint": "eslint --cache --fix"
}, },
"author": "", "author": "",