From fced4b6e50f6bc70b2de06573003b47ced2f2cdc Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Thu, 30 Jun 2016 00:50:33 +0900 Subject: Make error pages responsive design --- public/404.html | 24 +++++++++++++++++------- public/422.html | 24 +++++++++++++++++------- public/500.html | 24 +++++++++++++++++------- public/502.html | 24 +++++++++++++++++------- public/503.html | 24 +++++++++++++++++------- public/deploy.html | 22 ++++++++++++++++------ 6 files changed, 101 insertions(+), 41 deletions(-) diff --git a/public/404.html b/public/404.html index 4862770cc2a..d9052221f45 100644 --- a/public/404.html +++ b/public/404.html @@ -1,14 +1,13 @@ + The page you're looking for could not be found (404) @@ -47,9 +55,11 @@
404 -

The page you're looking for could not be found.

-
-

Make sure the address is correct and that the page hasn't moved.

-

Please contact your GitLab administrator if you think this is a mistake.

+
+

The page you're looking for could not be found.

+
+

Make sure the address is correct and that the page hasn't moved.

+

Please contact your GitLab administrator if you think this is a mistake.

+
diff --git a/public/422.html b/public/422.html index 055b0bde165..b6986482daa 100644 --- a/public/422.html +++ b/public/422.html @@ -1,14 +1,13 @@ + The change you requested was rejected (422) @@ -47,9 +55,11 @@
422 -

The change you requested was rejected.

-
-

Make sure you have access to the thing you tried to change.

-

Please contact your GitLab administrator if you think this is a mistake.

+
+

The change you requested was rejected.

+
+

Make sure you have access to the thing you tried to change.

+

Please contact your GitLab administrator if you think this is a mistake.

+
diff --git a/public/500.html b/public/500.html index 3d59d1392f5..0c69ab5b19e 100644 --- a/public/500.html +++ b/public/500.html @@ -1,14 +1,13 @@ + Something went wrong (500) @@ -46,9 +54,11 @@
500 -

Whoops, something went wrong on our end.

-
-

Try refreshing the page, or going back and attempting the action again.

-

Please contact your GitLab administrator if this problem persists.

+
+

Whoops, something went wrong on our end.

+
+

Try refreshing the page, or going back and attempting the action again.

+

Please contact your GitLab administrator if this problem persists.

+
diff --git a/public/502.html b/public/502.html index 67dfd8a2743..0f2a310d34c 100644 --- a/public/502.html +++ b/public/502.html @@ -1,14 +1,13 @@ + GitLab is not responding (502) @@ -46,9 +54,11 @@
502 -

Whoops, GitLab is taking too much time to respond.

-
-

Try refreshing the page, or going back and attempting the action again.

-

Please contact your GitLab administrator if this problem persists.

+
+

Whoops, GitLab is taking too much time to respond.

+
+

Try refreshing the page, or going back and attempting the action again.

+

Please contact your GitLab administrator if this problem persists.

+
diff --git a/public/503.html b/public/503.html index 6ab1185658d..c26da8354ea 100644 --- a/public/503.html +++ b/public/503.html @@ -1,14 +1,13 @@ + GitLab is not responding (503) @@ -46,9 +54,11 @@ GitLab Logo
503 -

Whoops, GitLab is currently unavailable.

-
-

Try refreshing the page, or going back and attempting the action again.

-

Please contact your GitLab administrator if this problem persists.

+
+

Whoops, GitLab is currently unavailable.

+
+

Try refreshing the page, or going back and attempting the action again.

+

Please contact your GitLab administrator if this problem persists.

+
diff --git a/public/deploy.html b/public/deploy.html index 48976dacf41..def717a1da4 100644 --- a/public/deploy.html +++ b/public/deploy.html @@ -1,14 +1,13 @@ + Deploy in progress @@ -47,8 +55,10 @@
Deploy in progress -

Please try again in a few minutes.

-
-

Please contact your GitLab administrator if this problem persists.

+
+

Please try again in a few minutes.

+
+

Please contact your GitLab administrator if this problem persists.

+
-- cgit v1.2.1 From 175a910b2a0ca9a61a8646c5577ccd902df7d416 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Thu, 30 Jun 2016 01:19:44 +0900 Subject: Unify HTML format in static error pages --- public/404.html | 78 +++++++++++++++++++------------------- public/422.html | 74 ++++++++++++++++++------------------ public/500.html | 55 +++++++++++++-------------- public/502.html | 5 ++- public/503.html | 5 ++- public/deploy.html | 108 ++++++++++++++++++++++++++--------------------------- 6 files changed, 164 insertions(+), 161 deletions(-) diff --git a/public/404.html b/public/404.html index d9052221f45..92b7f4da0b9 100644 --- a/public/404.html +++ b/public/404.html @@ -4,60 +4,60 @@ The page you're looking for could not be found (404)

-
+ GitLab Logo
404

The page you're looking for could not be found.

-
+

Make sure the address is correct and that the page hasn't moved.

Please contact your GitLab administrator if you think this is a mistake.

diff --git a/public/422.html b/public/422.html index b6986482daa..f625f8a33b7 100644 --- a/public/422.html +++ b/public/422.html @@ -6,53 +6,53 @@ + .container { + margin: auto 20px; + } +

-
+ GitLab Logo
422

diff --git a/public/500.html b/public/500.html index 0c69ab5b19e..d76c66ba92a 100644 --- a/public/500.html +++ b/public/500.html @@ -4,35 +4,35 @@ Something went wrong (500) +

-
+ GitLab Logo
500

Whoops, something went wrong on our end.

-
+

Try refreshing the page, or going back and attempting the action again.

Please contact your GitLab administrator if this problem persists.

diff --git a/public/502.html b/public/502.html index 0f2a310d34c..1a3c7efc769 100644 --- a/public/502.html +++ b/public/502.html @@ -49,14 +49,15 @@ } +

-
+ GitLab Logo
502

Whoops, GitLab is taking too much time to respond.

-
+

Try refreshing the page, or going back and attempting the action again.

Please contact your GitLab administrator if this problem persists.

diff --git a/public/503.html b/public/503.html index c26da8354ea..c1c4e3ffdb8 100644 --- a/public/503.html +++ b/public/503.html @@ -49,14 +49,15 @@ } +

- GitLab Logo
+ GitLab Logo
503

Whoops, GitLab is currently unavailable.

-
+

Try refreshing the page, or going back and attempting the action again.

Please contact your GitLab administrator if this problem persists.

diff --git a/public/deploy.html b/public/deploy.html index def717a1da4..142472b6c35 100644 --- a/public/deploy.html +++ b/public/deploy.html @@ -1,64 +1,64 @@ - - - Deploy in progress - - + .container { + margin: auto 20px; + } + + - -

-
- Deploy in progress -

-
-

Please try again in a few minutes.

-
-

Please contact your GitLab administrator if this problem persists.

-
- + +

+ GitLab Logo
+ Deploy in progress +

+
+

Please try again in a few minutes.

+
+

Please contact your GitLab administrator if this problem persists.

+
+ -- cgit v1.2.1 From c27e1b58d8f41d995ff3a9ff606ce2c4c71a9563 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Thu, 30 Jun 2016 01:28:59 +0900 Subject: Update CHANGELOG --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 791b4435ae9..2e7c5133072 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ v 8.11.0 (unreleased) - Add the `sprockets-es6` gem - Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska) - Profile requests when a header is passed + - Make error pages responsive (Takuya Noguchi) v 8.10.2 (unreleased) - User can now search branches by name. !5144 -- cgit v1.2.1