Skip to content

Commit 9930b0f

Browse files
ArturGArturG
committed
Merge branch 'master' of https://github.com/hacketyhack/hackety-hack.com into rspec
2 parents d39e127 + f820f9d commit 9930b0f

3 files changed

Lines changed: 121 additions & 111 deletions

File tree

‎public/404.html‎

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<title>The page you were looking for doesn't exist (404)</title>
5-
<style>
6-
body {
7-
background-color: white;
8-
margin: 0px;
9-
}
10-
.head {
11-
background-color: #253e59;
12-
width: 100%;
13-
height: 2em;
14-
}
15-
#content {
16-
background-color: white;
17-
text-align: center;
18-
border-top-color: #693;
19-
border-color: #999;
20-
border-style: solid;
21-
border-width: 1px;
22-
}
23-
a {
24-
color: #BFBFBF;
25-
font-weight: bold;
26-
border-radius: 1em;
27-
font-size: 1.5em;
28-
text-decoration: none;
29-
}
30-
a:hover {
31-
color: white;
32-
}
33-
34-
</style>
35-
</head>
36-
37-
<body>
38-
<div class="head">
39-
<a href="http://hackety.com"><img style="float: left;" height="50px" src="http://hackety.com/assets/logo-star.png" /></a>
40-
<a style="padding-left: 4px;" href="http://hackety.com/questions">Questions</a>
41-
</div>
42-
<div id="content">
43-
<h2>The page you were looking for doesn't exist.</h2>
44-
<p>You may have mistyped the address, the page may have moved or been deleted.</p>
3+
<head>
4+
<title>The page you were looking for doesn't exist (404)</title>
5+
<meta name = "viewport" content = "width = device-width">
6+
<!-- <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"> -->
7+
<link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css" />
8+
<script src="/assets/application.js" type="text/javascript"></script>
9+
<script src="/assets/prettify.js"></script>
10+
<script>$(function () { prettyPrint() })</script>
11+
<link href="/assets/prettify.css" rel="stylesheet">
12+
13+
</head>
14+
<body class='body-home'>
15+
<header class='topbar'>
16+
<div class='topbar-inner'>
17+
<div class='container'>
18+
<div id='logo'>
19+
<a href="/">Hackety Hack</a>
20+
</div>
21+
<ul class="nav"><li><a href="/blog" class="first">Blog</a></li><li><a href="/questions" class="">Questions</a></li><li><a href="/lessons" class="">Lessons</a></li><li><a href="/programs" class="">Programs</a></li><li><a href="/faq" class="">FAQ</a></li><li><a href="/support/questions" class="">Support</a></li><li><a href="/contribute" class="last">Contribute</a></li></ul>
22+
<ul class="nav secondary-nav"><li><a href="/login" class="first">Log In</a></li><li><a href="/users/sign_up" class="last">Sign Up</a></li></ul>
23+
</div>
24+
</div>
25+
</header>
26+
<div class='home' id='content-wrap'>
27+
<div class='container one-column'>
28+
29+
<div id='content'>
30+
<br />
31+
<section>
32+
<h2>The page you were looking for doesn't exist.</h2>
33+
<p>You may have mistyped the address, the page may have moved or been deleted.</p>
34+
</section>
35+
</div>
36+
</div>
4537
</div>
46-
47-
</body>
38+
<footer>
39+
<div class='container'>
40+
<ul class="pills"><li><a href="/" class="active current first">Home</a></li><li><a href="/blog" class="">Blog</a></li><li><a href="/questions" class="">Questions</a></li><li><a href="/programs" class="">Programs</a></li><li><a href="/faq" class="">FAQ</a></li><li><a href="/support/questions" class="last">Support</a></li></ul>
41+
</div>
42+
</footer>
43+
</body>
4844
</html>

