diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-22 16:24:32 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-22 16:24:32 +0100 |
| commit | 550f66ce9155c04eb48af506c8d7832bbce8ac91 (patch) | |
| tree | 4371dbf0199bc00417face999bbec02afacfab71 /packages | |
| parent | adds flow for deleting workspaces (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | ferdium-app-550f66ce9155c04eb48af506c8d7832bbce8ac91.tar.gz ferdium-app-550f66ce9155c04eb48af506c8d7832bbce8ac91.tar.zst ferdium-app-550f66ce9155c04eb48af506c8d7832bbce8ac91.zip | |
Merge branch 'develop' into feature/workspaces
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/forms/package.json | 2 | ||||
| -rw-r--r-- | packages/theme/package.json | 2 | ||||
| -rw-r--r-- | packages/typings/package.json | 2 | ||||
| -rw-r--r-- | packages/ui/package.json | 2 | ||||
| -rw-r--r-- | packages/ui/src/loader/index.tsx | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/packages/forms/package.json b/packages/forms/package.json index be7f9f99e..e78929777 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "@meetfranz/forms", | 2 | "name": "@meetfranz/forms", |
| 3 | "version": "1.0.7", | 3 | "version": "1.0.9", |
| 4 | "description": "React form components for Franz", | 4 | "description": "React form components for Franz", |
| 5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
| 6 | "scripts": { | 6 | "scripts": { |
diff --git a/packages/theme/package.json b/packages/theme/package.json index f5dfc0236..5c21a787f 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "@meetfranz/theme", | 2 | "name": "@meetfranz/theme", |
| 3 | "version": "1.0.7", | 3 | "version": "1.0.9", |
| 4 | "description": "Theme configuration for Franz", | 4 | "description": "Theme configuration for Franz", |
| 5 | "author": "Stefan Malzner <stefan@adlk.io>", | 5 | "author": "Stefan Malzner <stefan@adlk.io>", |
| 6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
diff --git a/packages/typings/package.json b/packages/typings/package.json index 21820df17..54257c54c 100644 --- a/packages/typings/package.json +++ b/packages/typings/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "@meetfranz/typings", | 2 | "name": "@meetfranz/typings", |
| 3 | "version": "0.0.5", | 3 | "version": "0.0.7", |
| 4 | "description": "TypeScript typings for internal and external projects", | 4 | "description": "TypeScript typings for internal and external projects", |
| 5 | "author": "Stefan Malzner <stefan@adlk.io>", | 5 | "author": "Stefan Malzner <stefan@adlk.io>", |
| 6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
diff --git a/packages/ui/package.json b/packages/ui/package.json index abdd69b97..62a1e5a6e 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "@meetfranz/ui", | 2 | "name": "@meetfranz/ui", |
| 3 | "version": "0.0.2", | 3 | "version": "0.0.4", |
| 4 | "description": "React UI components for Franz", | 4 | "description": "React UI components for Franz", |
| 5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
| 6 | "scripts": { | 6 | "scripts": { |
diff --git a/packages/ui/src/loader/index.tsx b/packages/ui/src/loader/index.tsx index de5ba5237..46545c786 100644 --- a/packages/ui/src/loader/index.tsx +++ b/packages/ui/src/loader/index.tsx | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | import { Theme } from '@meetfranz/theme'; | 1 | import { Theme } from '@meetfranz/theme'; |
| 2 | import classnames from 'classnames'; | 2 | import classnames from 'classnames'; |
| 3 | import React, { Component } from 'react'; | 3 | import React, { Component } from 'react'; |
| 4 | import injectStyle from 'react-jss'; | 4 | import injectStyle, { withTheme } from 'react-jss'; |
| 5 | import ReactLoader from 'react-loader'; | 5 | import ReactLoader from 'react-loader'; |
| 6 | 6 | ||
| 7 | import { IWithStyle } from '../typings/generic'; | 7 | import { IWithStyle } from '../typings/generic'; |
| @@ -45,4 +45,4 @@ class LoaderComponent extends Component<IProps> { | |||
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | export const Loader = injectStyle(styles)(LoaderComponent); | 48 | export const Loader = injectStyle(styles)(withTheme(LoaderComponent)); |