Skip to content

Commit 4fb8d81

Browse files
committed
adding dark flexlayout styling
1 parent 696e7c7 commit 4fb8d81

4 files changed

Lines changed: 607 additions & 25 deletions

File tree

webapp/Main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import React from 'react';
22
import ReactDOM from 'react-dom';
33
import { Provider } from 'react-redux';
44
import { MuiThemeProvider } from '@material-ui/core/styles';
5+
import * as Sentry from '@sentry/react';
6+
import { Integrations } from '@sentry/tracing';
57
import { NetPyNE } from './components';
68
import theme from './theme';
79
import store from './redux/store';
8-
import * as Sentry from "@sentry/react";
9-
import { Integrations } from "@sentry/tracing";
10+
import '@metacell/geppetto-meta-ui/flex-layout/style/dark.scss';
1011

1112
global.GEPPETTO_CONFIGURATION = require('./GeppettoConfiguration.json');
1213
const { initGeppetto } = require('@metacell/geppetto-meta-client/GEPPETTO');

webapp/package.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,15 @@
8383
"less": "^3.11.1",
8484
"less-loader": "^5.0.0",
8585
"mini-css-extract-plugin": "^0.7.0",
86+
"postcss-flexbugs-fixes": "4.2.1",
87+
"postcss-loader": "3.0.0",
88+
"postcss-normalize": "8.0.1",
89+
"postcss-preset-env": "6.7.0",
90+
"postcss-safe-parser": "5.0.2",
8691
"raw-loader": "^0.5.1",
8792
"react-resize-detector": "^6.7.4",
93+
"sass": "^1.32.12",
94+
"sass-loader": "^10.0.5",
8895
"slimerjs": "^1.0.0",
8996
"source-map-loader": "^0.2.3",
9097
"style-loader": "^0.13.2",

webapp/webpack.config.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,14 @@ module.exports = function (env) {
181181
{ loader: 'css-loader' },
182182
],
183183
},
184-
184+
{
185+
test: /\.s[a|c]ss$/,
186+
use: [
187+
'style-loader', // 3. Inject styles into DOM
188+
'css-loader', // 2. Turns css into commonjs
189+
'sass-loader', // 1. Turns sass into css
190+
],
191+
},
185192
{
186193
test: /\.less$/,
187194
use: [

0 commit comments

Comments
 (0)