Merge conflicts resolved

.all-contributorsrc

@@ -244,6 +244,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "rossmoody",
+      "name": "Ross Moody",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/29072694?v=4",
+      "profile": "http://rossmoody.com",
+      "contributions": [
+        "design"
+      ]
     }
   ],
   "contributorsPerLine": 5,

README.md

@@ -1,6 +1,6 @@
 # Responsively App [![Twitter Follow](https://img.shields.io/twitter/follow/ResponsivelyApp?style=social)](https://twitter.com/ResponsivelyApp)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-27-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Gitter chat](https://img.shields.io/gitter/room/badges/shields.svg)](https://gitter.im/responsively-app) [![xscode](https://img.shields.io/badge/Available%20on-xs%3Acode-blue?style=?style=plastic&logo=appveyor&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRF////////VXz1bAAAAAJ0Uk5T/wDltzBKAAAAlUlEQVR42uzXSwqAMAwE0Mn9L+3Ggtgkk35QwcnSJo9S+yGwM9DCooCbgn4YrJ4CIPUcQF7/XSBbx2TEz4sAZ2q1RAECBAiYBlCtvwN+KiYAlG7UDGj59MViT9hOwEqAhYCtAsUZvL6I6W8c2wcbd+LIWSCHSTeSAAECngN4xxIDSK9f4B9t377Wd7H5Nt7/Xz8eAgwAvesLRjYYPuUAAAAASUVORK5CYII=)](https://xscode.com/manojvivek/responsively-app) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/manojVivek/responsively-app/issues)
 
@@ -103,6 +103,7 @@ Thanks go to these wonderful people ([emoji key](https://allcontributors.org/doc
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/jzabala"><img src="https://avatars0.githubusercontent.com/u/1315054?v=4" width="100px;" alt=""/><br /><sub><b>Johnny Zabala</b></sub></a><br /><a href="https://github.com/manojVivek/responsively-app/commits?author=jzabala" title="Code">💻</a></td>
+    <td align="center"><a href="http://rossmoody.com"><img src="https://avatars0.githubusercontent.com/u/29072694?v=4" width="100px;" alt=""/><br /><sub><b>Ross Moody</b></sub></a><br /><a href="#design-rossmoody" title="Design">🎨</a></td>
   </tr>
 </table>
 

desktop-app/app/components/WebView/index.js

@@ -146,6 +146,7 @@ class WebView extends Component {
         this.dbg.attach();
         this.dbg.on('message', this._onDebuggerEvent);
       }
+      if (this.isMobile) this.hideScrollbar();
     });
 
     if (this.props.transmitNavigatorStatus) {
@@ -490,6 +491,16 @@ class WebView extends Component {
     `);
   };
 
+  hideScrollbar = () => {
+    this.webviewRef.current.insertCSS(
+      `
+        body::-webkit-scrollbar {
+          display: none;
+        }
+        `
+    );
+  };
+
   _isDevToolsOpen = () =>
     !!this.props.browser.devToolsConfig.activeDevTools.find(
       ({deviceId}) => deviceId === this.props.device.id

desktop-app/app/main.dev.js

@@ -43,6 +43,7 @@ import {
   initBrowserSync,
   getBrowserSyncHost,
   getBrowserSyncEmbedScriptURL,
+  closeBrowserSync,
 } from './utils/browserSync';
 import {getHostFromURL} from './utils/urlUtils';
 import browserSync from 'browser-sync';
@@ -117,6 +118,7 @@ app.on('window-all-closed', () => {
   ipcMain.removeHandler('get-local-extension-path');
   ipcMain.removeHandler('get-screen-shot-save-path');
   ipcMain.removeHandler('request-browser-sync');
+  closeBrowserSync();
   // Respect the OSX convention of having the application in memory even
   // after all windows have been closed
   if (process.platform !== 'darwin') {

desktop-app/app/utils/browserSync.js

@@ -35,3 +35,8 @@ async function initInstance(): Promise<> {
     );
   });
 }
+
+export function closeBrowserSync() {
+  browserSync.cleanup();
+  browserSync.exit();
+}

website/pages/assets/appMessages.json

@@ -1,6 +1,6 @@
 {
   "statusBarMessage": {
-    "text": "Support us on Twitter, we just crossed 1,000 followers! 🔥",
-    "link": "https://twitter.com/ResponsivelyApp"
+    "text": "We need your thoughts, please pitch in! Just 2 mins 🙏",
+    "link": "https://docs.google.com/forms/d/e/1FAIpQLSdjwMkFD5ftq6mGqQKUn6ITh175uTkxoQ2LXsTshnBN6rVavw/viewform?usp=sf_link"
   }
 }