From e2cc4ce099bb945471ec0011d76f463e67e6bce3 Mon Sep 17 00:00:00 2001 From: Eug-VS Date: Tue, 18 Feb 2020 01:56:15 +0300 Subject: refactor: import material colors --- src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx b/src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx index efb4f86..a7790bf 100644 --- a/src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx +++ b/src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx @@ -1,4 +1,6 @@ import React from 'react'; +import orange from '@material-ui/core/colors/orange'; +import purple from '@material-ui/core/colors/purple'; import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles'; import { CssBaseline } from '@material-ui/core'; import 'typeface-roboto'; @@ -17,10 +19,10 @@ const benzinTheme = createMuiTheme({ palette: { type: 'dark', primary: { - main: '#ffa726', + main: orange[400], }, secondary: { - main: '#9c27b0', + main: purple[500], }, background: { default: '#121212', -- cgit v1.2.3 From ecc7577fd3791c071a355f46c9da82d80cb72757 Mon Sep 17 00:00:00 2001 From: Eug-VS Date: Tue, 18 Feb 2020 02:02:51 +0300 Subject: refactor!: rename BenzinThemeProvider -> Benzin --- src/index.tsx | 6 +-- src/lib/Benzin/Benzin.tsx | 51 ++++++++++++++++++++++ .../BenzinThemeProvider/BenzinThemeProvider.tsx | 51 ---------------------- src/lib/index.ts | 2 +- 4 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 src/lib/Benzin/Benzin.tsx delete mode 100644 src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx (limited to 'src') diff --git a/src/index.tsx b/src/index.tsx index 9d32585..73536d7 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -4,7 +4,7 @@ import ReactDOM from 'react-dom'; import { makeStyles, Link } from '@material-ui/core'; import { - BenzinThemeProvider, + Benzin, Header, Window, ContentSection, @@ -66,7 +66,7 @@ const App: React.FC = () => { }; return ( - +
{ renderItem={renderItem} /> - + ); }; diff --git a/src/lib/Benzin/Benzin.tsx b/src/lib/Benzin/Benzin.tsx new file mode 100644 index 0000000..83ed0b0 --- /dev/null +++ b/src/lib/Benzin/Benzin.tsx @@ -0,0 +1,51 @@ +import React from 'react'; +import orange from '@material-ui/core/colors/orange'; +import purple from '@material-ui/core/colors/purple'; +import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles'; +import { CssBaseline } from '@material-ui/core'; +import 'typeface-roboto'; + + +declare module '@material-ui/core/styles/createPalette' { + interface TypeBackground { + elevation1: string; + elevation2: string; + elevation3: string; + } +} + + +const benzinTheme = createMuiTheme({ + palette: { + type: 'dark', + primary: { + main: orange[400], + }, + secondary: { + main: purple[500], + }, + background: { + default: '#121212', + paper: '#1e1e1e', + elevation1: '#1e1e1e', + elevation2: '#232323', + elevation3: '#252525', + }, + text: { + primary: '#f4f4f4', + secondary: 'rgba(255, 255, 255, 0.6)', + } + }, +}); + + +const Benzin: React.FC = ({ children }) => ( + + + {children} + +); + + +export default Benzin; + diff --git a/src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx b/src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx deleted file mode 100644 index a7790bf..0000000 --- a/src/lib/BenzinThemeProvider/BenzinThemeProvider.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import React from 'react'; -import orange from '@material-ui/core/colors/orange'; -import purple from '@material-ui/core/colors/purple'; -import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles'; -import { CssBaseline } from '@material-ui/core'; -import 'typeface-roboto'; - - -declare module '@material-ui/core/styles/createPalette' { - interface TypeBackground { - elevation1: string; - elevation2: string; - elevation3: string; - } -} - - -const benzinTheme = createMuiTheme({ - palette: { - type: 'dark', - primary: { - main: orange[400], - }, - secondary: { - main: purple[500], - }, - background: { - default: '#121212', - paper: '#1e1e1e', - elevation1: '#1e1e1e', - elevation2: '#232323', - elevation3: '#252525', - }, - text: { - primary: '#f4f4f4', - secondary: 'rgba(255, 255, 255, 0.6)', - } - }, -}); - - -const BenzinThemeProvider: React.FC = ({ children }) => ( - - - {children} - -); - - -export default BenzinThemeProvider; - diff --git a/src/lib/index.ts b/src/lib/index.ts index a41dd39..1529443 100644 --- a/src/lib/index.ts +++ b/src/lib/index.ts @@ -2,5 +2,5 @@ export { default as Window } from './Window/Window'; export { default as Header } from './Header/Header'; export { default as ContentSection } from './ContentSection/ContentSection'; export { default as SmartList } from './SmartList/SmartList'; -export { default as BenzinThemeProvider } from './BenzinThemeProvider/BenzinThemeProvider'; +export { default as Benzin } from './Benzin/Benzin'; export { default as Button } from './Button/Button'; -- cgit v1.2.3