From f906b5d6664786e99ff4404d8a40a88efcc49b40 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Wed, 3 Apr 2019 14:54:14 +0300 Subject: [PATCH] storybook fixed --- src/common/UserPanel/styles.less | 2 +- stories/index.stories.js | 493 ++++++++++++++++--------------- stories/styles.less | 35 ++- 3 files changed, 289 insertions(+), 241 deletions(-) diff --git a/src/common/UserPanel/styles.less b/src/common/UserPanel/styles.less index 463c79bfe..3de1bedb9 100644 --- a/src/common/UserPanel/styles.less +++ b/src/common/UserPanel/styles.less @@ -6,7 +6,7 @@ .user-panel { width: var(--user-panel-width); - background-color: var(--color-background); + background-color: var(--color-backgroundlighter); .user-info { display: grid; diff --git a/stories/index.stories.js b/stories/index.stories.js index 2401ba71f..4ab294ead 100644 --- a/stories/index.stories.js +++ b/stories/index.stories.js @@ -1,13 +1,13 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; -import { Checkbox, LibraryItemList, MetaItem, ShareAddon, UserPanel } from 'stremio-common'; +import { Checkbox, MetaItem, ShareAddon, UserPanel } from 'stremio-common'; import Addon from '../src/routes/Addons/Addon'; -import Stream from '../src/routes/Detail/StreamsList/Stream'; import Video from '../src/routes/Detail/VideosList/Video'; import VideosList from '../src/routes/Detail/VideosList'; +import Stream from '../src/routes/Detail/StreamsList/Stream'; import StreamsList from '../src/routes/Detail/StreamsList'; import colors from 'stremio-colors'; -import appStyles from '../src/app/styles'; +import appStyles from '../src/App/styles'; import styles from './styles'; const storyStyle = { @@ -16,14 +16,6 @@ const storyStyle = { minHeight: 'initial' }; -const videosListStyle = { - position: 'absolute', - height: '100%', - padding: '10px', - minHeight: 'initial', - background: colors.backgroundlighter -} - const streamsListStyle = { position: 'absolute', height: '100%', @@ -32,51 +24,57 @@ const streamsListStyle = { background: colors.backgroundlighter } +const CONTINUE_WATCHING_MENU = [ + { + label: 'Play', + type: 'play' + }, + { + label: 'Dismiss', + type: 'dismiss' + } +]; + storiesOf('Addon', module) .add('not-installed', () => (
)) .add('installed', () => (
)) - .add('long-description', () => ( + .add('long-text', () => (
-
- )) - .add('long-urls', () => ( -
-
)); @@ -84,93 +82,98 @@ storiesOf('Addon', module) storiesOf('Checkbox', module) .add('checked-disabled', () => (
- + +
+
)) .add('not-checked-disabled', () => (
- + +
+
)) .add('not-checked', () => (
- + +
+
)) .add('checked', () => (
- -
- )) - -storiesOf('LibraryItemList', module) - .add('library item list', () => ( -
- + +
+
)); storiesOf('MetaItem', module) - .add('poster', () => ( + .add('continue-watching-poster', () => (
)) - .add('with-title', () => ( + .add('continue-watching-square', () => (
)) - .add('with-progress', () => ( + .add('addon-catalog-poster-movie', () => (
)) - .add('landscape-shape', () => ( + .add('addon-catalog-square-channel', () => (
+
+ )) + .add('addon-catalog-landscape-series', () => ( +
+
)); - storiesOf('ShareAddon', module) .add('share addon', () => (
@@ -178,6 +181,161 @@ storiesOf('ShareAddon', module)
)); +storiesOf('UserPanel', module) + .add('anonymous', () => ( +
+ +
+ )) + .add('without avatar', () => ( +
+ +
+ )) + .add('with avatar', () => ( +
+ +
+ )); + +storiesOf('Video', module) + .add('poster-upcoming-watched-long-title', () => ( +
+
+ )) + .add('empty-poster-progress', () => ( +
+
+ )) + .add('no-poster-upcoming', () => ( +
+
+ )) + .add('no-poster-upcoming-watched', () => ( +
+
+ )) + .add('no-poster-long-title-progress', () => ( +
+
+ )); + +storiesOf('VideosList', module) + .add('list of videos', () => ( +
+ +
+ )); + storiesOf('Stream', module) .add('no-logo-title', () => (
@@ -228,170 +386,35 @@ storiesOf('Stream', module)
)); -storiesOf('UserPanel', module) - .add('anonymous', () => ( -
- -
- )) - .add('without avatar', () => ( -
- -
- )) - .add('with avatar', () => ( -
- -
- )); - -storiesOf('Video', module) - .add('poster-upcoming-watched-long-title', () => ( -
-
- )) - .add('poster-watched', () => ( -
-
- )) - .add('no-poster-progress', () => ( -
-
- )) - .add('poster-progress', () => ( -
-
- )) - .add('no-poster-upcoming', () => ( -
-
- )); - -storiesOf('VideosList', module) - .add('list of videos', () => ( -
- -
- )); - storiesOf('StreamsList', module) .add('short list of streams', () => (
- +
)) .add('long list of streams', () => (
- +
)); \ No newline at end of file diff --git a/stories/styles.less b/stories/styles.less index fbffe29e8..bc9bc4f9f 100644 --- a/stories/styles.less +++ b/stories/styles.less @@ -1,7 +1,32 @@ -.checkbox-size { - height: 16px; - width: 16px; +.addon { + --addon-width: 960px; + --button-border-width: 2px; + font-size: 14px; } -.video, .stream { - margin: 10px; + +.checkbox-size { + --icon-size: 1.2em; + --icon-color: var(--color-surfacelighter); +} + +.meta-item-continue-watching { + --play-icon-visibility: visible; +} + +.video { + --video-width: 360px; + --spacing: 8px; + font-size: 12px; +} + +.videos-list { + --spacing: 8px; + --video-width: 360px; + font-size: 12px; + + position: absolute; + z-index: 2; + top: 0; + bottom: 0; + padding: calc(3 * var(--spacing)) 0; } \ No newline at end of file