From 2ce46facb8021ac20dcb100fbdf6a0bfdb0bd305 Mon Sep 17 00:00:00 2001 From: ebrillhart Date: Mon, 27 Aug 2018 10:37:08 -0700 Subject: [PATCH 1/4] fullscreen button should reflect applied colors now --- .../__snapshots__/fullscreen.test.js.snap | 13 +++---- .../__snapshots__/manager.test.js.snap | 39 +++++++++---------- src/components/fullscreen-button.js | 4 +- src/components/fullscreen.js | 4 +- src/themes/default/screen.js | 2 +- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/components/__snapshots__/fullscreen.test.js.snap b/src/components/__snapshots__/fullscreen.test.js.snap index ce0a75a44..b2f625bc7 100644 --- a/src/components/__snapshots__/fullscreen.test.js.snap +++ b/src/components/__snapshots__/fullscreen.test.js.snap @@ -4,27 +4,26 @@ exports[` should render correctly. 1`] = ` diff --git a/src/components/fullscreen.js b/src/components/fullscreen.js index 03a8f82d7..4cc7374f4 100644 --- a/src/components/fullscreen.js +++ b/src/components/fullscreen.js @@ -17,7 +17,7 @@ const StyledFullscreen = styled(FullscreenButton)` opacity: 0; transition: 300ms opacity ease; font-size: 30px; - color: #fff; + fill: #fff; &:hover { opacity: 1; @@ -37,7 +37,7 @@ export class Fullscreen extends Component { return ( this.toggleFullscreen()} - style={this.context.styles.fullscreen} + styles={this.context.styles.fullscreen} viewBox="0 0 512 512" /> ); diff --git a/src/themes/default/screen.js b/src/themes/default/screen.js index 5aeb36343..2d83ade9e 100644 --- a/src/themes/default/screen.js +++ b/src/themes/default/screen.js @@ -59,7 +59,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => { } }, fullscreen: { - fill: colors.tertiary + fill: colors.secondary }, autoplay: { pause: { From 0bb0c2ddefe133499754973a062ea8fe6667a80d Mon Sep 17 00:00:00 2001 From: ebrillhart Date: Mon, 27 Aug 2018 10:41:57 -0700 Subject: [PATCH 2/4] fill to color --- src/components/fullscreen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/fullscreen.js b/src/components/fullscreen.js index 4cc7374f4..b79b3bc2b 100644 --- a/src/components/fullscreen.js +++ b/src/components/fullscreen.js @@ -17,7 +17,7 @@ const StyledFullscreen = styled(FullscreenButton)` opacity: 0; transition: 300ms opacity ease; font-size: 30px; - fill: #fff; + color: #fff; &:hover { opacity: 1; From 5ceef6c18c627640440afa50a2278c0343a9dc4b Mon Sep 17 00:00:00 2001 From: ebrillhart Date: Mon, 27 Aug 2018 10:43:23 -0700 Subject: [PATCH 3/4] adjust theme --- src/themes/default/screen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/default/screen.js b/src/themes/default/screen.js index 2d83ade9e..5aeb36343 100644 --- a/src/themes/default/screen.js +++ b/src/themes/default/screen.js @@ -59,7 +59,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => { } }, fullscreen: { - fill: colors.secondary + fill: colors.tertiary }, autoplay: { pause: { From 3d394cd33e4e24c2af9f6dba25c61c9845302fe5 Mon Sep 17 00:00:00 2001 From: ebrillhart Date: Mon, 27 Aug 2018 10:49:03 -0700 Subject: [PATCH 4/4] update snapshots --- .../__snapshots__/fullscreen.test.js.snap | 6 +++--- .../__snapshots__/manager.test.js.snap | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/__snapshots__/fullscreen.test.js.snap b/src/components/__snapshots__/fullscreen.test.js.snap index b2f625bc7..967116891 100644 --- a/src/components/__snapshots__/fullscreen.test.js.snap +++ b/src/components/__snapshots__/fullscreen.test.js.snap @@ -8,21 +8,21 @@ exports[` should render correctly. 1`] = ` viewBox="0 0 512 512" >