Merge branch 'fixes' into 'master'

Fixes

See merge request wax/wax-prosemirror!35

wax-prosemirror-components/src/components/button/Button.js

 import React from "react";
 import styled from "styled-components";
-import { ButtonStyles } from "wax-prosemirror-themes";
+import { override } from "@pubsweet/ui-toolkit";
 
 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")};
   }
-  ${ButtonStyles};
+  ${override("ui.Button")};
 `;
 
 const Button = ({ view = {}, item }) => (

wax-prosemirror-components/src/mainMenuBar/MainMenuBar.js

@@ -58,13 +58,9 @@ const MainMenuBar = ({
   <MainMenuContainer>
     <MainMenuInner>
       <MainMenu>
-        {
-          <span>
-            {map(setMenuItems(MainMenuBarItems, menuItems), item =>
-              item.menu({ view, item, fileUpload })
-            )}
-          </span>
-        }
+        {map(setMenuItems(MainMenuBarItems, menuItems), item =>
+          item.menu({ view, item, fileUpload })
+        )}
       </MainMenu>
     </MainMenuInner>
   </MainMenuContainer>

wax-prosemirror-components/src/sideMenuBar/SideMenuBar.js

@@ -57,13 +57,9 @@ const SideMenuBar = ({
   <SideMenuContainer>
     <SideMenuInner>
       <SideMenu>
-        {
-          <span>
-            {map(setMenuItems(SideMenuItems, menuItems), item =>
-              item.menu({ view, item, fileUpload })
-            )}
-          </span>
-        }
+        {map(setMenuItems(SideMenuItems, menuItems), item =>
+          item.menu({ view, item, fileUpload })
+        )}
       </SideMenu>
     </SideMenuInner>
   </SideMenuContainer>

wax-prosemirror-themes/index.js

 export { default as cokoTheme } from "./src/coko-theme/index";
-export { default as ButtonStyles } from "./src/coko-theme/elements/Button";

wax-prosemirror-themes/src/coko-theme/index.js

@@ -68,7 +68,9 @@ const cokoTheme = {
   breakpoints: [480, 768, 1000, 1272],
 
   cssOverrides: {
-    Button
+    ui: {
+      Button
+    }
   }
 };