From ca6620e144e899a558ead182cfbefb4b1383d5fa Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 13 Nov 2019 16:45:16 +0200
Subject: [PATCH] add resolution
---
package.json | 3 +++
.../src/components/button/Button.js | 4 ++--
wax-prosemirror-themes/index.js | 3 +++
.../src/coko-theme/elements/Button.js | 17 -----------------
.../src/coko-theme/elements/index.js | 2 +-
wax-prosemirror-themes/src/coko-theme/index.js | 4 ++--
6 files changed, 11 insertions(+), 22 deletions(-)
delete mode 100644 wax-prosemirror-themes/src/coko-theme/elements/Button.js
diff --git a/package.json b/package.json
index bf77290a1..dbf78de91 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,9 @@
"stylelint": "^8.2.0",
"svg-inline-loader": "^0.8.0"
},
+ "resolutions": {
+ "styled-components": "4.2.0"
+ },
"workspaces": [
"wax-prosemirror-core",
"wax-prosemirror-schema",
diff --git a/wax-prosemirror-components/src/components/button/Button.js b/wax-prosemirror-components/src/components/button/Button.js
index c62287dc0..c2c799786 100644
--- a/wax-prosemirror-components/src/components/button/Button.js
+++ b/wax-prosemirror-components/src/components/button/Button.js
@@ -1,6 +1,6 @@
import React from "react";
import styled from "styled-components";
-import { override } from "@pubsweet/ui-toolkit";
+import { ButtonStyles } from "wax-prosemirror-themes";
const ButtonStyled = styled.button`
opacity: ${props => (props.select ? 1 : 0.4)};
@@ -10,7 +10,7 @@ const ButtonStyled = styled.button`
&:hover {
color: ${props => (props.isActive ? props.theme.colorPrimary : "#000")};
}
- ${override("ui.Button")};
+ ${ButtonStyles};
`;
const Button = ({ view = {}, item }) => (
diff --git a/wax-prosemirror-themes/index.js b/wax-prosemirror-themes/index.js
index b1ec4b46b..042895a85 100644
--- a/wax-prosemirror-themes/index.js
+++ b/wax-prosemirror-themes/index.js
@@ -1 +1,4 @@
export { default as cokoTheme } from "./src/coko-theme/index";
+export {
+ default as ButtonStyles
+} from "./src/coko-theme/elements/ButtonStyles";
diff --git a/wax-prosemirror-themes/src/coko-theme/elements/Button.js b/wax-prosemirror-themes/src/coko-theme/elements/Button.js
deleted file mode 100644
index 5a54e9877..000000000
--- a/wax-prosemirror-themes/src/coko-theme/elements/Button.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import styled, { css } from "styled-components";
-
-export default css`
- background: #fff;
- border: none;
- font-size: inherit;
- cursor: pointer;
- border-radius: 0;
- padding: 5px 10px;
- &:disabled {
- color: #ccc;
- pointer-events: none;
- }
- &:hover {
- background: #f6f6f6;
- }
-`;
diff --git a/wax-prosemirror-themes/src/coko-theme/elements/index.js b/wax-prosemirror-themes/src/coko-theme/elements/index.js
index 1fdf4382e..06cac1a0c 100644
--- a/wax-prosemirror-themes/src/coko-theme/elements/index.js
+++ b/wax-prosemirror-themes/src/coko-theme/elements/index.js
@@ -1 +1 @@
-export { default as Button } from "./Button";
+export { default as ButtonStyles } from "./ButtonStyles";
diff --git a/wax-prosemirror-themes/src/coko-theme/index.js b/wax-prosemirror-themes/src/coko-theme/index.js
index e6cf886e3..314007987 100644
--- a/wax-prosemirror-themes/src/coko-theme/index.js
+++ b/wax-prosemirror-themes/src/coko-theme/index.js
@@ -2,7 +2,7 @@
import "typeface-fira-sans-condensed";
import "typeface-vollkorn";
-import { Button } from "./elements";
+import { ButtonStyled } from "./elements";
const cokoTheme = {
/* Colors */
@@ -69,7 +69,7 @@ const cokoTheme = {
cssOverrides: {
ui: {
- Button
+ ButtonStyled
}
}
};
--
GitLab