diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-10 20:04:02 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-13 09:41:55 +0200 |
| commit | bd8ff93c8c3bc918cf926a3108eaacbf2e3a093e (patch) | |
| tree | 3fbb6f11fac88778e00801f4a679f65bcb35671b | |
| parent | 1dd0caf4d95c6d09fe54041fd7aff9f8661bfbef (diff) | |
| download | gitlab-ce-bd8ff93c8c3bc918cf926a3108eaacbf2e3a093e.tar.gz | |
Improve text on error pages.
| -rw-r--r-- | public/404.html | 7 | ||||
| -rw-r--r-- | public/422.html | 12 | ||||
| -rw-r--r-- | public/500.html | 5 | ||||
| -rw-r--r-- | public/502.html | 3 | ||||
| -rw-r--r-- | public/deploy.html | 12 | ||||
| -rw-r--r-- | public/static.css | 10 |
6 files changed, 32 insertions, 17 deletions
diff --git a/public/404.html b/public/404.html index 867f193a98f..a0106bc760d 100644 --- a/public/404.html +++ b/public/404.html @@ -1,14 +1,15 @@ <!DOCTYPE html> <html> <head> - <title>The page you were looking for doesn't exist (404)</title> + <title>The page you're looking for could not be found (404)</title> <link href="/static.css" media="screen" rel="stylesheet" type="text/css" /> </head> <body> <h1>404</h1> - <h3>The page you were looking for doesn't exist.</h3> + <h3>The page you're looking for could not be found.</h3> <hr/> - <p>You may have mistyped the address or the page may have moved.</p> + <p>Make sure the address is correct and that the page hasn't moved.</p> + <p>Please contact your GitLab administrator if you think this is a mistake.</p> </body> </html> diff --git a/public/422.html b/public/422.html index b6c37ac5386..cad385ac153 100644 --- a/public/422.html +++ b/public/422.html @@ -1,16 +1,16 @@ <!DOCTYPE html> <html> <head> - <title>The change you wanted was rejected (422)</title> - <link href="/static.css" media="screen" rel="stylesheet" type="text/css" /> + <title>The change you requested was rejected (422)</title> + <link href="static.css" media="screen" rel="stylesheet" type="text/css" /> </head> <body> <!-- This file lives in public/422.html --> <h1>422</h1> - <div> - <h2>The change you wanted was rejected.</h2> - <p>Maybe you tried to change something you didn't have access to.</p> - </div> + <h3>The change you requested was rejected.</h3> + <hr /> + <p>Make sure you have access to the thing you tried to change.</p> + <p>Please contact your GitLab administrator if you think this is a mistake.</p> </body> </html> diff --git a/public/500.html b/public/500.html index c84b9e90e4b..08c11bbd05a 100644 --- a/public/500.html +++ b/public/500.html @@ -1,13 +1,14 @@ <!DOCTYPE html> <html> <head> - <title>We're sorry, but something went wrong (500)</title> + <title>Something went wrong (500)</title> <link href="/static.css" media="screen" rel="stylesheet" type="text/css" /> </head> <body> <h1>500</h1> - <h3>We're sorry, but something went wrong.</h3> + <h3>Whoops, something went wrong on our end.</h3> <hr/> + <p>Try refreshing the page, or going back and attempting the action again.</p> <p>Please contact your GitLab administrator if this problem persists.</p> </body> </html> diff --git a/public/502.html b/public/502.html index d171eccc927..9480a928439 100644 --- a/public/502.html +++ b/public/502.html @@ -6,8 +6,9 @@ </head> <body> <h1>502</h1> - <h3>GitLab is not responding.</h3> + <h3>Whoops, GitLab is taking too much time to respond.</h3> <hr/> + <p>Try refreshing the page, or going back and attempting the action again.</p> <p>Please contact your GitLab administrator if this problem persists.</p> </body> </html> diff --git a/public/deploy.html b/public/deploy.html index e41ed76573d..1a41b772f3c 100644 --- a/public/deploy.html +++ b/public/deploy.html @@ -1,11 +1,17 @@ <!DOCTYPE html> <html> <head> - <title>Deploy in progress. Please try again in a few minutes</title> + <title>Deploy in progress</title> <link href="/static.css" media="screen" rel="stylesheet" type="text/css" /> </head> + <body> - <h1><center><img src="/gitlab_logo.png"/></center>Deploy in progress</h1> - <h3>Please try again in a few minutes or contact your administrator.</h3> + <h1> + <img src="/gitlab_logo.png" /><br /> + Deploy in progress + </h1> + <h3>Please try again in a few minutes.</h3> + <hr/> + <p>Please contact your GitLab administrator if this problem persists.</p> </body> </html> diff --git a/public/static.css b/public/static.css index c6f92ac01d9..0a2b6060d48 100644 --- a/public/static.css +++ b/public/static.css @@ -2,18 +2,24 @@ body { color: #666; text-align: center; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - margin:0; + margin: 0; width: 800px; margin: auto; font-size: 14px; } + h1 { font-size: 56px; line-height: 100px; font-weight: normal; color: #456; } -h2 { font-size: 24px; color: #666; line-height: 1.5em; } + +h2 { + font-size: 24px; + color: #666; + line-height: 1.5em; +} h3 { color: #456; |