Merge b7b25f5 into 3e6d304

storybook-eol · Sep 15, 2016 · cb2e8a1 · cb2e8a1
2 parents 3e6d304 + b7b25f5
commit cb2e8a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/__tests__/index.tsx b/src/__tests__/index.tsx
@@ -24,7 +24,7 @@ describe("Background Decorator", () => {
     const SpiedChannel = new EventEmitter();
     const backgroundDecorator = shallow(<BackgroundDecorator story={testStory} channel={SpiedChannel} />);
 
-    expect(backgroundDecorator.html().match(/background-color:transparent/gmi).length).toBe(1);
+    expect(backgroundDecorator.html().match(/background:transparent/gmi).length).toBe(1);
   });
 
   it("should set internal state when background event called", () => {

diff --git a/src/index.tsx b/src/index.tsx
@@ -12,7 +12,7 @@ const style = {
     transition: "background 0.25s ease-in-out",
     backgroundPosition: "center",
     backgroundSize: "cover",
-    backgroundColor: "transparent",
+    background: "transparent",
   },
 };
 
@@ -56,7 +56,7 @@ export class BackgroundDecorator extends React.Component<any, any> {
 
   render() {
     const styles = style.wrapper;
-    styles.backgroundColor = this.state.background;
+    styles.background = this.state.background;
     return <div style={assign({}, styles)}>{this.story}</div>;
   }
 }