‎public/422.html‎

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,44 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<title>The change you wanted was rejected (422)</title>
5-
<style type="text/css">
6-
body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7-
div.dialog {
8-
width: 25em;
9-
padding: 0 4em;
10-
margin: 4em auto 0 auto;
11-
border: 1px solid #ccc;
12-
border-right-color: #999;
13-
border-bottom-color: #999;
14-
}
15-
h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16-
</style>
17-
</head>
18-
19-
<body>
20-
<!-- This file lives in public/422.html -->
21-
<div class="dialog">
22-
<h1>The change you wanted was rejected.</h1>
23-
<p>Maybe you tried to change something you didn't have access to.</p>
24-
</div>
25-
</body>
3+
<head>
4+
<title>The change you wanted was rejected (422)</title>
5+
<meta name = "viewport" content = "width = device-width">
6+
<!-- <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"> -->
7+
<link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css" />
8+
<script src="/assets/application.js" type="text/javascript"></script>
9+
<script src="/assets/prettify.js"></script>
10+
<script>$(function () { prettyPrint() })</script>
11+
<link href="/assets/prettify.css" rel="stylesheet">
12+
13+
</head>
14+
<body class='body-home'>
15+
<header class='topbar'>
16+
<div class='topbar-inner'>
17+
<div class='container'>
18+
<div id='logo'>
19+
<a href="/">Hackety Hack</a>
20+
</div>
21+
<ul class="nav"><li><a href="/blog" class="first">Blog</a></li><li><a href="/questions" class="">Questions</a></li><li><a href="/lessons" class="">Lessons</a></li><li><a href="/programs" class="">Programs</a></li><li><a href="/faq" class="">FAQ</a></li><li><a href="/support/questions" class="">Support</a></li><li><a href="/contribute" class="last">Contribute</a></li></ul>
22+
<ul class="nav secondary-nav"><li><a href="/login" class="first">Log In</a></li><li><a href="/users/sign_up" class="last">Sign Up</a></li></ul>
23+
</div>
24+
</div>
25+
</header>
26+
<div class='home' id='content-wrap'>
27+
<div class='container one-column'>
28+
29+
<div id='content'>
30+
<br />
31+
<section>
32+
<h2>The change you wanted was rejected.</h2>
33+
<p>Maybe you tried to change something you didn't have access to.</p>
34+
</section>
35+
</div>
36+
</div>
37+
</div>
38+
<footer>
39+
<div class='container'>
40+
<ul class="pills"><li><a href="/" class="active current first">Home</a></li><li><a href="/blog" class="">Blog</a></li><li><a href="/questions" class="">Questions</a></li><li><a href="/programs" class="">Programs</a></li><li><a href="/faq" class="">FAQ</a></li><li><a href="/support/questions" class="last">Support</a></li></ul>
41+
</div>
42+
</footer>
43+
</body>
2644
</html>

‎public/500.html‎

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<title>We're sorry, but something went wrong (500)</title>
5-
<style>
6-
body {
7-
background-color: white;
8-
margin: 0px;
9-
}
10-
.head {
11-
background-color: #253e59;
12-
width: 100%;
13-
height: 2em;
14-
}
15-
#content {
16-
background-color: white;
17-
text-align: center;
18-
border-top-color: #693;
19-
border-color: #999;
20-
border-style: solid;
21-
border-width: 1px;
22-
}
23-
a {
24-
color: #BFBFBF;
25-
font-weight: bold;
26-
border-radius: 1em;
27-
font-size: 1.5em;
28-
text-decoration: none;
29-
}
30-
a:hover {
31-
color: white;
32-
}
33-
34-
</style>
35-
</head>
36-
37-
<body>
38-
<div class="head">
39-
<a href="http://hackety.com"><img style="float: left;" height="50px" src="http://hackety.com/assets/logo-star.png" /></a>
40-
<a style="padding-left: 4px;" href="http://hackety.com/questions">Questions</a>
41-
</div>
42-
<div id="content">
43-
<h2>We're sorry, but something went wrong.</h2>
44-
<p>We've been notified about this issue and we'll take a look at it shortly.</p>
3+
<head>
4+
<title>We're sorry, but something went wrong (500)</title>
5+
<meta name = "viewport" content = "width = device-width">
6+
<!-- <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"> -->
7+
<link href="/assets/application.css" media="screen" rel="stylesheet" type="text/css" />
8+
<script src="/assets/application.js" type="text/javascript"></script>
9+
<script src="/assets/prettify.js"></script>
10+
<script>$(function () { prettyPrint() })</script>
11+
<link href="/assets/prettify.css" rel="stylesheet">
12+
13+
</head>
14+
<body class='body-home'>
15+
<header class='topbar'>
16+
<div class='topbar-inner'>
17+
<div class='container'>
18+
<div id='logo'>
19+
<a href="/">Hackety Hack</a>
20+
</div>
21+
<ul class="nav"><li><a href="/blog" class="first">Blog</a></li><li><a href="/questions" class="">Questions</a></li><li><a href="/lessons" class="">Lessons</a></li><li><a href="/programs" class="">Programs</a></li><li><a href="/faq" class="">FAQ</a></li><li><a href="/support/questions" class="">Support</a></li><li><a href="/contribute" class="last">Contribute</a></li></ul>
22+
<ul class="nav secondary-nav"><li><a href="/login" class="first">Log In</a></li><li><a href="/users/sign_up" class="last">Sign Up</a></li></ul>
23+
</div>
24+
</div>
25+
</header>
26+
<div class='home' id='content-wrap'>
27+
<div class='container one-column'>
28+
29+
<div id='content'>
30+
<br />
31+
<section>
32+
<h2>We're sorry, but something went wrong.</h2>
33+
<p>We've been notified about this issue and we'll take a look at it shortly.</p>
34+
</section>
35+
</div>
36+
</div>
4537
</div>
46-
47-
</body>
38+
<footer>
39+
<div class='container'>
40+
<ul class="pills"><li><a href="/" class="active current first">Home</a></li><li><a href="/blog" class="">Blog</a></li><li><a href="/questions" class="">Questions</a></li><li><a href="/programs" class="">Programs</a></li><li><a href="/faq" class="">FAQ</a></li><li><a href="/support/questions" class="last">Support</a></li></ul>
41+
</div>
42+
</footer>
43+
</body>
4844
</html>

0 commit comments

Comments
 (0)