Skip to content

Commit

Permalink
fix: design system types
Browse files Browse the repository at this point in the history
  • Loading branch information
wojtek-krysiak committed Aug 1, 2020
1 parent 7bbb2f3 commit f96170c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 25 deletions.
8 changes: 3 additions & 5 deletions src/admin-bro-options.interface.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DefaultTheme as Theme } from '@admin-bro/design-system'
import { ThemeOverride } from '@admin-bro/design-system'

import BaseResource from './backend/adapters/base-resource'
import BaseDatabase from './backend/adapters/base-database'
Expand Down Expand Up @@ -113,7 +113,7 @@ export default interface AdminBroOptions {
*/
version?: VersionSettings;
/**
* Options which are related to the branding.
* Options which are related to the ht.
*/
branding?: BrandingOptions;
/**
Expand Down Expand Up @@ -297,7 +297,7 @@ export type BrandingOptions = {
/**
* CSS theme.
*/
theme?: Partial<Theme>;
theme?: Partial<ThemeOverride>;
/**
* Flag indicates if `SoftwareBrothers` tiny hart icon should be visible on the bottom sidebar.
*/
Expand Down Expand Up @@ -368,5 +368,3 @@ export interface AdminBroOptionsWithDefault extends AdminBroOptions {
};
pages: Record<string, AdminPage>;
}

export { Theme }
3 changes: 1 addition & 2 deletions src/frontend/components/spec/test-context-provider.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, { ReactNode } from 'react'

import { StaticRouter } from 'react-router-dom'
import { ThemeProvider } from 'styled-components'
import combineStyles from '../../styles/combine-styles'
import { combineStyles } from '@admin-bro/design-system'

const theme = combineStyles({})

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/layout-template.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { renderToString } from 'react-dom/server'
import { StaticRouter } from 'react-router-dom'
import { Provider } from 'react-redux'
import { ThemeProvider } from 'styled-components'
import { combineStyles } from '@admin-bro/design-system'

import App from './components/application'
import ViewHelpers from '../backend/utils/view-helpers'
import initializeStore from './store'
import combineStyles from './styles/combine-styles'
import AdminBro from '../admin-bro'
import { CurrentAdmin } from '../current-admin.interface'

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/login-template.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { I18nextProvider } from 'react-i18next'
import i18n from 'i18next'

import { Provider } from 'react-redux'
import { combineStyles } from '@admin-bro/design-system'
import LoginComponent from './components/login'
import AdminBro from '../admin-bro'

Expand All @@ -15,7 +16,6 @@ import createStore, {
initializeLocale,
ReduxState,
} from './store/store'
import combineStyles from './styles/combine-styles'
import ViewHelpers from '../backend/utils/view-helpers'

type LoginTemplateAttributes = {
Expand Down
15 changes: 0 additions & 15 deletions src/frontend/styles/combine-styles.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/frontend/styles/styled-components.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DefaultTheme as Theme } from '@admin-bro/design-system'
import { Theme } from '@admin-bro/design-system'

declare module 'styled-components' {
// eslint-disable-next-line @typescript-eslint/no-empty-interface
Expand Down

0 comments on commit f96170c

Please sign in to comment.