kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve error page layout

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-06-24 15:57:38 +03:00
parent 308b11a5b7
commit 8307704c2d
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
8 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/generic/common.scss
View file

@ -257,13 +257,6 @@ li.note {
} }
} }
h1.http_status_code {
font-size: 56px;
line-height: 100px;
font-weight: normal;
color: #456;
}
.control-group { .control-group {
.controls { .controls {
span { span {

14
app/assets/stylesheets/sections/errors.scss Normal file
View file

@ -0,0 +1,14 @@
.error-page {
max-width: 400px;
margin: 0 auto;
h1, h2, h3 {
text-align: center;
}
h1 {
font-size: 56px;
line-height: 100px;
font-weight: 300;
}
}

4
app/views/errors/access_denied.html.haml
View file

@ -1,5 +1,5 @@
%h1.http_status_code 403 %h1 403
%h3.page-title Access Denied %h3 Access Denied
%hr %hr
%p You are not allowed to access this page. %p You are not allowed to access this page.
%p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "vlink"} %p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "vlink"}

4
app/views/errors/encoding.html.haml
View file

@ -1,4 +1,4 @@
%h1.http_status_code 500 %h1 500
%h3.page-title Encoding Error %h3 Encoding Error
%hr %hr
%p Page can't be loaded because of an encoding error. %p Page can't be loaded because of an encoding error.

4
app/views/errors/git_not_found.html.haml
View file

@ -1,5 +1,5 @@
%h1.http_status_code 404 %h1 404
%h3.page-title Git Resource Not found %h3 Git Resource Not found
%hr %hr
%p %p
Application can't get access to some branch or commit in your repository. It Application can't get access to some branch or commit in your repository. It

4
app/views/errors/not_found.html.haml
View file

@ -1,4 +1,4 @@
%h1.http_status_code 404 %h1 404
%h3.page-title The resource you were looking for doesn't exist. %h3 The resource you were looking for doesn't exist.
%hr %hr
%p You may have mistyped the address or the page may have moved. %p You may have mistyped the address or the page may have moved.

16
app/views/errors/omniauth_error.html.haml
View file

@ -1,12 +1,12 @@
%h1.http_status_code 422 %h1 422
%h3.page-title Sign-in using #{@provider} auth failed %h3 Sign-in using #{@provider} auth failed
%hr %hr
%p Sign-in failed because #{@error}. %p Sign-in failed because #{@error}.
%p There are couple of steps you can take: %p There are couple of steps you can take:
1. Try logging in using your email
%br %ul
2. Try logging in using your username %li Try logging in using your email
%br %li Try logging in using your username
3. If you have forgotten your password, try recovering it using #{ link_to "Password recovery", new_password_path(resource_name) } %li If you have forgotten your password, try recovering it using #{ link_to "Password recovery", new_password_path(resource_name) }
%br
%p If none of the options work, try contacting the GitLab administrator. %p If none of the options work, try contacting the GitLab administrator.

7
app/views/layouts/errors.html.haml
View file

@ -4,7 +4,6 @@
%body{class: "#{app_theme} application"} %body{class: "#{app_theme} application"}
= render "layouts/head_panel", title: "" if current_user = render "layouts/head_panel", title: "" if current_user
= render "layouts/flash" = render "layouts/flash"
.container .container.navless-container
.content .error-page
.center.padded.prepend-top-20 = yield
= yield