Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Fix the p > div nesting issue #12298

Merged
merged 5 commits into from
Sep 10, 2020
Merged

UI: Fix the p > div nesting issue #12298

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea18d3a
FIX the p > div nesting issue
ndelangen Aug 28, 2020
7fa3afb
Merge branch 'next' into fix/12139-inproper-html-in-ref
ndelangen Sep 9, 2020
4020e99
FIX
ndelangen Sep 9, 2020
80111ac
FIX versions
ndelangen Sep 9, 2020
d65e75f
Merge branch 'next' into fix/12139-inproper-html-in-ref
ndelangen Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/api/src/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const version = '6.1.0-alpha.4';
export const version = '6.1.0-alpha.4';
2 changes: 1 addition & 1 deletion lib/cli/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
"@storybook/ui": "6.1.0-alpha.4",
"@storybook/vue": "6.1.0-alpha.4",
"@storybook/web-components": "6.1.0-alpha.4"
}
}
9 changes: 7 additions & 2 deletions lib/ui/src/components/sidebar/RefBlocks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ const RootHeading = styled.div(({ theme }) => ({
margin: '0 20px',
}));

const TextStyle = styled.div(({ theme }) => ({
fontSize: theme.typography.size.s2 - 1,
lineHeight: '20px',
margin: 0,
}));
const Text = styled.p(({ theme }) => ({
fontSize: theme.typography.size.s2 - 1,
lineHeight: '20px',
Expand Down Expand Up @@ -229,7 +234,7 @@ export const AuthBlock: FunctionComponent<{ loginUrl: string; id: string }> = ({
export const ErrorBlock: FunctionComponent<{ error: Error }> = ({ error }) => (
<Contained>
<Spaced>
<Text>
<TextStyle>
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
Oh no! Something went wrong loading this Storybook.
<br />
<WithTooltip
Expand All @@ -249,7 +254,7 @@ export const ErrorBlock: FunctionComponent<{ error: Error }> = ({ error }) => (
<Link withArrow href="https://storybook.js.org/docs" cancel={false} target="_blank">
View docs
</Link>
</Text>
</TextStyle>
</Spaced>
</Contained>
);
Expand Down