github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 19:23:49 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8426 from overleaf/ta-error-pages-style

Browse source 
Update General Error Pages Style

GitOrigin-RevId: 04346784c94d5ce6bf3257fd128a3f00da4c4e9e
This commit is contained in:
Alexandre Bourdin 2022-06-22 11:33:22 +02:00 committed by Copybot
parent b0d48c49f2
commit 21c8b9a47a
5 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
services/web/app/views/general/400.pug
View file

@ -9,18 +9,22 @@ block body
.container.full-height .container.full-height
.error-container.full-height .error-container.full-height
.error-details .error-details
p.error-status I'm sorry, Dave. I'm afraid I can't do that. p.error-status Something went wrong, sorry.
p.error-description There was a problem with your latest request
if(message)
|: #{message}
|.
br
| Please go back and try again.
p.error-description p.error-description
| There was a problem with your request.
if(message)
|
| The error is:
if(message)
p.error-box
| #{message}
p.error-description
| Please go back and try again.
| If the problem persists, please contact us at | If the problem persists, please contact us at
| |
a(href="mailto:" + settings.adminEmail) #{settings.adminEmail} a(href="mailto:" + settings.adminEmail) #{settings.adminEmail}
| . | .
a.error-btn(href="javascript:history.back()") Back p.error-actions
|   a.error-btn(href="javascript:history.back()") Back
a.btn.btn-default(href="/") Home |  
a.btn.btn-default(href="/") Home

3
services/web/app/views/general/404.pug
View file

@ -7,4 +7,5 @@ block content
.error-details .error-details
p.error-status Not found p.error-status Not found
p.error-description #{translate("cant_find_page")} p.error-description #{translate("cant_find_page")}
a.error-btn(href="/") Home p.error-actions
a.error-btn(href="/") Home

3
services/web/app/views/general/500.pug
View file

@ -19,4 +19,5 @@ block body
| |
a(href="mailto:" + settings.adminEmail) #{settings.adminEmail} a(href="mailto:" + settings.adminEmail) #{settings.adminEmail}
| . | .
a.error-btn(href="/") Home p.error-actions
a.error-btn(href="/") Home

13
services/web/frontend/stylesheets/app/error-pages.less
View file

@ -23,7 +23,7 @@
.error-status { .error-status {
font-family: @font-family-serif; font-family: @font-family-serif;
margin-bottom: (@line-height-computed / 4); margin-bottom: @line-height-computed;
color: @gray-dark; color: @gray-dark;
font-size: @font-size-h1; font-size: @font-size-h1;
} }
@ -31,7 +31,16 @@
font-family: @font-family-serif; font-family: @font-family-serif;
font-size: @font-size-h3; font-size: @font-size-h3;
color: @gray; color: @gray;
margin-bottom: @line-height-computed * 2; margin-bottom: @line-height-computed;
}
.error-box {
background-color: @ol-blue-gray-1;
padding: @margin-sm;
font-family: @font-family-monospace;
margin-bottom: @line-height-computed;
}
.error-actions {
margin-top: @line-height-computed * 2;
} }
.error-btn { .error-btn {

2
services/web/test/acceptance/src/BodyParserErrorsTest.js
View file

@ -38,7 +38,7 @@ describe('BodyParserErrors', function () {
return done(error) return done(error)
} }
response.statusCode.should.equal(413) response.statusCode.should.equal(413)
body.should.match(/I'm afraid I can't do that./) body.should.match(/There was a problem with your request/)
done() done()
} }
) )