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

This commit is contained in:
James Allen 2017-03-01 10:03:16 +00:00
commit a8756432b7
3 changed files with 635 additions and 626 deletions

File diff suppressed because it is too large Load diff

View file

@ -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"
}

View file

@ -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;