Merge pull request #31 from jonathontoon/develop

Develop to Master
jonathontoon · Feb 3, 2018 · 1f04c08 · 1f04c08
2 parents d49ef45 + 67c52b8
commit 1f04c08
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/components/AuthorizationCode.jsx b/app/components/AuthorizationCode.jsx
@@ -118,7 +118,7 @@ class AuthorizationCode extends Component {
         >
           <TwitterLogoStyle src={Logo} alt="Twitter Logo" />
           <HeaderTextStyle>
-            Finish up by entering the 7 digit authorization code shown in the pop up window.
+            Finish up by entering the 7 digit authorization PIN shown in the pop up window.
           </HeaderTextStyle>
           <PinInput
             length={7}

diff --git a/app/constants.js b/app/constants.js
@@ -1,4 +1,4 @@
-export const XTRA_LARGE_FONT_SIZE = 24;
+export const XTRA_LARGE_FONT_SIZE = process.platform === 'darwin' ? 22 : 20;
 export const LARGE_FONT_SIZE = 17;
 export const REGULAR_FONT_SIZE = 16;
 export const SMALL_FONT_SIZE = 14;

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "lint-styles-fix": "stylefmt -r app/*.css app/components/*.css",
     "package": "npm run build && build --publish never",
     "package-all": "npm run build && build -mwl",
-    "package-osx": "npm run build && build --darwin --x64",
+    "package-osx": "npm run build && build --macos --x64",
     "package-linux": "npm run build && build --linux",
     "package-win": "npm run build && build --win --x64",
     "postinstall": "node -r babel-register internals/scripts/CheckNativeDep.js && npm run build-dll && electron-builder install-app-deps && node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",