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

Add fonts and color to styling in info addon #6186

Merged
merged 1 commit into from
Mar 21, 2019
Merged

Add fonts and color to styling in info addon #6186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions addons/info/src/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ exports[`addon Info should render <Info /> and external markdown 1`] = `
"background": "white",
"bottom": 0,
"display": "none",
"fontFamily": "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif",
"left": 0,
"overflow": "auto",
"padding": "0 40px",
Expand Down Expand Up @@ -179,6 +178,8 @@ exports[`addon Info should render <Info /> and external markdown 1`] = `
"backgroundColor": "#fff",
"border": "1px solid #eee",
"borderRadius": "2px",
"color": "black",
"fontFamily": "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif",
"fontSize": "15px",
"fontWeight": 300,
"lineHeight": 1.45,
Expand Down Expand Up @@ -1392,7 +1393,6 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
"background": "white",
"bottom": 0,
"display": "none",
"fontFamily": "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif",
"left": 0,
"overflow": "auto",
"padding": "0 40px",
Expand Down Expand Up @@ -1433,6 +1433,8 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
"backgroundColor": "#fff",
"border": "1px solid #eee",
"borderRadius": "2px",
"color": "black",
"fontFamily": "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif",
"fontSize": "15px",
"fontWeight": 300,
"lineHeight": 1.45,
Expand Down Expand Up @@ -2634,6 +2636,8 @@ exports[`addon Info should render component description if story kind matches co
"backgroundColor": "#fff",
"border": "1px solid #eee",
"borderRadius": "2px",
"color": "black",
"fontFamily": "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif",
"fontSize": "15px",
"fontWeight": 300,
"lineHeight": 1.45,
Expand Down Expand Up @@ -2756,6 +2760,8 @@ exports[`addon Info should render component description if story kind matches co
"backgroundColor": "#fff",
"border": "1px solid #eee",
"borderRadius": "2px",
"color": "black",
"fontFamily": "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif",
"fontSize": "15px",
"fontWeight": 300,
"lineHeight": 1.45,
Expand Down Expand Up @@ -3849,6 +3855,8 @@ exports[`addon Info should render component description if story name matches co
"backgroundColor": "#fff",
"border": "1px solid #eee",
"borderRadius": "2px",
"color": "black",
"fontFamily": "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif",
"fontSize": "15px",
"fontWeight": 300,
"lineHeight": 1.45,
Expand Down Expand Up @@ -3971,6 +3979,8 @@ exports[`addon Info should render component description if story name matches co
"backgroundColor": "#fff",
"border": "1px solid #eee",
"borderRadius": "2px",
"color": "black",
"fontFamily": "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif",
"fontSize": "15px",
"fontWeight": 300,
"lineHeight": 1.45,
Expand Down
3 changes: 2 additions & 1 deletion addons/info/src/components/Story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const stylesheetBase = {
},
},
info: {
fontFamily: 'Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif',
position: 'fixed',
background: 'white',
top: 0,
Expand All @@ -51,6 +50,8 @@ const stylesheetBase = {
zIndex: 0,
},
infoBody: {
fontFamily: 'Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif',
color: 'black',
fontWeight: 300,
lineHeight: 1.45,
fontSize: '15px',
Expand Down
4 changes: 2 additions & 2 deletions examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports[`Storyshots Button with new info 1`] = `
</button>
<div
class="info__overlay"
style="font-family:Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif;position:fixed;background:white;top:0;bottom:0;left:0;right:0;padding:0 40px;overflow:auto;z-index:99999;display:none"
style="position:fixed;background:white;top:0;bottom:0;left:0;right:0;padding:0 40px;overflow:auto;z-index:99999;display:none"
>
<button
class="info__close-button"
Expand All @@ -39,7 +39,7 @@ exports[`Storyshots Button with new info 1`] = `
</button>
<div>
<div
style="font-weight:300;line-height:1.45;font-size:15px;border:1px solid #eee;padding:20px 40px 40px;border-radius:2px;background-color:#fff;margin-top:20px;margin-bottom:20px"
style="font-family:Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif;color:black;font-weight:300;line-height:1.45;font-size:15px;border:1px solid #eee;padding:20px 40px 40px;border-radius:2px;background-color:#fff;margin-top:20px;margin-bottom:20px"
>
<div
style="border-bottom:1px solid #eee;padding-top:10px;margin-bottom:10px"
Expand Down
Loading