From fa586d878d5973ab1f1ffbca0c43640d2d67f1b4 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 19 Oct 2015 09:44:58 -0500 Subject: [PATCH] * force width to be 450 VRFS-3663 --- .../react-components/PopupJamTrackPlayer.js.jsx.coffee | 2 +- .../react-components/stores/JamTrackPlayerStore.js.coffee | 2 +- web/app/assets/stylesheets/minimal/jamtrack_player.css.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/app/assets/javascripts/react-components/PopupJamTrackPlayer.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupJamTrackPlayer.js.jsx.coffee index 7ecedc13e..b7893c1d9 100644 --- a/web/app/assets/javascripts/react-components/PopupJamTrackPlayer.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/PopupJamTrackPlayer.js.jsx.coffee @@ -725,7 +725,7 @@ mixins.push(Reflux.listenTo(JamTrackPlayerStore, 'onJamTrackPlayerStoreChanged') #offset += 25 - window.resizeTo(width, height + offset) + window.resizeTo(450, height + offset) computeDisableLoading: (state) -> @disableLoading = false diff --git a/web/app/assets/javascripts/react-components/stores/JamTrackPlayerStore.js.coffee b/web/app/assets/javascripts/react-components/stores/JamTrackPlayerStore.js.coffee index 1a0693b5f..7f98b57f4 100644 --- a/web/app/assets/javascripts/react-components/stores/JamTrackPlayerStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/JamTrackPlayerStore.js.coffee @@ -55,7 +55,7 @@ BrowserMediaActions = @BrowserMediaActions @childWindow.close() logger.debug("opening JamTrackPlayer window") - @childWindow = window.open("/popups/jamtrack-player/" + @jamTrack.id, 'Media Controls', 'scrollbars=yes,toolbar=no,status=no,height=155,width=450') + @childWindow = window.open("/popups/jamtrack-player/" + @jamTrack.id, 'Media Controls', 'scrollbars=yes,toolbar=no,status=no,height=580,width=450') @changed() diff --git a/web/app/assets/stylesheets/minimal/jamtrack_player.css.scss b/web/app/assets/stylesheets/minimal/jamtrack_player.css.scss index 2ced71165..2ac7625fc 100644 --- a/web/app/assets/stylesheets/minimal/jamtrack_player.css.scss +++ b/web/app/assets/stylesheets/minimal/jamtrack_player.css.scss @@ -7,7 +7,7 @@ body.jamtrack-player-popup.popup { background-color: #242323; #minimal-container { - padding-bottom:0px; + padding-bottom:0; } .media-controls-popup {