Merge branch 'master' into ja-use-dirty-state

services/web/package.json

@@ -92,7 +92,7 @@
     "grunt-postcss": "^0.8.0",
     "grunt-sed": "^0.1.1",
     "sandboxed-module": "0.2.0",
-    "sinon": "",
+    "sinon": "^1.17.0",
     "timekeeper": "",
     "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master"
   }

services/web/public/stylesheets/app/editor.less

@@ -26,15 +26,22 @@
 	position: absolute;
 	z-index: 20;
 	top: 2px;
-	width: 400px;
-	left: 50%;
-	margin-left: -200px;
+	left: 0;
+	right: 0;
+	text-align: center;
+
 	.alert {
+		display: inline-block;
+		text-align: left;
+		min-width: 400px;
 		padding: (@line-height-computed / 4);
 		font-size: 14px;
 		margin-bottom: (@line-height-computed / 4);
 	}
 }
+	#try-reconnect-now-button {
+		margin-left: 20px;
+	}
 
 #ide-body {
 	.full-size;