Commit 25ebf79c authored by Christos's avatar Christos

Merge branch 'fixes' into 'master'

Fixes

See merge request !36
parents c2ea1962 2edc6ab2
......@@ -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",
......
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 }) => (
......
export { default as cokoTheme } from "./src/coko-theme/index";
export {
default as ButtonStyles
} from "./src/coko-theme/elements/ButtonStyles";
export { default as Button } from "./Button";
export { default as ButtonStyles } from "./ButtonStyles";
......@@ -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
}
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment