Merge pull request #4378 from 1netanel/styles-cleanup

Reorganized sass files to be in src/styles instead of src/assets/css

src/components/actionSheet/actionSheet.js

@@ -6,7 +6,7 @@ import dom from '../../scripts/dom';
 import '../../elements/emby-button/emby-button';
 import './actionSheet.scss';
 import 'material-design-icons-iconfont';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../components/listview/listview.scss';
 
 function getOffsets(elems) {

src/components/collectionEditor/collectionEditor.js

@@ -12,7 +12,7 @@ import '../../elements/emby-input/emby-input';
 import '../../elements/emby-select/emby-select';
 import 'material-design-icons-iconfont';
 import '../formdialog.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 

src/components/dialog/dialog.js

@@ -10,7 +10,7 @@ import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-input/emby-input';
 import '../formdialog.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import template from './dialog.template.html';
 
 /* eslint-disable indent */

src/components/dialogHelper/dialogHelper.js

@@ -7,7 +7,7 @@ import { toBoolean } from '../../utils/string.ts';
 import dom from '../../scripts/dom';
 
 import './dialoghelper.scss';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 
 /* eslint-disable indent */
 

src/components/favoriteitems.js

@@ -6,7 +6,7 @@ import imageLoader from './images/imageLoader';
 import globalize from '../scripts/globalize';
 import layoutManager from './layoutManager';
 import { getParameterByName } from '../utils/url.ts';
-import '../assets/css/scrollstyles.scss';
+import '../styles/scrollstyles.scss';
 import '../elements/emby-itemscontainer/emby-itemscontainer';
 
 /* eslint-disable indent */

src/components/filtermenu/filtermenu.js

@@ -13,7 +13,7 @@ import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-select/emby-select';
 import 'material-design-icons-iconfont';
 import '../formdialog.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import ServerConnections from '../ServerConnections';
 import template from './filtermenu.template.html';
 

src/components/guide/guide.js

@@ -17,13 +17,13 @@ import dom from '../../scripts/dom';
 import './guide.scss';
 import './programs.scss';
 import 'material-design-icons-iconfont';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../elements/emby-programcell/emby-programcell';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-tabs/emby-tabs';
 import '../../elements/emby-scroller/emby-scroller';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import 'webcomponents.js/webcomponents-lite';
 import ServerConnections from '../ServerConnections';
 import template from './tvguide.template.html';

src/components/itemMediaInfo/itemMediaInfo.js

@@ -20,7 +20,7 @@ import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../formdialog.scss';
 import 'material-design-icons-iconfont';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import ServerConnections from '../ServerConnections';
 import template from './itemMediaInfo.template.html';
 

src/components/mediaLibraryCreator/mediaLibraryCreator.js

@@ -19,7 +19,7 @@ import '../../elements/emby-select/emby-select';
 import '../../elements/emby-toggle/emby-toggle';
 import '../listview/listview.scss';
 import '../formdialog.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import './style.scss';
 import toast from '../toast/toast';
 import alert from '../alert';

src/components/mediaLibraryEditor/mediaLibraryEditor.js

@@ -17,7 +17,7 @@ import '../listview/listview.scss';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../formdialog.scss';
 import '../../elements/emby-toggle/emby-toggle';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import './style.scss';
 import toast from '../toast/toast';
 import confirm from '../confirm/confirm';

src/components/metadataEditor/metadataEditor.js

@@ -15,8 +15,8 @@ import '../../elements/emby-textarea/emby-textarea';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../formdialog.scss';
-import '../../assets/css/clearbutton.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/clearbutton.scss';
+import '../../styles/flexstyles.scss';
 import './style.scss';
 import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';

src/components/recordingcreator/recordingeditor.js

@@ -4,7 +4,7 @@ import globalize from '../../scripts/globalize';
 import layoutManager from '../layoutManager';
 import loading from '../loading/loading';
 import scrollHelper from '../../scripts/scrollHelper';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-collapse/emby-collapse';
 import '../../elements/emby-input/emby-input';
@@ -12,7 +12,7 @@ import '../../elements/emby-button/paper-icon-button-light';
 import '../formdialog.scss';
 import './recordingcreator.scss';
 import 'material-design-icons-iconfont';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import ServerConnections from '../ServerConnections';
 import template from './recordingeditor.template.html';
 

src/components/recordingcreator/recordingfields.js

@@ -7,7 +7,7 @@ import recordingHelper from './recordinghelper';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import './recordingfields.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './recordingfields.template.html';

src/components/recordingcreator/seriesrecordingeditor.js

@@ -4,7 +4,7 @@ import layoutManager from '../layoutManager';
 import loading from '../loading/loading';
 import scrollHelper from '../../scripts/scrollHelper';
 import datetime from '../../scripts/datetime';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-input/emby-input';
@@ -13,7 +13,7 @@ import '../../elements/emby-button/paper-icon-button-light';
 import '../formdialog.scss';
 import './recordingcreator.scss';
 import 'material-design-icons-iconfont';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import ServerConnections from '../ServerConnections';
 import template from './seriesrecordingeditor.template.html';
 

src/components/search/SearchFields.tsx

@@ -7,7 +7,7 @@ import globalize from '../../scripts/globalize';
 import 'material-design-icons-iconfont';
 
 import '../../elements/emby-input/emby-input';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import './searchfields.scss';
 import layoutManager from '../layoutManager';
 import browser from '../../scripts/browser';

src/components/sortmenu/sortmenu.js

@@ -7,7 +7,7 @@ import '../../elements/emby-button/paper-icon-button-light';
 import 'material-design-icons-iconfont';
 import '../formdialog.scss';
 import '../../elements/emby-button/emby-button';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import template from './sortmenu.template.html';
 
 function onSubmit(e) {

src/components/subtitleeditor/subtitleeditor.js

@@ -14,7 +14,7 @@ import '../formdialog.scss';
 import 'material-design-icons-iconfont';
 import './subtitleeditor.scss';
 import '../../elements/emby-button/emby-button';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import confirm from '../confirm/confirm';

src/components/subtitlesettings/subtitlesettings.js

@@ -13,7 +13,7 @@ import '../../elements/emby-select/emby-select';
 import '../../elements/emby-slider/emby-slider';
 import '../../elements/emby-input/emby-input';
 import '../../elements/emby-checkbox/emby-checkbox';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import './subtitlesettings.scss';
 import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';

src/components/tvproviders/schedulesdirect.js

@@ -7,7 +7,7 @@ import '../listview/listview.scss';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-select/emby-select';
 import '../../elements/emby-button/emby-button';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import './style.scss';
 import Dashboard from '../../utils/dashboard';
 import Events from '../../utils/events.ts';

src/components/upnextdialog/upnextdialog.js

@@ -8,7 +8,7 @@ import globalize from '../../scripts/globalize';
 import itemHelper from '../itemHelper';
 import './upnextdialog.scss';
 import '../../elements/emby-button/emby-button';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 
 /* eslint-disable indent */
 

src/components/viewSettings/viewSettings.js

@@ -9,7 +9,7 @@ import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-select/emby-select';
 import 'material-design-icons-iconfont';
 import '../formdialog.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import template from './viewSettings.template.html';
 
 function onSubmit(e) {

src/controllers/dashboard/dashboard.js

@@ -16,7 +16,7 @@ import imageHelper from '../../scripts/imagehelper';
 import indicators from '../../components/indicators/indicators';
 import '../../components/listview/listview.scss';
 import '../../elements/emby-button/emby-button';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import taskButton from '../../scripts/taskbutton';
 import Dashboard from '../../utils/dashboard';

src/controllers/dashboard/logs.js

@@ -3,7 +3,7 @@ import loading from '../../components/loading/loading';
 import globalize from '../../scripts/globalize';
 import '../../elements/emby-button/emby-button';
 import '../../components/listview/listview.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import Dashboard from '../../utils/dashboard';
 import alert from '../../components/alert';
 

src/controllers/itemDetails/index.js

@@ -22,7 +22,7 @@ import libraryMenu from '../../scripts/libraryMenu';
 import globalize from '../../scripts/globalize';
 import browser from '../../scripts/browser';
 import { playbackManager } from '../../components/playback/playbackmanager';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-button/emby-button';

src/controllers/livetv/livetvsuggested.js

@@ -6,7 +6,7 @@ import globalize from '../../scripts/globalize';
 import * as mainTabsManager from '../../components/maintabsmanager';
 import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import imageLoader from '../../components/images/imageLoader';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import '../../elements/emby-tabs/emby-tabs';
 import '../../elements/emby-button/emby-button';

src/controllers/livetvstatus.js

@@ -7,7 +7,7 @@ import layoutManager from '../components/layoutManager';
 import loading from '../components/loading/loading';
 import browser from '../scripts/browser';
 import '../components/listview/listview.scss';
-import '../assets/css/flexstyles.scss';
+import '../styles/flexstyles.scss';
 import '../elements/emby-itemscontainer/emby-itemscontainer';
 import '../components/cardbuilder/card.scss';
 import 'material-design-icons-iconfont';

src/controllers/music/musicrecommended.js

@@ -9,11 +9,11 @@ import imageLoader from '../../components/images/imageLoader';
 import libraryMenu from '../../scripts/libraryMenu';
 import * as mainTabsManager from '../../components/maintabsmanager';
 import globalize from '../../scripts/globalize';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import '../../elements/emby-tabs/emby-tabs';
 import '../../elements/emby-button/emby-button';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import Dashboard from '../../utils/dashboard';
 
 /* eslint-disable indent */

src/controllers/playback/video/index.js

@@ -15,10 +15,10 @@ import { appHost } from '../../../components/apphost';
 import layoutManager from '../../../components/layoutManager';
 import * as userSettings from '../../../scripts/settings/userSettings';
 import keyboardnavigation from '../../../scripts/keyboardNavigation';
-import '../../../assets/css/scrollstyles.scss';
+import '../../../styles/scrollstyles.scss';
 import '../../../elements/emby-slider/emby-slider';
 import '../../../elements/emby-button/paper-icon-button-light';
-import '../../../assets/css/videoosd.scss';
+import '../../../styles/videoosd.scss';
 import ServerConnections from '../../../components/ServerConnections';
 import shell from '../../../scripts/shell';
 import SubtitleSync from '../../../components/subtitlesync/subtitlesync';

src/controllers/session/selectServer/index.js

@@ -10,7 +10,7 @@ import actionSheet from '../../../components/actionSheet/actionSheet';
 import dom from '../../../scripts/dom';
 import browser from '../../../scripts/browser';
 import 'material-design-icons-iconfont';
-import '../../../assets/css/flexstyles.scss';
+import '../../../styles/flexstyles.scss';
 import '../../../elements/emby-scroller/emby-scroller';
 import '../../../elements/emby-itemscontainer/emby-itemscontainer';
 import '../../../components/cardbuilder/card.scss';

src/controllers/shows/tvrecommended.js

@@ -9,7 +9,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import { playbackManager } from '../../components/playback/playbackmanager';
 import * as mainTabsManager from '../../components/maintabsmanager';
 import globalize from '../../scripts/globalize';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import '../../elements/emby-button/emby-button';
 import Dashboard from '../../utils/dashboard';

src/controllers/shows/tvupcoming.js

@@ -4,7 +4,7 @@ import datetime from '../../scripts/datetime';
 import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import imageLoader from '../../components/images/imageLoader';
 import globalize from '../../scripts/globalize';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 
 /* eslint-disable indent */

src/controllers/wizard/user/index.js

@@ -1,6 +1,6 @@
 import loading from '../../../components/loading/loading';
 import globalize from '../../../scripts/globalize';
-import '../../../assets/css/dashboard.scss';
+import '../../../styles/dashboard.scss';
 import '../../../elements/emby-input/emby-input';
 import '../../../elements/emby-button/emby-button';
 import Dashboard from '../../../utils/dashboard';

src/elements/emby-tabs/emby-tabs.js

@@ -5,7 +5,7 @@ import browser from '../../scripts/browser';
 import focusManager from '../../components/focusManager';
 import layoutManager from '../../components/layoutManager';
 import './emby-tabs.scss';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 
 /* eslint-disable indent */
     const EmbyTabs = Object.create(HTMLDivElement.prototype);

src/index.jsx

@@ -6,7 +6,7 @@ import 'intersection-observer';
 import 'classlist.js';
 import 'whatwg-fetch';
 import 'resize-observer-polyfill';
-import './assets/css/site.scss';
+import './styles/site.scss';
 import React, { StrictMode } from 'react';
 import * as ReactDOM from 'react-dom';
 import Events from './utils/events.ts';
@@ -89,13 +89,13 @@ function onGlobalizeInit() {
 
     if (browser.tv && !browser.android) {
         console.debug('using system fonts with explicit sizes');
-        import('./assets/css/fonts.sized.scss');
+        import('./styles/fonts.sized.scss');
     } else {
         console.debug('using default fonts');
-        import('./assets/css/fonts.scss');
+        import('./styles/fonts.scss');
     }
 
-    import('./assets/css/librarybrowser.scss');
+    import('./styles/librarybrowser.scss');
 
     loadPlugins().then(onAppReady);
 }
@@ -135,7 +135,7 @@ async function onAppReady() {
     console.debug('onAppReady: loading dependencies');
 
     if (browser.iOS) {
-        import('./assets/css/ios.scss');
+        import('./styles/ios.scss');
     }
 
     Events.on(appHost, 'resume', () => {

src/libraries/navdrawer/navdrawer.js

@@ -6,7 +6,7 @@
 import browser from '../../scripts/browser';
 import dom from '../../scripts/dom';
 import './navdrawer.scss';
-import '../../assets/css/scrollstyles.scss';
+import '../../styles/scrollstyles.scss';
 import globalize from '../../scripts/globalize';
 
 function getTouches(e) {

src/libraries/scroller.js

@@ -8,7 +8,7 @@ import layoutManager from '../components/layoutManager';
 import dom from '../scripts/dom';
 import focusManager from '../components/focusManager';
 import ResizeObserver from 'resize-observer-polyfill';
-import '../assets/css/scrollstyles.scss';
+import '../styles/scrollstyles.scss';
 import globalize from '../scripts/globalize';
 
 /**

src/routes/user/userprofiles.tsx

@@ -11,7 +11,7 @@ import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../components/cardbuilder/card.scss';
 import '../../components/indicators/indicators.scss';
-import '../../assets/css/flexstyles.scss';
+import '../../styles/flexstyles.scss';
 import Page from '../../components/Page';
 
 type MenuEntry = {

src/scripts/editorsidebar.js

@@ -303,7 +303,7 @@ import { getParameterByName } from '../utils/url.ts';
         updateEditorNode(this, item);
     }).on('pagebeforeshow', '.metadataEditorPage', function () {
         /* eslint-disable-next-line  @babel/no-unused-expressions */
-        import('../assets/css/metadataeditor.scss');
+        import('../styles/metadataeditor.scss');
     }).on('pagebeforeshow', '.metadataEditorPage', function () {
         const page = this;
         Dashboard.getCurrentUser().then(function (user) {

src/scripts/libraryMenu.js

@@ -22,8 +22,8 @@ import { getParameterByName } from '../utils/url.ts';
 import '../elements/emby-button/paper-icon-button-light';
 
 import 'material-design-icons-iconfont';
-import '../assets/css/scrollstyles.scss';
-import '../assets/css/flexstyles.scss';
+import '../styles/scrollstyles.scss';
+import '../styles/flexstyles.scss';
 
 /* eslint-disable indent */
 

src/scripts/routes.js

@@ -7,10 +7,10 @@ import '../elements/emby-collapse/emby-collapse';
 import '../elements/emby-select/emby-select';
 import '../elements/emby-checkbox/emby-checkbox';
 import '../elements/emby-slider/emby-slider';
-import '../assets/css/livetv.scss';
+import '../styles/livetv.scss';
 import '../components/listview/listview.scss';
-import '../assets/css/dashboard.scss';
-import '../assets/css/detailtable.scss';
+import '../styles/dashboard.scss';
+import '../styles/detailtable.scss';
 import { appRouter } from '../components/appRouter';
 
 /* eslint-disable indent */

src/scripts/scrollHelper.js

@@ -1,6 +1,6 @@
 import focusManager from '../components/focusManager';
 import dom from './dom';
-import '../assets/css/scrollstyles.scss';
+import '../styles/scrollstyles.scss';
 
 function getBoundingClientRect(elem) {
     // Support: BlackBerry 5, iOS 3 (original iPhone)

src/styles/fonts.scss

@@ -1,4 +1,4 @@
-@import "../../styles/noto-sans/index.scss";
+@import "../styles/noto-sans/index.scss";
 
 @mixin font($weight: null, $size: null) {
     font-weight: $weight;