Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
kseikyo authored Jul 22, 2023
2 parents 4f06543 + f47ffae commit 64815aa
Show file tree
Hide file tree
Showing 6 changed files with 344 additions and 755 deletions.
46 changes: 38 additions & 8 deletions packages/www/components/Plans/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,12 @@ const Plans = ({
displayCheck={false}
css={{ borderColor: "$neutral5" }}
title={
<Flex css={{ width: "100%", justifyContent: "center" }}>
<Flex
css={{
width: "100%",
justifyContent: "center",
alignItems: "center",
}}>
<span>3,000 minutes</span>
<Tooltip
multiline
Expand Down Expand Up @@ -390,7 +395,12 @@ const Plans = ({
displayCheck={false}
css={{ borderColor: "$neutral5" }}
title={
<Flex css={{ width: "100%", justifyContent: "center" }}>
<Flex
css={{
width: "100%",
justifyContent: "center",
alignItems: "center",
}}>
<span>10,000 minutes</span>
<Tooltip
multiline
Expand Down Expand Up @@ -418,7 +428,12 @@ const Plans = ({
displayCheck={false}
css={{ borderColor: "$neutral5", borderBottom: 0 }}
title={
<Flex css={{ width: "100%", justifyContent: "center" }}>
<Flex
css={{
width: "100%",
justifyContent: "center",
alignItems: "center",
}}>
<span>100,000 minutes</span>
<Tooltip
multiline
Expand Down Expand Up @@ -446,7 +461,7 @@ const Plans = ({
<Item
css={{ borderBottom: 0, fontSize: "11px" }}
displayCheck={false}
title={"*Pay as you go past alloted minutes"}
title={"* Pay as you go past allotted minutes"}
/>
</List>
</Box>
Expand Down Expand Up @@ -507,7 +522,12 @@ const Plans = ({
displayCheck={false}
css={{ borderColor: "$neutral5" }}
title={
<Flex css={{ width: "100%", justifyContent: "center" }}>
<Flex
css={{
width: "100%",
justifyContent: "center",
alignItems: "center",
}}>
<span>20,000 minutes</span>
<Tooltip
multiline
Expand Down Expand Up @@ -535,7 +555,12 @@ const Plans = ({
displayCheck={false}
css={{ borderColor: "$neutral5" }}
title={
<Flex css={{ width: "100%", justifyContent: "center" }}>
<Flex
css={{
width: "100%",
justifyContent: "center",
alignItems: "center",
}}>
<span>50,000 minutes</span>
<Tooltip
multiline
Expand Down Expand Up @@ -563,7 +588,12 @@ const Plans = ({
displayCheck={false}
css={{ borderColor: "$neutral5", borderBottom: 0 }}
title={
<Flex css={{ width: "100%", justifyContent: "center" }}>
<Flex
css={{
width: "100%",
justifyContent: "center",
alignItems: "center",
}}>
<span>500,000 minutes</span>
<Tooltip
multiline
Expand All @@ -590,7 +620,7 @@ const Plans = ({
<Item
css={{ borderBottom: 0, fontSize: "11px" }}
displayCheck={false}
title={"*Pay as you go past alloted minutes"}
title={"* Pay as you go past allotted minutes"}
/>
</List>
</Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const MultistreamTargetsTable = ({
invalidateStream,
invalidateTargetId
),
[state.tableId, stream, streamHealth, ...targets]
[state.tableId, stream, streamHealth, invalidateTargetId, targetRefs]
);

const onCreateClick = stream.isActive
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const StreamPlayerBox = ({
<Box
css={{
width: "100%",
minHeight: 250,
minHeight: 220,
borderRadius: "$2",
position: "relative",
bc: "$panel",
Expand Down
4 changes: 2 additions & 2 deletions packages/www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@emotion/react": "^11.4.0",
"@emotion/styled": "^10.0.23",
"@livepeer.studio/api": "^0.15.0",
"@livepeer/design-system": "^1.0.17",
"@livepeer/react": "^2.7.0",
"@livepeer/design-system": "^1.1.0",
"@livepeer/react": "^2.8.0",
"@mdx-js/loader": "^1.6.16",
"@mdx-js/mdx": "^1.6.16",
"@mdx-js/react": "^1.6.16",
Expand Down
5 changes: 2 additions & 3 deletions packages/www/pages/dashboard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ const Dashboard = () => {
<Box css={{ p: "$6" }}>
{!emailValid && (
<Banner
title="Verify your Email"
description="Verify to the account email, then we'll send you a link to verify
your email."
title="Verify your email"
description="Verify your account with a link via email."
button={
<Button
variant="primary"
Expand Down
Loading

0 comments on commit 64815aa

Please sign in to comment.