kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #28814 from halfbyte/fix_error_pages_for_turbolinks

Browse source 
Namespace CSS selectors on error pages
This commit is contained in:
Rafael França 2017-04-20 14:03:14 -04:00 committed by Rafael Mendonça França
parent 724aa90297
commit 50d5baf7ed
No known key found for this signature in database
GPG key ID: FC23B6D0F1EEE948
4 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
railties/CHANGELOG.md
View file

@ -1,3 +1,8 @@
* Namespace error pages' CSS selectors to stop the styles from bleeding into other pages
when using Turbolinks.
*Jan Krutisch*
* Raise a error when using a bad symlink
Previously bad symlinks (where the link destination doesn't exist)

12
railties/lib/rails/generators/rails/app/templates/public/404.html
View file

@ -4,7 +4,7 @@
<title>The page you were looking for doesn't exist (404)</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<style>
body {
.rails-default-error-page {
background-color: #EFEFEF;
color: #2E2F30;
text-align: center;
@ -12,13 +12,13 @@
margin: 0;
}
div.dialog {
.rails-default-error-page div.dialog {
width: 95%;
max-width: 33em;
margin: 4em auto 0;
}
div.dialog > div {
.rails-default-error-page div.dialog > div {
border: 1px solid #CCC;
border-right-color: #999;
border-left-color: #999;
@ -31,13 +31,13 @@
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
}
h1 {
.rails-default-error-page h1 {
font-size: 100%;
color: #730E15;
line-height: 1.5em;
}
div.dialog > p {
.rails-default-error-page div.dialog > p {
margin: 0 0 1em;
padding: 1em;
background-color: #F7F7F7;
@ -54,7 +54,7 @@
</style>
</head>
<body>
<body class="rails-default-error-page">
<!-- This file lives in public/404.html -->
<div class="dialog">
<div>

12
railties/lib/rails/generators/rails/app/templates/public/422.html
View file

@ -4,7 +4,7 @@
<title>The change you wanted was rejected (422)</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<style>
body {
.rails-default-error-page {
background-color: #EFEFEF;
color: #2E2F30;
text-align: center;
@ -12,13 +12,13 @@
margin: 0;
}
div.dialog {
.rails-default-error-page div.dialog {
width: 95%;
max-width: 33em;
margin: 4em auto 0;
}
div.dialog > div {
.rails-default-error-page div.dialog > div {
border: 1px solid #CCC;
border-right-color: #999;
border-left-color: #999;
@ -31,13 +31,13 @@
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
}
h1 {
.rails-default-error-page h1 {
font-size: 100%;
color: #730E15;
line-height: 1.5em;
}
div.dialog > p {
.rails-default-error-page div.dialog > p {
margin: 0 0 1em;
padding: 1em;
background-color: #F7F7F7;
@ -54,7 +54,7 @@
</style>
</head>
<body>
<body class="rails-default-error-page">
<!-- This file lives in public/422.html -->
<div class="dialog">
<div>

12
railties/lib/rails/generators/rails/app/templates/public/500.html
View file

@ -4,7 +4,7 @@
<title>We're sorry, but something went wrong (500)</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<style>
body {
.rails-default-error-page {
background-color: #EFEFEF;
color: #2E2F30;
text-align: center;
@ -12,13 +12,13 @@
margin: 0;
}
div.dialog {
.rails-default-error-page div.dialog {
width: 95%;
max-width: 33em;
margin: 4em auto 0;
}
div.dialog > div {
.rails-default-error-page div.dialog > div {
border: 1px solid #CCC;
border-right-color: #999;
border-left-color: #999;
@ -31,13 +31,13 @@
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
}
h1 {
.rails-default-error-page h1 {
font-size: 100%;
color: #730E15;
line-height: 1.5em;
}
div.dialog > p {
.rails-default-error-page div.dialog > p {
margin: 0 0 1em;
padding: 1em;
background-color: #F7F7F7;
@ -54,7 +54,7 @@
</style>
</head>
<body>
<body class="rails-default-error-page">
<!-- This file lives in public/500.html -->
<div class="dialog">
<div>