Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: censu-fork/Cartoon_404
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: dofanteam/Cartoon_404
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 3 commits
  • 15 files changed
  • 1 contributor

Commits on Feb 14, 2019

  1. 2333

    @censujiang
    censujiang authored Feb 14, 2019
    Copy the full SHA
    8fe84f7 View commit details

  2. 一步一步收缩

    @censujiang
    censujiang committed Feb 14, 2019
    Copy the full SHA
    392b468 View commit details

  3. 终于他喵完成了诶 

    23333太棒了
    @censujiang
    censujiang committed Feb 14, 2019
    Copy the full SHA
    d0f72ac View commit details
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Cartoon_404
一个二次元风格404页面（逗帆社专用样式）
27 changes: 27 additions & 0 deletions css托管/404.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="theme-color" content="#76DDDF">
<link href="https://download.gz.bcebos.com/css/404.css" rel="stylesheet" type="text/css">
<title>404了/(ㄒoㄒ)/~~</title>
</head>
<body>
<div class="background">
<br><br>
<div class="content">
<p class="text">
你来到了法则的荒原
</p>
<p>
</br>
<a href=javascript:history.go(-1);><button type="button" class="button gray">《BACK</button></a>
<a href="/"><button type="button" class="button gray">HOME</button></a>
</p>
</div>
</div>
</body>
<!--© 2018 blingwang.cn. All rights reserved. Then by Censujiang-->
</html>
Binary file added css托管/img/404.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 70 additions & 0 deletions css收缩/404.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="theme-color" content="#76DDDF">
<style>
@charset "utf-8";
.button {
width: 120px;
font-size: 16px;
line-height: 40px;
text-align: center;
font-weight: bolder;
color: #fff;
border-radius: 5px;
position: relative;
overflow: hidden;
}
.button.gray {
color: #ffffff;
border: 2px solid #ffffff;
background: transparent;
}
.background {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: #fff;
background-repeat: no-repeat;
background-size: cover;
background-image: url(../img/404.png);
text-align: center;
}
.content {
margin-left: 50px;
margin-right: 50px;
}
* {
margin: 0 auto;
}
.text {
font-family: '微软雅黑';
color: #ffffff;
font-size: 24px;
text-align: center;
}
</style>
<title>404了/(ㄒoㄒ)/~~</title>
</head>
<body>
<div class="background">
<br><br>
<div class="content">
<p class="text">
你来到了法则的荒原
</p>
<p>
</br>
<a href=javascript:history.go(-1);><button type="button" class="button gray">《BACK</button></a>
<a href="/"><button type="button" class="button gray">HOME</button></a>
</p>
</div>
</div>
</body>
<!--© 2018 blingwang.cn. All rights reserved. Then by Censujiang-->
</html>
Binary file added css收缩/img/404.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/404.png
View file
Binary file not shown.
50 changes: 27 additions & 23 deletions 404.html → img托管/404.html
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="theme-color" content="#76DDDF">
<link href="/css/404.css" rel="stylesheet" type="text/css">
<title>404 Not Found</title>
</head>
<body>
<div class="background">
<br><br>
<div class="content">
<p class="text">The page you requested was <br><strong>not found</strong>.</p>
<br>
<p><a href="/"><button type="button" class="button gray">HOME</button></a>
</p>
</div>
</div>
</body>
<!--© 2018 blingwang.cn. All rights reserved. Then by Censujiang-->
</html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="theme-color" content="#76DDDF">
<link href="css/404.css" rel="stylesheet" type="text/css">
<title>404了/(ㄒoㄒ)/~~</title>
</head>
<body>
<div class="background">
<br><br>
<div class="content">
<p class="text">
你来到了法则的荒原
</p>
<p>
</br>
<a href=javascript:history.go(-1);><button type="button" class="button gray">《BACK</button></a>
<a href="/"><button type="button" class="button gray">HOME</button></a>
</p>
</div>
</div>
</body>
<!--© 2018 blingwang.cn. All rights reserved. Then by Censujiang-->
</html>
42 changes: 42 additions & 0 deletions img托管/css/404.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
@charset "utf-8";
.button {
width: 120px;
font-size: 16px;
line-height: 40px;
text-align: center;
font-weight: bolder;
color: #fff;
border-radius: 5px;
position: relative;
overflow: hidden;
}
.button.gray {
color: #ffffff;
border: 2px solid #ffffff;
background: transparent;
}
.background {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: #fff;
background-repeat: no-repeat;
background-size: cover;
background-image: url(https://download.gz.bcebos.com/img/404.png);
text-align: center;
}
.content {
margin-left: 50px;
margin-right: 50px;
}
* {
margin: 0 auto;
}
.text {
font-family: '微软雅黑';
color: #ffffff;
font-size: 24px;
text-align: center;
}
27 changes: 27 additions & 0 deletions img收缩/404.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="theme-color" content="#76DDDF">
<link href="css/404.css" rel="stylesheet" type="text/css">
<title>404了/(ㄒoㄒ)/~~</title>
</head>
<body>
<div class="background">
<br><br>
<div class="content">
<p class="text">
你来到了法则的荒原
</p>
<p>
</br>
<a href=javascript:history.go(-1);><button type="button" class="button gray">《BACK</button></a>
<a href="/"><button type="button" class="button gray">HOME</button></a>
</p>
</div>
</div>
</body>
<!--© 2018 blingwang.cn. All rights reserved. Then by Censujiang-->
</html>
42 changes: 42 additions & 0 deletions img收缩/css/404.css
View file

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions 全托管/404.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="theme-color" content="#76DDDF">
<link href="https://download.gz.bcebos.com/css/404-img.css" rel="stylesheet" type="text/css">
<title>404了/(ㄒoㄒ)/~~</title>
</head>
<body>
<div class="background">
<br><br>
<div class="content">
<p class="text">
你来到了法则的荒原
</p>
<p>
</br>
<a href=javascript:history.go(-1);><button type="button" class="button gray">《BACK</button></a>
<a href="/"><button type="button" class="button gray">HOME</button></a>
</p>
</div>
</div>
</body>
<!--© 2018 blingwang.cn. All rights reserved. Then by Censujiang-->
</html>
70 changes: 70 additions & 0 deletions 全收缩/404.html
View file

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions 源文件/404.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="theme-color" content="#76DDDF">
<link href="css/404.css" rel="stylesheet" type="text/css">
<title>404了/(ㄒoㄒ)/~~</title>
</head>
<body>
<div class="background">
<br><br>
<div class="content">
<p class="text">
你来到了法则的荒原
</p>
<p>
</br>
<a href=javascript:history.go(-1);><button type="button" class="button gray">《BACK</button></a>
<a href="/"><button type="button" class="button gray">HOME</button></a>
</p>
</div>
</div>
</body>
<!--© 2018 blingwang.cn. All rights reserved. Then by Censujiang-->
</html>
6 changes: 3 additions & 3 deletions css/404.css → 源文件/css/404.css
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
background-color: #fff;
background-repeat: no-repeat;
background-size: cover;
background-image: url(/img/404.png);
background-image: url(../img/404.png);
text-align: center;
}
.content {
@@ -36,7 +36,7 @@
}
.text {
font-family: '微软雅黑';
color: #FFFFFF;
font-size: 30px;
color: #ffffff;
font-size: 24px;
text-align: center;
}
Binary file added 源文件/img/404.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.