Skip to content
This repository was archived by the owner on Jun 26, 2022. It is now read-only.

Commit 94ca1c1

Browse files
authored
Upgrade box and change color scheme. (#371)
* add in new version of box * new version of box is rendering * add in new colors and a bunch of fixes for box * add in new snapshots with new version * update some more snapshots
1 parent 9fc30b4 commit 94ca1c1

File tree

54 files changed

+425
-421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+425
-421
lines changed

packages/extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@babel/core": "7.6.0",
88
"@emotion/cache": "^10.0.19",
99
"@emotion/core": "^10.0.17",
10-
"@mujo/box": "^3.0.1",
10+
"@mujo/box": "^4",
1111
"@mujo/eslint-config": "^1.0.4",
1212
"@mujo/ingress": "^0.1.1",
1313
"@mujo/plugins": "^2.2.0",

packages/extension/plugins/mujo-end-screen-affirmations/end-screen-affirmation.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { Box } from '@mujo/box'
21
import { context, EndScreen } from '@mujo/plugins'
3-
import { HeaderL, useTheme } from '@mujo/ui'
2+
import { HeaderL, useTheme, Box } from '@mujo/ui'
43
import React, { useEffect, useMemo, useContext } from 'react'
54
import { HappyFace } from './happy-face'
65

packages/extension/plugins/mujo-end-screen-affirmations/happy-face.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Box } from '@mujo/box'
1+
import { Box } from '@mujo/ui'
22
import React from 'react'
33

44
export const HappyFace = ({

packages/extension/scripts/plugins-resolver.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ const doesExist = async pluginPath => {
5757
}
5858

5959
const createPluginFile = async plugins => {
60-
log('creating plugin file')
61-
console.log(plugins)
6260
const content = `module.exports = [${plugins
6361
.map(plugin => {
6462
const pluginPath = path.relative(

packages/extension/src/__snapshots__/app.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
exports[`should match the snapshot 1`] = `
44
<div
5-
className="css-wnvqk7"
5+
className="css-l9leyy"
66
/>
77
`;

packages/extension/src/app.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { css, Global } from '@emotion/core'
2-
import { Box } from '@mujo/box'
32
import { IngressTarget } from '@mujo/ingress'
4-
import { colors, useTheme } from '@mujo/ui'
3+
import { colors, useTheme, Box } from '@mujo/ui'
54
import React, { memo } from 'react'
65
import { Header } from './components/header'
76
import { InfoModal } from './components/info-modal'
@@ -23,12 +22,9 @@ const radialGradient = (centerColor, outerColor) => {
2322
}
2423

2524
const bodyBackgrounds = {
26-
outerSpace: radialGradient(colors.gravel, colors.outerSpace),
27-
mischka: radialGradient(colors.white, colors.mischka),
25+
dark: radialGradient(colors.black, colors.dark),
26+
light: radialGradient(colors.white, colors.light),
2827
}
29-
30-
const appWrapper = css({ height: '100vh' })
31-
3228
const DEFAULT_SIZE = 40
3329
const factor = x => x * 0.0025
3430
const factorMin = size => Math.max(size, DEFAULT_SIZE)
@@ -55,9 +51,9 @@ const App = memo(() => {
5551
<Box
5652
color={theme.foreground}
5753
display="flex"
58-
direction="column"
54+
flexDirection="column"
5955
position="relative"
60-
{...appWrapper}
56+
css={{ height: '100vh' }}
6157
>
6258
<Global
6359
styles={css`
@@ -93,7 +89,7 @@ const App = memo(() => {
9389
layer="3"
9490
position="relative"
9591
>
96-
<Box flex={0} display="flex" direction="row">
92+
<Box flex={0} display="flex" flexDirection="row">
9793
<Tabs />
9894
</Box>
9995
</Box>

packages/extension/src/components/error-box/frames.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Box } from '@mujo/box'
2-
import { FixedS, FixedL } from '@mujo/ui'
1+
import { FixedS, FixedL, Box } from '@mujo/ui'
32
import React from 'react'
43

54
const FN_SIZE = 25
@@ -19,7 +18,7 @@ export const Frames = ({ frames, error }) => (
1918
marginBottom="xxs"
2019
key={index}
2120
display="flex"
22-
direction="row"
21+
flexDirection="row"
2322
>
2423
<FixedS
2524
Component="pre"

packages/extension/src/components/error-box/index.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { css } from '@emotion/core'
2-
import { Box } from '@mujo/box'
3-
import { HeaderL } from '@mujo/ui'
1+
import { HeaderL, Box } from '@mujo/ui'
42
import ErrorStackParser from 'error-stack-parser'
53
import React from 'react'
64
import { ENVIRONMENT } from '../../env'
@@ -44,14 +42,14 @@ export class ErrorBox extends React.Component {
4442
position="fixed"
4543
backgroundColor="outerSpace"
4644
padding="xl"
47-
{...css({
45+
css={{
4846
top: 0,
4947
left: 0,
5048
bottom: 0,
5149
right: 0,
5250
height: '100vh',
5351
width: '100vw',
54-
})}
52+
}}
5553
>
5654
<HeaderL
5755
maxWidth="500px"

packages/extension/src/components/error-box/message.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Box } from '@mujo/box'
2-
import { BodyS, HeaderS } from '@mujo/ui'
1+
import { BodyS, HeaderS, Box } from '@mujo/ui'
32
import React from 'react'
43
import { useTranslation } from 'react-i18next'
54
import { TRANSLATION_FILE } from '../../constants'

packages/extension/src/components/fav-button/__snapshots__/index.test.js.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`FavButton component matches snapshot 1`] = `
44
<a
5-
className="css-1wtzem9"
5+
className="css-1px3l"
66
disable={false}
77
disabled={true}
88
href="foo"
@@ -21,16 +21,16 @@ exports[`FavButton component matches snapshot 1`] = `
2121
src="https://getmujo.com/api/icon?site=foo"
2222
/>
2323
<div
24-
className="css-19sk4h4"
24+
className="css-l5xv05"
2525
>
2626
<div
2727
className="css-aq08jq"
2828
>
2929
<span
30-
className="css-7son14"
30+
className="css-zfsq8m"
3131
>
3232
<div
33-
className="css-1ht175c"
33+
className="css-ngp4q"
3434
/>
3535
<div
3636
className="css-wuflo1"

0 commit comments

Comments
 (0)