diff --git a/packages/webamp/css/webamp.css b/packages/webamp/css/webamp.css index df5a680d..2865a659 100644 --- a/packages/webamp/css/webamp.css +++ b/packages/webamp/css/webamp.css @@ -1,3 +1,11 @@ +@import './base-skin.css'; +@import './context-menu.css'; +@import './equalizer-window.css'; +@import './gen-window.css'; +@import './main-window.css'; +@import './milkdrop-window.css'; +@import './mini-time.css'; +@import './playlist-window.css'; /* Rules used by all windows */ #webamp { diff --git a/packages/webamp/js/components/ContextMenu.tsx b/packages/webamp/js/components/ContextMenu.tsx index 541e3253..99c25c64 100644 --- a/packages/webamp/js/components/ContextMenu.tsx +++ b/packages/webamp/js/components/ContextMenu.tsx @@ -2,7 +2,6 @@ import { useMemo, useEffect } from "react"; import { createPortal } from "react-dom"; import classnames from "classnames"; -import "../../css/context-menu.css"; import { useTypedSelector } from "../hooks"; import * as Selectors from "../selectors"; diff --git a/packages/webamp/js/components/EqualizerWindow/index.tsx b/packages/webamp/js/components/EqualizerWindow/index.tsx index 1c7048b7..d263292f 100644 --- a/packages/webamp/js/components/EqualizerWindow/index.tsx +++ b/packages/webamp/js/components/EqualizerWindow/index.tsx @@ -11,7 +11,6 @@ import EqGraph from "./EqGraph"; import PresetsContextMenu from "./PresetsContextMenu"; import EqualizerShade from "./EqualizerShade"; -import "../../../css/equalizer-window.css"; import { Band as BandType } from "../../types"; import FocusTarget from "../FocusTarget"; import { useTypedSelector, useActionCreator } from "../../hooks"; diff --git a/packages/webamp/js/components/GenWindow/index.tsx b/packages/webamp/js/components/GenWindow/index.tsx index f3facd8c..0ca23ab2 100644 --- a/packages/webamp/js/components/GenWindow/index.tsx +++ b/packages/webamp/js/components/GenWindow/index.tsx @@ -1,6 +1,5 @@ import * as React from "react"; import classnames from "classnames"; -import "../../../css/gen-window.css"; import * as Actions from "../../actionCreators"; import * as Selectors from "../../selectors"; diff --git a/packages/webamp/js/components/MainWindow/index.tsx b/packages/webamp/js/components/MainWindow/index.tsx index 0f10f3ef..7324b353 100644 --- a/packages/webamp/js/components/MainWindow/index.tsx +++ b/packages/webamp/js/components/MainWindow/index.tsx @@ -30,7 +30,6 @@ import Time from "./Time"; import MainVolume from "./MainVolume"; import * as Selectors from "../../selectors"; -import "../../../css/main-window.css"; import { FilePicker } from "../../types"; import FocusTarget from "../FocusTarget"; import { useActionCreator, useTypedSelector } from "../../hooks"; diff --git a/packages/webamp/js/components/MilkdropWindow/index.tsx b/packages/webamp/js/components/MilkdropWindow/index.tsx index e3682b42..1db11bed 100644 --- a/packages/webamp/js/components/MilkdropWindow/index.tsx +++ b/packages/webamp/js/components/MilkdropWindow/index.tsx @@ -13,7 +13,6 @@ import * as Actions from "../../actionCreators"; import { TransitionType } from "../../types"; import Visualizer from "./Visualizer"; -import "../../../css/milkdrop-window.css"; import Background from "./Background"; import PresetOverlay from "./PresetOverlay"; import DropTarget from "../DropTarget"; diff --git a/packages/webamp/js/components/MiniTime.tsx b/packages/webamp/js/components/MiniTime.tsx index cf67f5a5..edd6caa2 100644 --- a/packages/webamp/js/components/MiniTime.tsx +++ b/packages/webamp/js/components/MiniTime.tsx @@ -6,7 +6,6 @@ import * as Actions from "../actionCreators"; import Character from "./Character"; import * as Selectors from "../selectors"; -import "../../css/mini-time.css"; import { useTypedSelector, useActionCreator } from "../hooks"; // Sigh. When the display is blinking (say when it's paused) we need to diff --git a/packages/webamp/js/components/PlaylistWindow/index.tsx b/packages/webamp/js/components/PlaylistWindow/index.tsx index 49ec130b..6480ee13 100644 --- a/packages/webamp/js/components/PlaylistWindow/index.tsx +++ b/packages/webamp/js/components/PlaylistWindow/index.tsx @@ -19,7 +19,6 @@ import PlaylistActionArea from "./PlaylistActionArea"; import TrackList from "./TrackList"; import PlaylistScrollBar from "./PlaylistScrollBar"; -import "../../../css/playlist-window.css"; import { AppState } from "../../types"; import FocusTarget from "../FocusTarget"; import { useActionCreator, useTypedSelector } from "../../hooks"; diff --git a/packages/webamp/js/webampLazy.tsx b/packages/webamp/js/webampLazy.tsx index 06c2e4ce..4c9a477e 100644 --- a/packages/webamp/js/webampLazy.tsx +++ b/packages/webamp/js/webampLazy.tsx @@ -35,7 +35,6 @@ import { } from "./actionTypes"; import Emitter from "./emitter"; -import "../css/base-skin.css"; import { SerializedStateV1 } from "./serializedStates/v1Types"; import Disposable from "./Disposable"; import { DeepPartial } from "redux";