From 44e9c7756872e41689964dfed885071716051f58 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sat, 5 Jan 2019 18:21:37 -0800
Subject: [PATCH] UI styling/propType fixes

---
 frontend/src/Components/Menu/MenuButton.css         |  9 ---------
 .../Components/Page/Toolbar/PageToolbarSection.css  | 13 +++++++++++++
 .../Components/Page/Toolbar/PageToolbarSection.js   |  4 ++--
 .../Release/EditReleaseProfileModalContent.js       |  2 +-
 .../EditReleaseProfileModalContentConnector.js      |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/frontend/src/Components/Menu/MenuButton.css b/frontend/src/Components/Menu/MenuButton.css
index ff4f0dadb..38812cfb7 100644
--- a/frontend/src/Components/Menu/MenuButton.css
+++ b/frontend/src/Components/Menu/MenuButton.css
@@ -19,12 +19,3 @@
 
   pointer-events: none;
 }
-
-@media only screen and (max-width: $breakpointSmall) {
-  .menuButton {
-    &::after {
-      margin-left: 0;
-      content: '\25BE';
-    }
-  }
-}
diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarSection.css b/frontend/src/Components/Page/Toolbar/PageToolbarSection.css
index 5fb56b77c..638636ffb 100644
--- a/frontend/src/Components/Page/Toolbar/PageToolbarSection.css
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarSection.css
@@ -22,6 +22,19 @@
   justify-content: flex-end;
 }
 
+.overflowMenuButton {
+  composes: menuButton from 'Components/Menu/ToolbarMenuButton.css';
+}
+
 .overflowMenuItemIcon {
   margin-right: 8px;
 }
+
+@media only screen and (max-width: $breakpointSmall) {
+  .overflowMenuButton {
+    &::after {
+      margin-left: 0;
+      content: '\25BE';
+    }
+  }
+}
diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarSection.js b/frontend/src/Components/Page/Toolbar/PageToolbarSection.js
index 57b53ff4e..35ee586ec 100644
--- a/frontend/src/Components/Page/Toolbar/PageToolbarSection.js
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarSection.js
@@ -160,6 +160,7 @@ class PageToolbarSection extends Component {
                   !!overflowItems.length &&
                     <Menu>
                       <ToolbarMenuButton
+                        className={styles.overflowMenuButton}
                         iconName={icons.OVERFLOW}
                         text="More"
                       />
@@ -179,14 +180,13 @@ class PageToolbarSection extends Component {
                             return (
                               <MenuItem
                                 key={label}
-                                isDisabled={isDisabled}
+                                isDisabled={isDisabled || isSpinning}
                                 {...otherProps}
                               >
                                 <SpinnerIcon
                                   className={styles.overflowMenuItemIcon}
                                   name={iconName}
                                   spinningName={spinningName}
-                                  isDisabled={isDisabled}
                                   isSpinning={isSpinning}
                                 />
                                 {label}
diff --git a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js
index 90bf5b6d0..2bd142a3f 100644
--- a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js
@@ -94,7 +94,7 @@ function EditReleaseProfileModalContent(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="includePreferredWhenRenaming"
-              helpText="If Preferred Words is included in the naming format include the preferred words above"
+              helpText="Include in {Preferred Words} renaming format"
               {...includePreferredWhenRenaming}
               onChange={onInputChange}
             />
diff --git a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
index a5fbaa680..447bea3c7 100644
--- a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
+++ b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js
@@ -10,7 +10,7 @@ import EditReleaseProfileModalContent from './EditReleaseProfileModalContent';
 const newReleaseProfile = {
   required: '',
   ignored: '',
-  preferred: '',
+  preferred: [],
   includePreferredWhenRenaming: false,
   tags: []
 };