From 51d9915343961f5f976491287ca48872db02df66 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 11 Mar 2019 16:19:46 +0800 Subject: [PATCH] Merge pull request #5998 from malykhinvi/sb-5785 Fix #5785 - welcome component in dark theme --- .../storyshot.enzyme.test.js.snap | 4 +- ...t.snapshotWithOptionsFunction.test.js.snap | 4 +- .../__snapshots__/Welcome.stories.foo | 4 +- .../__snapshots__/Welcome.stories.storyshot | 4 +- app/angular/src/demo/welcome.component.ts | 4 +- app/react/src/demo/Welcome.js | 4 +- .../stories/__snapshots__/welcome.storyshot | 2 +- examples/ember-cli/app/styles/app.css | 4 +- .../html-kitchen-sink/stories/welcome.css | 4 +- examples/mithril-kitchen-sink/src/Welcome.js | 4 +- .../other-demo.stories.storyshot | 2 +- examples/preact-kitchen-sink/src/Welcome.js | 4 +- .../__snapshots__/index.stories.storyshot | 4 +- .../riot-kitchen-sink/src/stories/Welcome.tag | 4 +- .../src/stories/__snapshots__/index.storyshot | 16 +- .../src/stories/views/WelcomeView.svelte | 4 +- .../vue-kitchen-sink/src/stories/Welcome.vue | 4 +- .../MITHRIL/template/stories/Welcome.js | 4 +- .../PREACT/template/stories/Welcome.js | 4 +- .../RIOT/template/stories/Welcome.tag | 186 +++++++++--------- .../SFC_VUE/template/src/stories/Welcome.vue | 4 +- .../VUE/template/stories/Welcome.js | 4 +- .../stories/Welcome.js | 4 +- 23 files changed, 141 insertions(+), 141 deletions(-) diff --git a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap index 47f926ed977e..cae5deca1852 100644 --- a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap +++ b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap @@ -120,10 +120,10 @@ exports[`Storyshots Welcome to Storybook 1`] = `
diff --git a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap index 4fdce3e57188..dd98d76c66d5 100644 --- a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap +++ b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap @@ -100,10 +100,10 @@ exports[`Storyshots Welcome to Storybook 1`] = `
diff --git a/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo b/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo index de427853143f..1fda01fe66a0 100644 --- a/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo +++ b/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo @@ -4,10 +4,10 @@ exports[`Storyshots Welcome to Storybook 1`] = `
diff --git a/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot b/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot index de427853143f..1fda01fe66a0 100644 --- a/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot +++ b/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot @@ -4,10 +4,10 @@ exports[`Storyshots Welcome to Storybook 1`] = `
diff --git a/app/angular/src/demo/welcome.component.ts b/app/angular/src/demo/welcome.component.ts index 18b464a4e644..94c67b0830f6 100644 --- a/app/angular/src/demo/welcome.component.ts +++ b/app/angular/src/demo/welcome.component.ts @@ -36,10 +36,10 @@ import { Component, Output, EventEmitter } from '@angular/core'; styles: [ ` main { - margin: 15px; - max-width: 600; + padding: 15px; line-height: 1.4; fontfamily: 'Helvetica Neue', Helvetica, 'Segoe UI', Arial, freesans, sans-serif; + background-color: #ffffff; } .note { diff --git a/app/react/src/demo/Welcome.js b/app/react/src/demo/Welcome.js index 687796bc5dfb..0c5a4cafaf5f 100644 --- a/app/react/src/demo/Welcome.js +++ b/app/react/src/demo/Welcome.js @@ -5,10 +5,10 @@ const Main = props => (
); diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/welcome.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/welcome.storyshot index 2f536812779a..2408d8cf68a5 100644 --- a/examples/cra-kitchen-sink/src/stories/__snapshots__/welcome.storyshot +++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/welcome.storyshot @@ -2,7 +2,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `

Welcome to storybook diff --git a/examples/ember-cli/app/styles/app.css b/examples/ember-cli/app/styles/app.css index 82171a5b4ecc..30fa0b480d13 100644 --- a/examples/ember-cli/app/styles/app.css +++ b/examples/ember-cli/app/styles/app.css @@ -30,10 +30,10 @@ a { } .main { - margin: 15px; - max-width: 600; + padding: 15px; line-height: 1.4; font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; + background-color: #ffffff; } .logo { diff --git a/examples/html-kitchen-sink/stories/welcome.css b/examples/html-kitchen-sink/stories/welcome.css index ea42a4983159..10b74ed6f9cc 100644 --- a/examples/html-kitchen-sink/stories/welcome.css +++ b/examples/html-kitchen-sink/stories/welcome.css @@ -1,8 +1,8 @@ .main { - margin: 15px; - max-width: 600px; + padding: 15px; line-height: 1.4; font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; + background-color: #ffffff; } .logo { diff --git a/examples/mithril-kitchen-sink/src/Welcome.js b/examples/mithril-kitchen-sink/src/Welcome.js index e85d5493797f..1363fa0cbe6b 100644 --- a/examples/mithril-kitchen-sink/src/Welcome.js +++ b/examples/mithril-kitchen-sink/src/Welcome.js @@ -6,10 +6,10 @@ const Main = { view: vnode => (
{vnode.children} diff --git a/examples/official-storybook/stories/__snapshots__/other-demo.stories.storyshot b/examples/official-storybook/stories/__snapshots__/other-demo.stories.storyshot index 730eefa2fba7..49f1a87f0fc4 100644 --- a/examples/official-storybook/stories/__snapshots__/other-demo.stories.storyshot +++ b/examples/official-storybook/stories/__snapshots__/other-demo.stories.storyshot @@ -25,7 +25,7 @@ exports[`Storyshots Other|Demo/Button with text 1`] = ` exports[`Storyshots Other|Demo/Welcome to Storybook 1`] = `

Welcome to storybook diff --git a/examples/preact-kitchen-sink/src/Welcome.js b/examples/preact-kitchen-sink/src/Welcome.js index b83a12e2c40b..53ec35fc114a 100644 --- a/examples/preact-kitchen-sink/src/Welcome.js +++ b/examples/preact-kitchen-sink/src/Welcome.js @@ -6,10 +6,10 @@ const Main = props => (
); diff --git a/examples/preact-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot b/examples/preact-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot index 660d4bdf5710..9e0d000a05e2 100644 --- a/examples/preact-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot +++ b/examples/preact-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot @@ -27,10 +27,10 @@ exports[`Storyshots Welcome to Storybook 1`] = `
diff --git a/examples/riot-kitchen-sink/src/stories/Welcome.tag b/examples/riot-kitchen-sink/src/stories/Welcome.tag index a3965f4ff449..ace441a10860 100644 --- a/examples/riot-kitchen-sink/src/stories/Welcome.tag +++ b/examples/riot-kitchen-sink/src/stories/Welcome.tag @@ -58,10 +58,10 @@ - - - - + +
+

Welcome to STORYBOOK

+

+ This is a UI component dev environment for your app. +

+

+ We've added some basic stories inside the +
+ src/stories +
directory. +
A story is a single state of one or more UI components. You can have as many stories as you want. +
(Basically a story is like a visual test case.) +

+

+ See these sample +
+ stories +
for a component called +
+ Button . +

+

+ Just like that, you can add your own components as stories. +
You can also edit those components and see changes right away. +
(Try editing the + Button component located at + src/stories/Button.js.) +

+

+ This is just one thing you can do with Storybook. +
Have a look at the +
+ + Storybook + +
repo for more information. +

+

+ NOTE: +
Have a look at the +
+ .storybook/webpack.config.js +
to add webpack loaders and plugins you are using in this project. +

+
+ + + + + + diff --git a/lib/cli/generators/SFC_VUE/template/src/stories/Welcome.vue b/lib/cli/generators/SFC_VUE/template/src/stories/Welcome.vue index afdf3b3a26a3..d87d5f04650f 100644 --- a/lib/cli/generators/SFC_VUE/template/src/stories/Welcome.vue +++ b/lib/cli/generators/SFC_VUE/template/src/stories/Welcome.vue @@ -87,10 +87,10 @@