Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Luis Alonso Chavez Armendariz
committed
Nov 29, 2016
1 parent
843ae9b
commit 500c0d5
Showing
12 changed files
with
129 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
- page_title "Access Denied" | ||
%h1 403 | ||
%h3 Access Denied | ||
%hr | ||
%p You are not allowed to access this page. | ||
%p Read more about project permissions #{link_to "here", help_page_path("user/permissions"), class: "vlink"} | ||
- content_for(:title, 'Access Denied') | ||
%img{:alt => "GitLab Logo", | ||
:src => image_path('logo.svg')} | ||
%h1 | ||
403 | ||
.container | ||
%h3 Access Denied | ||
%hr | ||
%p You are not allowed to access this page. | ||
%p Read more about project permissions #{link_to "here", help_page_path("user/permissions"), class: "vlink"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,9 @@ | ||
- page_title "Encoding Error" | ||
%h1 500 | ||
%h3 Encoding Error | ||
%hr | ||
%p Page can't be loaded because of an encoding error. | ||
- content_for(:title, 'Encoding Error') | ||
%img{:alt => "GitLab Logo", | ||
:src => image_path('logo.svg')} | ||
%h1 | ||
500 | ||
.container | ||
%h3 Encoding Error | ||
%hr | ||
%p Page can't be loaded because of an encoding error. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
- page_title "Git Resource Not Found" | ||
%h1 404 | ||
%h3 Git Resource Not found | ||
%hr | ||
%p | ||
Application can't get access to some branch or commit in your repository. It | ||
may have been moved. | ||
- content_for(:title, 'Git Resource Not Found') | ||
%img{:alt => "GitLab Logo", | ||
:src => image_path('logo.svg')} | ||
%h1 | ||
404 | ||
.container | ||
%h3 Git Resource Not found | ||
%hr | ||
%p Application can't get access to some branch or commit in your repository. It | ||
may have been moved |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,9 @@ | ||
- page_title "Not Found" | ||
%h1 404 | ||
%h3 The resource you were looking for doesn't exist. | ||
%hr | ||
%p You may have mistyped the address or the page may have moved. | ||
- content_for(:title, 'Not Found') | ||
%img{:alt => "GitLab Logo", | ||
:src => image_path('logo.svg')} | ||
%h1 | ||
404 | ||
.container | ||
%h3 The resource you were looking for doesn't exist. | ||
%hr | ||
%p You may have mistyped the address or the page may have moved. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,59 @@ | ||
!!! 5 | ||
%html{ lang: "en"} | ||
= render "layouts/head" | ||
%body{class: "#{user_application_theme} application navless"} | ||
= Gon::Base.render_data | ||
= render "layouts/header/empty" | ||
.container.navless-container | ||
= render "layouts/flash" | ||
.error-page | ||
= yield | ||
%head | ||
%meta{:content => "width=device-width, initial-scale=1, maximum-scale=1", :name => "viewport"} | ||
%title= yield(:title) | ||
:css | ||
body { | ||
color: #666; | ||
text-align: center; | ||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; | ||
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; | ||
} | ||
|
||
h3 { | ||
color: #456; | ||
font-size: 20px; | ||
font-weight: normal; | ||
line-height: 28px; | ||
} | ||
|
||
hr { | ||
max-width: 800px; | ||
margin: 18px auto; | ||
border: 0; | ||
border-top: 1px solid #EEE; | ||
border-bottom: 1px solid white; | ||
} | ||
|
||
img { | ||
max-width: 40vw; | ||
display: block; | ||
margin: 40px auto; | ||
} | ||
|
||
.container { | ||
margin: auto 20px; | ||
} | ||
|
||
ul { | ||
margin: auto; | ||
text-align: left; | ||
display:inline-block; | ||
} | ||
%body | ||
= yield |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
--- | ||
title: Fix appearance in error pages | ||
merge_request: | ||
author: Luis Alonso Chavez Armendariz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters