Skip to content

Commit

Permalink
Fix CSS generation
Browse files Browse the repository at this point in the history
  • Loading branch information
mistic100 committed Jan 18, 2021
1 parent 90b6de5 commit da2c14f
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 20 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"@csstools/postcss-sass": "^4.0.0",
"@pixi/jsdoc-template": "^2.5.1",
"@rollup/plugin-alias": "^3.0.1",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-inject": "^4.0.1",
"@rollup/plugin-replace": "^2.3.1",
"@vuepress/plugin-active-header-links": "^1.2.0",
Expand All @@ -67,8 +68,7 @@
"postcss-banner": "^3.0.0",
"promise-polyfill": "^8.1.3",
"raw-loader": "^4.0.0",
"rollup": "^2.0.2",
"rollup-plugin-babel": "^4.3.3",
"rollup": "^2.36.2",
"rollup-plugin-local-resolve": "^1.0.7",
"rollup-plugin-postcss": "^3.1.0",
"rollup-plugin-string": "^3.0.0",
Expand Down
6 changes: 4 additions & 2 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import alias from '@rollup/plugin-alias';
import babel from '@rollup/plugin-babel';
import inject from '@rollup/plugin-inject';
import replace from '@rollup/plugin-replace';
import fs from 'fs';
import path from 'path';
import babel from 'rollup-plugin-babel';
import localResolve from 'rollup-plugin-local-resolve';
import postcss from 'rollup-plugin-postcss'
import { string } from 'rollup-plugin-string';
Expand Down Expand Up @@ -35,6 +35,7 @@ const baseConfig = {
output : {
format : 'umd',
sourcemap: true,
interop : false,
banner : banner,
globals : {
'three' : 'THREE',
Expand All @@ -50,7 +51,8 @@ const baseConfig = {
plugins : () => [
localResolve(),
babel({
exclude: 'node_modules/**',
exclude : 'node_modules/**',
babelHelpers: 'bundled',
}),
postcss({
extract : true,
Expand Down
1 change: 0 additions & 1 deletion src/Viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { EventsHandler } from './services/EventsHandler';
import { Renderer } from './services/Renderer';
import { TextureLoader } from './services/TextureLoader';
import { TooltipRenderer } from './services/TooltipRenderer';
import './styles/viewer.scss';
import {
bound,
each,
Expand Down
2 changes: 0 additions & 2 deletions src/buttons/AutorotateButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import playActive from '../icons/play-active.svg';
import play from '../icons/play.svg';
import { AbstractButton } from './AbstractButton';

import '../styles/buttons/autorotate.scss';

/**
* @summary Navigation bar autorotate button class
* @extends PSV.buttons.AbstractButton
Expand Down
2 changes: 0 additions & 2 deletions src/buttons/ZoomRangeButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import { SYSTEM } from '../data/system';
import { getStyle } from '../utils';
import { AbstractButton } from './AbstractButton';

import '../styles/buttons/zoom-range.scss';

/**
* @summary Navigation bar zoom button class
* @extends PSV.buttons.AbstractButton
Expand Down
2 changes: 0 additions & 2 deletions src/components/Loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import { SYSTEM } from '../data/system';
import { getStyle } from '../utils';
import { AbstractComponent } from './AbstractComponent';

import '../styles/loader.scss';

/**
* @summary Loader class
* @extends PSV.components.AbstractComponent
Expand Down
1 change: 0 additions & 1 deletion src/components/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { ZoomOutButton } from '../buttons/ZoomOutButton';
import { ZoomRangeButton } from '../buttons/ZoomRangeButton';
import { DEFAULTS } from '../data/config';
import { PSVError } from '../PSVError';
import '../styles/navbar.scss';
import { clone, logWarn } from '../utils';
import { AbstractComponent } from './AbstractComponent';
import { NavbarCaption } from './NavbarCaption';
Expand Down
2 changes: 0 additions & 2 deletions src/components/Notification.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { EVENTS } from '../data/constants';
import { AbstractComponent } from './AbstractComponent';

import '../styles/notification.scss';

/**
* @summary Notification class
* @extends PSV.components.AbstractComponent
Expand Down
2 changes: 0 additions & 2 deletions src/components/Overlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import { EVENTS } from '../data/constants';
import { AbstractComponent } from './AbstractComponent';
import { PSVError } from '../PSVError';

import '../styles/overlay.scss';

/**
* @summary Overlay class
* @extends PSV.components.AbstractComponent
Expand Down
2 changes: 0 additions & 2 deletions src/components/Panel.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { EVENTS } from '../data/constants';
import { SYSTEM } from '../data/system';
import { PSVError } from '../PSVError';

import '../styles/panel.scss';
import { toggleClass } from '../utils';
import { AbstractComponent } from './AbstractComponent';

Expand Down
2 changes: 0 additions & 2 deletions src/components/Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import { PSVError } from '../PSVError';
import { addClasses, parsePosition } from '../utils';
import { AbstractComponent } from './AbstractComponent';

import '../styles/tooltip.scss';

const LEFT_MAP = { 0: 'left', 0.5: 'center', 1: 'right' };
const TOP_MAP = { 0: 'top', 0.5: 'center', 1: 'bottom' };
const STATE = { NONE: 0, SHOWING: 1, HIDING: 2, READY: 3 };
Expand Down
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import './data/constants'; // for jsdoc
import { SYSTEM } from './data/system';
import { AbstractPlugin } from './plugins/AbstractPlugin';
import { PSVError } from './PSVError';
import './styles/index.scss';
import * as utils from './utils';
import { Viewer } from './Viewer';

Expand Down
9 changes: 9 additions & 0 deletions src/styles/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import 'viewer';
@import 'loader';
@import 'navbar';
@import 'buttons/autorotate';
@import 'buttons/zoom-range';
@import 'notification';
@import 'overlay';
@import 'panel';
@import 'tooltip';

0 comments on commit da2c14f

Please sign in to comment.