From 9e8c5bc5889d2de506ea41b5a465023e8b6a8667 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 13 Mar 2020 09:50:54 +0100 Subject: [PATCH] core/layout/Page: removed unused theme fields --- .../core/src/layout/Header/Header.test.js | 4 +- packages/core/src/layout/Page/Page.tsx | 2 +- .../core/src/layout/Page/PageThemeProvider.ts | 156 +++++++----------- 3 files changed, 63 insertions(+), 99 deletions(-) diff --git a/packages/core/src/layout/Header/Header.test.js b/packages/core/src/layout/Header/Header.test.js index d911f23283..0c30f82aee 100644 --- a/packages/core/src/layout/Header/Header.test.js +++ b/packages/core/src/layout/Header/Header.test.js @@ -47,7 +47,7 @@ describe('
', () => { }); it('should have type rendered', () => { - const rendered = render(wrapInThemedTestApp(
)); - rendered.getByText('service'); + const rendered = render(wrapInThemedTestApp(
)); + rendered.getByText('tool'); }); }); diff --git a/packages/core/src/layout/Page/Page.tsx b/packages/core/src/layout/Page/Page.tsx index 0a878b77b3..b4ff827d45 100644 --- a/packages/core/src/layout/Page/Page.tsx +++ b/packages/core/src/layout/Page/Page.tsx @@ -18,7 +18,7 @@ import React, { FC } from 'react'; import { PageTheme, pageTheme } from './PageThemeProvider'; import { makeStyles } from '@material-ui/core'; -export const Theme = React.createContext(pageTheme.service); +export const Theme = React.createContext(pageTheme.home); const useStyles = makeStyles(() => ({ root: { diff --git a/packages/core/src/layout/Page/PageThemeProvider.ts b/packages/core/src/layout/Page/PageThemeProvider.ts index 26c2629f5c..64c90b78a1 100644 --- a/packages/core/src/layout/Page/PageThemeProvider.ts +++ b/packages/core/src/layout/Page/PageThemeProvider.ts @@ -14,115 +14,79 @@ * limitations under the License. */ -export const gradients = { - blue: { - colors: ['#2D46B9', '#509BF5'], - style: 'linear-gradient(135deg, #2D46B9 0%, #509BF5 100%)', - }, - darkBlue: { - colors: ['#1E3264', '#A0C3D2'], - style: 'linear-gradient(44deg, #1E3264 0%, #A0C3D2 100%)', - }, - brown: { - colors: ['#674638', '#C39887'], - style: 'linear-gradient(44deg, #674638 0%, #C39887 100%)', - }, - green: { - colors: ['#1DB954', '#006350'], - style: 'linear-gradient(-90deg, #1DB954 0%, #006350 100%)', - }, - orangeYellow: { - colors: ['#FF6437', '#FFC864'], - style: 'linear-gradient(37deg, #FF6437 0%, #FFC864 100%)', - }, - redOrange: { - colors: ['#A72525', '#E6542D'], - style: 'linear-gradient(37deg, #A72525 0%, #E6542D 100%)', - }, - pinkOrange: { - colors: ['#F13DA2', '#FF8A48'], - style: 'linear-gradient(43deg, #F13DA2 0%, #FF8A48 100%)', - }, - purpleBlue: { - colors: ['#4100F4', '#AF2996'], - style: 'linear-gradient(-137deg, #4100F4 0%, #AF2996 100%)', - }, - tealGreen: { - colors: ['#19E68C', '#1D7F6E'], - style: 'linear-gradient(-137deg, #19E68C 0%, #1D7F6E 100%)', - }, - violetPeach: { - colors: ['#B39AC8', '#FCCBD3'], - style: 'linear-gradient(44deg, #B39AC8 0%, #FCCBD3 100%)', - }, - violetGreen: { - colors: ['#4302F4', '#C3EFC8'], - style: 'linear-gradient(44deg, #4302F4 0%, #C3EFC8 100%)', - }, - purple: { - colors: ['#a186bd', '#7c5c92'], - style: 'linear-gradient(-90deg, #a186bd 0%, #7c5c92 100%)', - }, - eveningSea: { - colors: ['#00FFF2', '#035355'], - style: 'linear-gradient(-137deg, #00FFF2 0%, #035355 100%)', - }, - royalBlue: { - colors: ['#000044', '#4B80D4'], - style: - 'linear-gradient(45deg, #000044 0%, #0000DD 61.47%, #0033DD 74%, #4B80D4 100%)', - }, - grey: { - colors: ['#111111', '#777777'], - style: 'linear-gradient(45deg, #111111 0%, #777777 100%)', - }, - sunset: { - colors: ['#cf8022', '#4e6ec7'], - style: 'linear-gradient(148deg, #cf8022 0%, #4e6ec7 100%)', - }, - sky: { - colors: ['#69B9FF', '#ACCEEC'], - style: 'linear-gradient(135deg, #69B9FF 0%, #ACCEEC 100%)', - }, - teal: { - colors: ['#1F8A77', 'rgba(155, 240, 225, 1.0)'], - style: - 'linear-gradient(180.91deg, rgba(155, 240, 225, 0.72) -42.22%, rgba(155, 240, 225, 0) 85.3%)', - }, +export type Gradient = { + colors: string[]; }; export type PageTheme = { - activeNavLinkColor: string; - gradient: { colors: string[]; style: string }; + gradient: Gradient; +}; + +export const gradients: Record = { + blue: { + colors: ['#2D46B9', '#509BF5'], + }, + darkBlue: { + colors: ['#1E3264', '#A0C3D2'], + }, + brown: { + colors: ['#674638', '#C39887'], + }, + green: { + colors: ['#1DB954', '#006350'], + }, + orangeYellow: { + colors: ['#FF6437', '#FFC864'], + }, + redOrange: { + colors: ['#A72525', '#E6542D'], + }, + pinkOrange: { + colors: ['#F13DA2', '#FF8A48'], + }, + purpleBlue: { + colors: ['#4100F4', '#AF2996'], + }, + tealGreen: { + colors: ['#19E68C', '#1D7F6E'], + }, + violetPeach: { + colors: ['#B39AC8', '#FCCBD3'], + }, + violetGreen: { + colors: ['#4302F4', '#C3EFC8'], + }, + purple: { + colors: ['#a186bd', '#7c5c92'], + }, + eveningSea: { + colors: ['#00FFF2', '#035355'], + }, + royalBlue: { + colors: ['#000044', '#4B80D4'], + }, + grey: { + colors: ['#111111', '#777777'], + }, + sunset: { + colors: ['#cf8022', '#4e6ec7'], + }, + sky: { + colors: ['#69B9FF', '#ACCEEC'], + }, + teal: { + colors: ['#1F8A77', 'rgba(155, 240, 225, 1.0)'], + }, }; export const pageTheme: Record = { - service: { - activeNavLinkColor: '#1D7F6E', - gradient: gradients.tealGreen, - }, - website: { - activeNavLinkColor: '#765d90', - gradient: gradients.purple, - }, home: { - activeNavLinkColor: '#00814e', gradient: gradients.teal, }, - org: { - activeNavLinkColor: '#6044ef', - gradient: gradients.violetGreen, - }, documentation: { - activeNavLinkColor: '#04c2ba', gradient: gradients.eveningSea, }, tool: { - activeNavLinkColor: '#04c2ba', gradient: gradients.purpleBlue, }, - library: { - activeNavLinkColor: '#B39AC8', - gradient: gradients.sunset, - }, };