Skip to content

Commit

Permalink
Bump less-loader from 7.0.1 to 7.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot-preview[bot] authored and oliviertassinari committed Oct 18, 2020
1 parent 49237cd commit 6a962e5
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 173 deletions.
4 changes: 0 additions & 4 deletions packages/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,9 @@
"@types/styled-components": "^5.0.1",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.0.3",
"css-loader": "^4.2.1",
"html-webpack-plugin": "^4.5.0",
"less": "^3.10.3",
"less-loader": "^7.0.1",
"node-fetch": "^2.6.0",
"source-map-loader": "^1.0.2",
"style-loader": "^2.0.0",
"ts-loader": "^8.0.2",
"typescript": "^3.9.6",
"webpack": "^4.41.5",
Expand Down
88 changes: 0 additions & 88 deletions packages/demo-app/src/app/app.less

This file was deleted.

103 changes: 102 additions & 1 deletion packages/demo-app/src/app/app.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { HashRouter, Route, Switch } from 'react-router-dom';
import styled from 'styled-components';
import styled, { createGlobalStyle } from 'styled-components';
import './app.less';
import { DemoAppBar } from './app-bar';
import { AppDrawer } from './app-drawer';
Expand All @@ -9,6 +9,106 @@ import { ThemeProvider, useTheme } from './demos/theme';
import { RealDataGridDemo } from './demos/grid/real-data-grid.demo';
import { AppIntro } from './app-intro';

const GlobalStyle = createGlobalStyle`
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}
#root {
min-width: 100%;
min-height: 100%;
display: flex;
position: absolute;
}
.app {
display: flex;
flex-direction: column;
width: 100%;
}
.main-container {
position: relative;
flex-grow: 1;
box-sizing: border-box;
}
.fill-space, .fill-abs, .fill {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
}
.flex-col {
display: flex;
flex-direction: column;
}
.flex-row {
display: flex;
flex-direction: row;
}
.grow {
flex-grow: 1;
}
.center {
justify-content: center;
}
.action-bar {
display: flex;
justify-content: center;
button {
margin-right: 20px;
}
}
.storybook-img {
width: 30px;
}
@media screen and (max-width: 768px) {
.big-device {
display: none !important;
}
}
.negative {
color: #d20704;
}
.positive {
color: #008508;
}
.info-icon {
color: #2196f3;
align-self: center;
}
.bad {
background: rgba(255,128,171,.4);
}
.good {
background: rgba(185,246,202,.4);
}
`;

const StyledApp = styled.div`
background: ${(p) => p.theme.colors.background};
`;
Expand All @@ -23,6 +123,7 @@ export function App() {
const { theme, themeId, toggleTheme, isDark } = useTheme();
return (
<ThemeProvider theme={theme}>
<GlobalStyle />
<HashRouter>
<StyledApp className="app">
<DemoAppBar
Expand Down
4 changes: 0 additions & 4 deletions packages/demo-app/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ module.exports = {
use: 'ts-loader',
exclude: /node_modules/,
},
{
test: /\.less|\.css$/,
use: ['style-loader', 'css-loader', 'less-loader'],
},
{
test: /\.(png|svg|jpg|jpeg|gif|ico)$/,
exclude: /node_modules/,
Expand Down
4 changes: 0 additions & 4 deletions webpackBaseConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ module.exports = {
test: /\.md$/,
loader: 'raw-loader',
},
{
test: /\.css$/,
loader: 'style-loader!css-loader',
},
],
},
};
Loading

0 comments on commit 6a962e5

Please sign in to comment.