Skip to content

R
rails

张重言 / rails

通知 1
Star 0
Fork 0
R
rails

体验新版 GitCode，发现更多精彩内容 >>

提交 ef0b05e7 编写于 作者: R Rafael França 提交者： GitHub
浏览文件
操作

Merge pull request #28814 from halfbyte/fix_error_pages_for_turbolinks 

Namespace CSS selectors on error pages
上级 f53a5f66 df641263
隐藏空白更改
内联 并排
Showing with 25 addition and 18 deletion
railties/CHANGELOG.md
浏览文件 @ ef0b05e7
* Namespace error pages' CSS selectors to stop the styles from bleeding into other pages
when using Turbolinks.
*Jan Krutisch*
Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/railties/CHANGELOG.md) for previous changes. Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/railties/CHANGELOG.md) for previous changes.
railties/lib/rails/generators/rails/app/templates/public/404.html
浏览文件 @ ef0b05e7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<title>The page you were looking for doesn't exist (404)</title> <title>The page you were looking for doesn't exist (404)</title>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<style> <style>
body { .rails-default-error-page {
background-color: #EFEFEF; background-color: #EFEFEF;
color: #2E2F30; color: #2E2F30;
text-align: center; text-align: center;
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
margin: 0; margin: 0;
} }
div.dialog { .rails-default-error-page div.dialog {
width: 95%; width: 95%;
max-width: 33em; max-width: 33em;
margin: 4em auto 0; margin: 4em auto 0;
} }
div.dialog > div { .rails-default-error-page div.dialog > div {
border: 1px solid #CCC; border: 1px solid #CCC;
border-right-color: #999; border-right-color: #999;
border-left-color: #999; border-left-color: #999;
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
} }
h1 { .rails-default-error-page h1 {
font-size: 100%; font-size: 100%;
color: #730E15; color: #730E15;
line-height: 1.5em; line-height: 1.5em;
} }
div.dialog > p { .rails-default-error-page div.dialog > p {
margin: 0 0 1em; margin: 0 0 1em;
padding: 1em; padding: 1em;
background-color: #F7F7F7; background-color: #F7F7F7;
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</style> </style>
</head> </head>
<body> <body class="rails-default-error-page">
<!-- This file lives in public/404.html --> <!-- This file lives in public/404.html -->
<div class="dialog"> <div class="dialog">
<div> <div>
......
railties/lib/rails/generators/rails/app/templates/public/422.html
浏览文件 @ ef0b05e7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<title>The change you wanted was rejected (422)</title> <title>The change you wanted was rejected (422)</title>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<style> <style>
body { .rails-default-error-page {
background-color: #EFEFEF; background-color: #EFEFEF;
color: #2E2F30; color: #2E2F30;
text-align: center; text-align: center;
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
margin: 0; margin: 0;
} }
div.dialog { .rails-default-error-page div.dialog {
width: 95%; width: 95%;
max-width: 33em; max-width: 33em;
margin: 4em auto 0; margin: 4em auto 0;
} }
div.dialog > div { .rails-default-error-page div.dialog > div {
border: 1px solid #CCC; border: 1px solid #CCC;
border-right-color: #999; border-right-color: #999;
border-left-color: #999; border-left-color: #999;
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
} }
h1 { .rails-default-error-page h1 {
font-size: 100%; font-size: 100%;
color: #730E15; color: #730E15;
line-height: 1.5em; line-height: 1.5em;
} }
div.dialog > p { .rails-default-error-page div.dialog > p {
margin: 0 0 1em; margin: 0 0 1em;
padding: 1em; padding: 1em;
background-color: #F7F7F7; background-color: #F7F7F7;
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</style> </style>
</head> </head>
<body> <body class="rails-default-error-page">
<!-- This file lives in public/422.html --> <!-- This file lives in public/422.html -->
<div class="dialog"> <div class="dialog">
<div> <div>
......
railties/lib/rails/generators/rails/app/templates/public/500.html
浏览文件 @ ef0b05e7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<title>We're sorry, but something went wrong (500)</title> <title>We're sorry, but something went wrong (500)</title>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<style> <style>
body { .rails-default-error-page {
background-color: #EFEFEF; background-color: #EFEFEF;
color: #2E2F30; color: #2E2F30;
text-align: center; text-align: center;
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
margin: 0; margin: 0;
} }
div.dialog { .rails-default-error-page div.dialog {
width: 95%; width: 95%;
max-width: 33em; max-width: 33em;
margin: 4em auto 0; margin: 4em auto 0;
} }
div.dialog > div { .rails-default-error-page div.dialog > div {
border: 1px solid #CCC; border: 1px solid #CCC;
border-right-color: #999; border-right-color: #999;
border-left-color: #999; border-left-color: #999;
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
} }
h1 { .rails-default-error-page h1 {
font-size: 100%; font-size: 100%;
color: #730E15; color: #730E15;
line-height: 1.5em; line-height: 1.5em;
} }
div.dialog > p { .rails-default-error-page div.dialog > p {
margin: 0 0 1em; margin: 0 0 1em;
padding: 1em; padding: 1em;
background-color: #F7F7F7; background-color: #F7F7F7;
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</style> </style>
</head> </head>
<body> <body class="rails-default-error-page">
<!-- This file lives in public/500.html --> <!-- This file lives in public/500.html -->
<div class="dialog"> <div class="dialog">
<div> <div>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或