Merge pull request #472 from sharelatex/pr-v2-error-pages

v2 error pages

services/web/app/views/general/500.pug

@@ -4,7 +4,7 @@ html.full-height(itemscope, itemtype='http://schema.org/Product')
 		title Something went wrong
 		link(rel="icon", href="/favicon.ico")
 		if buildCssPath
-			link(rel='stylesheet', href=buildCssPath('/style.css'))
+			link(rel="stylesheet", href=buildCssPath("/" + settings.brandPrefix + "style.css"))
 		link(href="//netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css",rel="stylesheet")
 	body.full-height
 		.content.full-height
@@ -18,19 +18,4 @@ html.full-height(itemscope, itemtype='http://schema.org/Product')
 					.error-details
 						p.error-status Something went wrong, sorry.
 						p.error-description Our staff are probably looking into this, but if it continues, please contact us at #{settings.adminEmail}
-						a.error-btn(href="/") Home
-		//- .content
-		//- 	.container
-		//- 		.row
-		//- 			.col-md-8.col-md-offset-2.text-center
-		//- 				.page-header
-		//- 					h2 Oh dear, something went wrong.
-		//- 				if buildImgPath
-		//- 					p
-		//- 						img(src=buildImgPath("lion-sad-128.png"), alt="Sad Lion")
-		//- 				p
-		//- 					| Something went wrong with your request, sorry. Our staff are probably looking into this, but if it continues, please contact us at #{settings.adminEmail}
-		//- 				p
-		//- 					a(href="/")
-		//- 						i.fa.fa-arrow-circle-o-left
-		//- 						|  Take me home
+						a.error-btn(href="/") Home

services/web/public/stylesheets/app/error-pages.less

@@ -7,6 +7,11 @@
 	display: flex;
 	align-items: center;
 }
+
+.error-container.full-height when (@is-overleaf = true) {
+	margin-top: -(@header-height + @content-margin-vertical) / 2;
+}
+
 	.error-figure {
 		display: none;
 		flex: 0 0 50%;
@@ -15,6 +20,11 @@
 			display: block;
 		}
 	}
+
+	.error-figure when (@is-overleaf = true) {
+		display: none;
+	}
+
 	.error-figure-500 {
 		&::before {
 			content: '';
@@ -56,6 +66,11 @@
 		flex: 0 1 50%;
 		padding: @line-height-computed * 2;
 	}
+	
+	.error-details when (@is-overleaf = true) {
+		flex-grow: 1;
+	}
+
 		.error-status {
 			font-family: @font-family-serif;
 			margin-bottom: (@line-height-computed / 4);
@@ -68,7 +83,7 @@
 			color: @gray;
 			margin-bottom: @line-height-computed * 2;
 		}
-		.error-btn {
+		.error-btn when (@is-overleaf = false) {
 			color: @navbar-default-link-color;
 			border: 2px solid @navbar-default-link-color;
 			border-radius: @border-radius-base;
@@ -83,4 +98,13 @@
 				background-color: @navbar-default-link-hover-bg;
 				border: 2px solid @navbar-default-link-hover-color;
 			}
+		}
+
+		.error-btn when (@is-overleaf = true) {
+			.btn;
+			.btn-primary;
+			display: block;
+			@media (min-width: @screen-sm-min) {
+				display: inline-block;
+			}
 		}