Skip to content

Commit 30d1e46

Browse files
committed
backport more changes from H5BP upstream, should be inline with v3.0 now
1 parent 07a74b1 commit 30d1e46

7 files changed

+70
-72
lines changed

.htaccess.sample

+1-5
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,6 @@ AddType text/x-vcard vcf
265265
ExpiresByType text/css "access plus 1 year"
266266
ExpiresByType application/javascript "access plus 1 year"
267267

268-
<IfModule mod_headers.c>
269-
Header append Cache-Control "public"
270-
</IfModule>
271-
272268
</IfModule>
273269

274270

@@ -472,7 +468,7 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
472468
# Block access to backup and source files
473469
# This files may be left by some text/html editors and
474470
# pose a great security danger, when someone can access them
475-
<FilesMatch "\.(bak|config|sql|fla|psd|ini|log|sh|inc|~|swp|dist)$">
471+
<FilesMatch "(\.(bak|config|sql|fla|psd|ini|log|sh|inc|~|swp|dist)~)$">
476472
Order allow,deny
477473
Deny from all
478474
Satisfy All

404.html

+43-39
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<title>Page Not Found :(</title>
6-
<style>
7-
body { text-align: center;}
8-
h1 { font-size: 50px; text-align: center }
9-
span[data-frown] { transform: rotate(90deg); display:inline-block; color: #bbb; }
10-
body { font: 20px Constantia, 'Hoefler Text', "Adobe Caslon Pro", Baskerville, Georgia, Times, serif; color: #999; text-shadow: 2px 2px 2px rgba(200, 200, 200, 0.5); }
11-
::-moz-selection{ background: #ff5e99; color: #fff; }
12-
::selection { background: #ff5e99; color: #fff; }
13-
article { display:block; text-align: left; width: 500px; margin: 0 auto; }
14-
a { color: rgb(36, 109, 56); text-decoration:none; }
15-
a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5); }
16-
input { border: 1px solid #999; vertical-align: middle; color: #666; background: #eee; padding: 10px 10px; }
17-
input[type=text] { margin: 0 10px 0 0; }
18-
input[type=submit]:hover { color: #555; background: #ddd; cursor: pointer; }
19-
</style>
20-
</head>
21-
<body>
22-
<article>
23-
<h1>Not found <span data-frown>:(</span></h1>
24-
<div>
25-
<p>Sorry, but the page you were trying to view does not exist.</p>
26-
<p>It looks like this was the result of either:</p>
27-
<ul>
28-
<li>a mistyped address</li>
29-
<li>an out-of-date link</li>
30-
</ul>
31-
</div>
32-
33-
<script>
34-
var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),
35-
GOOG_FIXURL_SITE = location.host;
36-
</script>
37-
<script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
38-
</article>
39-
</body>
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Page Not Found :(</title>
6+
<style>
7+
::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
8+
::selection { background: #fe57a1; color: #fff; text-shadow: none; }
9+
html { padding: 30px 10px; font-size: 20px; line-height: 1.4; color: #737373; background: #f0f0f0; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
10+
html, input { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
11+
body { max-width: 500px; _width: 500px; padding: 30px 20px 50px; border: 1px solid #b3b3b3; border-radius: 4px; margin: 0 auto; box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff; background: #fcfcfc; }
12+
h1 { margin: 0 10px; font-size: 50px; text-align: center; }
13+
h1 span { color: #bbb; }
14+
h3 { margin: 1.5em 0 0.5em; }
15+
p { margin: 1em 0; }
16+
ul { padding: 0 0 0 40px; margin: 1em 0; }
17+
.container { max-width: 380px; _width: 380px; margin: 0 auto; }
18+
/* google search */
19+
#goog-fixurl ul { list-style: none; padding: 0; margin: 0; }
20+
#goog-fixurl form { margin: 0; }
21+
#goog-wm-qt, #goog-wm-sb { border: 1px solid #bbb; font-size: 16px; line-height: normal; vertical-align: top; color: #444; border-radius: 2px; }
22+
#goog-wm-qt { width: 220px; height: 20px; padding: 5px; margin: 5px 10px 0 0; box-shadow: inset 0 1px 1px #ccc; }
23+
#goog-wm-sb { display: inline-block; height: 32px; padding: 0 10px; margin: 5px 0 0; white-space: nowrap; cursor: pointer; background-color: #f5f5f5; background-image: -webkit-linear-gradient(rgba(255,255,255,0), #f1f1f1); background-image: -moz-linear-gradient(rgba(255,255,255,0), #f1f1f1); background-image: -ms-linear-gradient(rgba(255,255,255,0), #f1f1f1); background-image: -o-linear-gradient(rgba(255,255,255,0), #f1f1f1); -webkit-appearance: none; -moz-appearance: none; appearance: none; *overflow: visible; *display: inline; *zoom: 1; }
24+
#goog-wm-sb:hover, #goog-wm-sb:focus { border-color: #aaa; box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); background-color: #f8f8f8; }
25+
#goog-wm-qt:focus, #goog-wm-sb:focus { border-color: #105cb6; outline: 0; color: #222; }
26+
input::-moz-focus-inner { padding: 0; border: 0; }
27+
</style>
28+
</head>
29+
<body>
30+
<div class="container">
31+
<h1>Not found <span>:(</span></h1>
32+
<p>Sorry, but the page you were trying to view does not exist.</p>
33+
<p>It looks like this was the result of either:</p>
34+
<ul>
35+
<li>a mistyped address</li>
36+
<li>an out-of-date link</li>
37+
</ul>
38+
<script>
39+
var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),GOOG_FIXURL_SITE = location.host;
40+
</script>
41+
<script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
42+
</div>
43+
</body>
4044
</html>

css/style.css

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* HTML5 Boilerplate
2+
* HTML5 Boilerplate
33
*
44
* What follows is the result of much research on cross-browser styling.
55
* Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
@@ -27,15 +27,14 @@ audio:not([controls]) { display: none; }
2727

2828
/*
2929
* 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
30-
* 2. Force vertical scrollbar in non-IE
31-
* 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
30+
* 2. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
3231
*/
3332

34-
html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
33+
html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
3534

36-
body { margin: 0; font-size: 1em; line-height: 1.4; }
35+
html, button, input, select, textarea { font-family: sans-serif; color: #222; }
3736

38-
body, button, input, select, textarea { font-family: sans-serif; color: #222; }
37+
body { margin: 0; font-size: 1em; line-height: 1.4; }
3938

4039
/*
4140
* Remove text-shadow in selection highlight: h5bp.com/i
@@ -144,7 +143,7 @@ label { cursor: pointer; }
144143
* 2. Correct alignment displayed oddly in IE6/7
145144
*/
146145

147-
legend { border: 0; *margin-left: -7px; padding: 0; }
146+
legend { border: 0; *margin-left: -7px; padding: 0; white-space: normal; }
148147

149148
/*
150149
* 1. Correct font-size not inheriting in all browsers
@@ -168,13 +167,19 @@ button, input { line-height: normal; }
168167

169168
button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; *overflow: visible; }
170169

170+
/*
171+
* Re-set default cursor for disabled elements
172+
*/
173+
174+
button[disabled], input[disabled] { cursor: default; }
175+
171176
/*
172177
* Consistent box sizing and appearance
173178
*/
174179

175-
input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; }
180+
input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; *width: 13px; *height: 13px; }
176181
input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
177-
input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
182+
input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; }
178183

179184
/*
180185
* Remove inner padding and border in FF3/4: h5bp.com/l
@@ -222,19 +227,13 @@ td { vertical-align: top; }
222227

223228

224229
/* ==|== media queries ======================================================
225-
PLACEHOLDER Media Queries for Responsive Design.
226-
These override the primary ('mobile first') styles
230+
EXAMPLE Media Queries for Responsive Design.
231+
This example overrides the primary ('mobile first') styles
227232
Modify as content requires.
228233
========================================================================== */
229234

230-
@media only screen and (min-width: 480px) {
231-
/* Style adjustments for viewports 480px and over go here */
232-
233-
}
234-
235-
@media only screen and (min-width: 768px) {
236-
/* Style adjustments for viewports 768px and over go here */
237-
235+
@media only screen and (min-width: 35em) {
236+
/* Style adjustments for viewports that meet the condition */
238237
}
239238

240239

@@ -284,4 +283,4 @@ td { vertical-align: top; }
284283
@page { margin: 0.5cm; }
285284
p, h2, h3 { orphans: 3; widows: 3; }
286285
h2, h3 { page-break-after: avoid; }
287-
}
286+
}

js/libs/modernizr-2.0.6.min.js

-4
This file was deleted.

js/libs/modernizr-2.5.2.min.js

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

layouts/application.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
66
<head>
77
<meta charset="utf-8">
8+
<meta name="viewport" content="width=device-width">
89
<title><?php echo has_content('title') ? yield('title', false) . ' - ' : ''; ?>[SITE NAME]</title>
910
<base href="<?php echo $config['base_url']; ?>">
1011
<!--[if ! lte IE 6]><!-->
@@ -15,7 +16,7 @@
1516
<link rel="stylesheet" href="css/libs/ie6.1.1.css">
1617
<style>html { padding-top: 42px; }</style>
1718
<![endif]-->
18-
<script src="js/libs/modernizr-2.0.6.min.js"></script>
19+
<script src="js/libs/modernizr-2.5.2.min.js"></script>
1920
</head>
2021
<body>
2122
<header>
@@ -47,8 +48,6 @@
4748
<img src="http://storage.ie6countdown.com/assets/100/images/banners/warning_bar_0000_us.jpg" border="0" height="42" width="820" alt="You are using an outdated browser. For a faster, safer browsing experience, upgrade for free today." />
4849
</a>
4950
</div>
50-
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
51-
<script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
5251
<![endif]-->
5352
</body>
5453
</html>

robots.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# www.robotstxt.org/
2-
# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449
2+
# http:/code.google.com/web/controlcrawlindex/
33

44
User-agent: *

0 commit comments

Comments
 (0)