Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
8307704c
Commit
8307704c
authored
Jun 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve error page layout
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
308b11a5
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
33 additions
and
27 deletions
+33
-27
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+0
-7
app/assets/stylesheets/sections/errors.scss
app/assets/stylesheets/sections/errors.scss
+14
-0
app/views/errors/access_denied.html.haml
app/views/errors/access_denied.html.haml
+2
-2
app/views/errors/encoding.html.haml
app/views/errors/encoding.html.haml
+2
-2
app/views/errors/git_not_found.html.haml
app/views/errors/git_not_found.html.haml
+2
-2
app/views/errors/not_found.html.haml
app/views/errors/not_found.html.haml
+2
-2
app/views/errors/omniauth_error.html.haml
app/views/errors/omniauth_error.html.haml
+8
-8
app/views/layouts/errors.html.haml
app/views/layouts/errors.html.haml
+3
-4
No files found.
app/assets/stylesheets/generic/common.scss
View file @
8307704c
...
@@ -257,13 +257,6 @@ li.note {
...
@@ -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
{
...
...
app/assets/stylesheets/sections/errors.scss
0 → 100644
View file @
8307704c
.error-page
{
max-width
:
400px
;
margin
:
0
auto
;
h1
,
h2
,
h3
{
text-align
:
center
;
}
h1
{
font-size
:
56px
;
line-height
:
100px
;
font-weight
:
300
;
}
}
app/views/errors/access_denied.html.haml
View file @
8307704c
%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"
}
app/views/errors/encoding.html.haml
View file @
8307704c
%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.
app/views/errors/git_not_found.html.haml
View file @
8307704c
%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
...
...
app/views/errors/not_found.html.haml
View file @
8307704c
%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.
app/views/errors/omniauth_error.html.haml
View file @
8307704c
%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.
app/views/layouts/errors.html.haml
View file @
8307704c
...
@@ -4,7 +4,6 @@
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment