Merge pull request #1255 from binaryphile/h5bp

update to html5-boilerplate 4.3.0
This commit is contained in:
Thomas Reynolds 2014-04-14 10:14:47 -07:00
commit 1840176340
24 changed files with 1188 additions and 756 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,157 +1,59 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Page Not Found :(</title> <title>Page Not Found</title>
<style> <meta name="viewport" content="width=device-width, initial-scale=1">
::-moz-selection { <style>
background: #b3d4fc;
text-shadow: none;
}
::selection { * {
background: #b3d4fc; line-height: 1.5;
text-shadow: none; margin: 0;
} }
html { html {
padding: 30px 10px; color: #888;
font-size: 20px; font-family: sans-serif;
line-height: 1.4; text-align: center;
color: #737373; }
background: #f0f0f0;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
html, body {
input { left: 50%;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; margin: -43px 0 0 -150px;
} position: absolute;
top: 50%;
width: 300px;
}
h1 {
color: #555;
font-size: 2em;
font-weight: 400;
}
p {
line-height: 1.2;
}
@media only screen and (max-width: 270px) {
body { body {
max-width: 500px; margin: 10px auto;
_width: 500px; position: static;
padding: 30px 20px 50px; width: 95%;
border: 1px solid #b3b3b3;
border-radius: 4px;
margin: 0 auto;
box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff;
background: #fcfcfc;
} }
h1 { h1 {
margin: 0 10px; font-size: 1.5em;
font-size: 50px;
text-align: center;
} }
h1 span { }
color: #bbb;
}
h3 { </style>
margin: 1.5em 0 0.5em; </head>
} <body>
<h1>Page Not Found</h1>
p { <p>Sorry, but the page you were trying to view does not exist.</p>
margin: 1em 0; </body>
}
ul {
padding: 0 0 0 40px;
margin: 1em 0;
}
.container {
max-width: 380px;
_width: 380px;
margin: 0 auto;
}
/* google search */
#goog-fixurl ul {
list-style: none;
padding: 0;
margin: 0;
}
#goog-fixurl form {
margin: 0;
}
#goog-wm-qt,
#goog-wm-sb {
border: 1px solid #bbb;
font-size: 16px;
line-height: normal;
vertical-align: top;
color: #444;
border-radius: 2px;
}
#goog-wm-qt {
width: 220px;
height: 20px;
padding: 5px;
margin: 5px 10px 0 0;
box-shadow: inset 0 1px 1px #ccc;
}
#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;
}
#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;
}
#goog-wm-qt:hover,
#goog-wm-qt:focus {
border-color: #105cb6;
outline: 0;
color: #222;
}
input::-moz-focus-inner {
padding: 0;
border: 0;
}
</style>
</head>
<body>
<div class="container">
<h1>Not found <span>:(</span></h1>
<p>Sorry, but the page you were trying to view does not exist.</p>
<p>It looks like this was the result of either:</p>
<ul>
<li>a mistyped address</li>
<li>an out-of-date link</li>
</ul>
<script>
var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),GOOG_FIXURL_SITE = location.host;
</script>
<script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
</div>
</body>
</html> </html>
<!-- IE needs 512+ bytes: http://blogs.msdn.com/b/ieinternals/archive/2010/08/19/http-error-pages-in-internet-explorer.aspx -->

View file

@ -0,0 +1,197 @@
### HEAD
* Update to Apache Server Configs 2.3.0.
* Use `<!doctype html>` instead of `<!DOCTYPE html>`
([#1522](https://github.com/h5bp/html5-boilerplate/issues/1522)).
* Update to jQuery 1.11.0.
* Add `Disallow:` to `robots.txt`
([#1487](https://github.com/h5bp/html5-boilerplate/issues/1487)).
* Remove default foreground color from form elements
([#1390](https://github.com/h5bp/html5-boilerplate/issues/1390)).
* Remove default margin from print styles
([#1477](https://github.com/h5bp/html5-boilerplate/issues/1477)).
* Update to Modernizr 2.7.1.
* Add vertical centering for `svg`
([#1453](https://github.com/h5bp/html5-boilerplate/issues/1453)).
* Redesign 404 page
([#1443](https://github.com/h5bp/html5-boilerplate/pull/1443)).
### 4.3.0 (September 10, 2013)
* Use one apple-touch-icon instead of six
([#1367](https://github.com/h5bp/html5-boilerplate/issues/1367)).
* Move font-related declarations from `body` to `html`
([#1411](https://github.com/h5bp/html5-boilerplate/issues/1411)).
* Update to Apache Server Configs 1.1.0.
* Add `initial-scale=1` to the viewport `meta`
([#1398](https://github.com/h5bp/html5-boilerplate/pull/1398)).
* Vertical centering for audio-, canvas- and video-tags
([#1326](https://github.com/h5bp/html5-boilerplate/issues/1326)).
* Remove Google Chrome Frame related code
([#1379](https://github.com/h5bp/html5-boilerplate/pull/1379),
[#1396](https://github.com/h5bp/html5-boilerplate/pull/1396)).
* Update to Google Universal Analytics
([#1347](https://github.com/h5bp/html5-boilerplate/issues/1347)).
* Update to jQuery 1.10.2.
* Update to Normalize.css 1.1.3.
### 4.2.0 (April 8, 2013)
* Remove Google Analytics protocol check
([#1319](https://github.com/h5bp/html5-boilerplate/pull/1319)).
* Update to Normalize.css 1.1.1.
* Update Apache configurations to include the latest changes in the
canonical [`.htaccess`](https://github.com/h5bp/server-configs-apache)
file.
* Use a protocol relative URL for the 404 template script.
* Update to jQuery 1.9.1.
### 4.1.0 (January 21, 2013)
* Update to Normalize.css 1.1.0.
* Update to jQuery 1.9.0.
### 4.0.3 (January 12, 2013)
* Use 32x32 favicon.ico
([#1286](https://github.com/h5bp/html5-boilerplate/pull/1286)).
* Remove named function expression in plugins.js
([#1280](https://github.com/h5bp/html5-boilerplate/pull/1280)).
* Adjust CSS image-replacement code
([#1239](https://github.com/h5bp/html5-boilerplate/issues/1239)).
* Update HiDPI example media query
([#1127](https://github.com/h5bp/html5-boilerplate/issues/1127)).
### 4.0.2 (December 9, 2012)
* Update placeholder icons.
* Update to Normalize.css 1.0.2.
* Update to jQuery 1.8.3.
### 4.0.1 (October 20, 2012)
* Further improvements to `console` method stubbing
([#1206](https://github.com/h5bp/html5-boilerplate/issues/1206),
[#1229](https://github.com/h5bp/html5-boilerplate/pull/1229)).
* Update to jQuery 1.8.2.
* Update to Modernizr 2.6.2.
* Minor additions to the documentation.
### 4.0.0 (August 28, 2012)
* Improve the Apache compression configuration
([#1012](https://github.com/h5bp/html5-boilerplate/issues/1012),
[#1173](https://github.com/h5bp/html5-boilerplate/issues/1173)).
* Add a HiDPI example media query
([#1127](https://github.com/h5bp/html5-boilerplate/issues/1127)).
* Add bundled docs
([#1154](https://github.com/h5bp/html5-boilerplate/issues/1154)).
* Add MIT license
([#1139](https://github.com/h5bp/html5-boilerplate/issues/1139)).
* Update to Normalize.css 1.0.1.
* Separate Normalize.css from the rest of the CSS
([#1160](https://github.com/h5bp/html5-boilerplate/issues/1160)).
* Improve `console.log` protection
([#1107](https://github.com/h5bp/html5-boilerplate/issues/1107)).
* Replace hot pink text selection color with a neutral color.
* Change image replacement technique
([#1149](https://github.com/h5bp/html5-boilerplate/issues/1149)).
* Code format and consistency changes
([#1112](https://github.com/h5bp/html5-boilerplate/issues/1112)).
* Rename CSS file and rename JS files and subdirectories.
* Update to jQuery 1.8
([#1161](https://github.com/h5bp/html5-boilerplate/issues/1161)).
* Update to Modernizr 2.6.1
([#1086](https://github.com/h5bp/html5-boilerplate/issues/1086)).
* Remove uncompressed jQuery
([#1153](https://github.com/h5bp/html5-boilerplate/issues/1153)).
* Remove superfluous inline comments
([#1150](https://github.com/h5bp/html5-boilerplate/issues/1150)).
### 3.0.2 (February 19, 2012)
* Update to Modernizr 2.5.3.
### 3.0.1 (February 08, 2012).
* Update to Modernizr 2.5.2 (includes html5shiv 3.3).
### 3.0.0 (February 06, 2012)
* Improvements to `.htaccess`.
* Improve 404 design.
* Simplify JS folder structure.
* Change `html` IE class names changed to target ranges rather than
specific versions of IE.
* Update CSS to include latest normalize.css changes and better
typographic defaults
([#825](https://github.com/h5bp/html5-boilerplate/issues/825)).
* Update to Modernizr 2.5 (includes yepnope 1.5 and html5shiv 3.2).
* Update to jQuery 1.7.1.
* Revert to async snippet for the Google Analytics script.
* Remove the ant build script
([#826](https://github.com/h5bp/html5-boilerplate/issues/826)).
* Remove Respond.js
([#816](https://github.com/h5bp/html5-boilerplate/issues/816)).
* Remove the `demo/` directory
([#808](https://github.com/h5bp/html5-boilerplate/issues/808)).
* Remove the `test/` directory
([#808](https://github.com/h5bp/html5-boilerplate/issues/808)).
* Remove Google Chrome Frame script for IE6 users; replace with links
to Chrome Frame and options for alternative browsers.
* Remove `initial-scale=1` from the viewport `meta`
([#824](https://github.com/h5bp/html5-boilerplate/issues/824)).
* Remove `defer` from all scripts to avoid legacy IE bugs.
* Remove explicit Site Speed tracking for Google Analytics. It's now
enabled by default.
### 2.0.0 (August 10, 2011)
* Change starting CSS to be based on normalize.css instead of reset.css
([#500](https://github.com/h5bp/html5-boilerplate/issues/500)).
* Add Respond.js media query polyfill.
* Add Google Chrome Frame script prompt for IE6 users.
* Simplify the `html` conditional comments for modern browsers and add
an `oldie` class.
* Update clearfix to use "micro clearfix".
* Add placeholder CSS MQs for mobile-first approach.
* Add `textarea { resize: vertical; }` to only allow vertical resizing.
* Add `img { max-width: 100%; }` to the print styles; prevents images
being truncated.
* Add Site Speed tracking for Google Analytics.
* Update to jQuery 1.6.2 (and use minified by default).
* Update to Modernizr 2.0 Complete, Production minified (includes
yepnope, html5shiv, and Respond.js).
* Use `Modernizr.load()` to load the Google Analytics script.
* Much faster build process.
* Add build script options for CSSLint, JSLint, JSHint tools.
* Build script now compresses all images in subfolders.
* Build script now versions files by SHA hash.
* Many `.htaccess` improvements including: disable directory browsing,
improved support for all versions of Apache, more robust and extensive
HTTP compression rules.
* Remove `handheld.css` as it has very poor device support.
* Remove touch-icon `link` elements from the HTML and include improved
touch-icon support.
* Remove the cache-busting query paramaters from files references in
the HTML.
* Remove IE6 PNGFix.
### 1.0.0 (March 21, 2011)
* Rewrite build script to make it more customizable and flexible.
* Add a humans.txt.
* Numerous `.htaccess` improvements (including inline documentation).
* Move the alternative server configurations to the H5BP server configs
repo.
* Use a protocol-relative url to reference jQuery and prevent mixed
content warnings.
* Optimize the Google Analytics snippet.
* Use Eric Meyer's recent CSS reset update and the HTML5 Doctor reset.
* More robust `sub`/`sup` CSS styles.
* Add keyboard `.focusable` helper class that extends `.visuallyhidden`.
* Print styles no longer print hash or JavaScript links.
* Add a print reset for IE's proprietary filters.
* Remove IE9-specific conditional class on the `html` element.
* Remove margins from lists within `nav` elements.
* Remove YUI profiling.

View file

@ -0,0 +1,154 @@
# Contributing to HTML5 Boilerplate
♥ [HTML5 Boilerplate](http://html5boilerplate.com) and want to get involved?
Thanks! There are plenty of ways you can help!
Please take a moment to review this document in order to make the contribution
process easy and effective for everyone involved.
Following these guidelines helps to communicate that you respect the time of
the developers managing and developing this open source project. In return,
they should reciprocate that respect in addressing your issue or assessing
patches and features.
## Using the issue tracker
The [issue tracker](https://github.com/h5bp/html5-boilerplate/issues) is
the preferred channel for [bug reports](#bugs), [features requests](#features)
and [submitting pull requests](#pull-requests), but please respect the following
restrictions:
* Please **do not** use the issue tracker for personal support requests (use
[Stack Overflow](http://stackoverflow.com/questions/tagged/html5boilerplate)
or IRC).
* Please **do not** derail or troll issues. Keep the discussion on topic and
respect the opinions of others.
* Please **do not** open issues or pull requests regarding the code in
[`.htaccess`](https://github.com/h5bp/server-configs-apache),
[`jQuery`](https://github.com/jquery/jquery/),
[`Modernizr`](https://github.com/Modernizr/Modernizr) or
[`Normalize.css`](https://github.com/necolas/normalize.css) (open them in
their respective repositories).
<a name="bugs"></a>
## Bug reports
A bug is a _demonstrable problem_ that is caused by the code in the repository.
Good bug reports are extremely helpful - thank you!
Guidelines for bug reports:
1. **Use the GitHub issue search** &mdash; check if the issue has already been
reported.
2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
latest `master` or development branch in the repository.
3. **Isolate the problem** &mdash; ideally create a [reduced test
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
A good bug report shouldn't leave others needing to chase you up for more
information. Please try to be as detailed as possible in your report. What is
your environment? What steps will reproduce the issue? What browser(s) and OS
experience the problem? What would you expect to be the outcome? All these
details will help people to fix any potential bugs.
Example:
> Short and descriptive example bug report title
>
> A summary of the issue and the browser/OS environment in which it occurs. If
> suitable, include the steps required to reproduce the bug.
>
> 1. This is the first step
> 2. This is the second step
> 3. Further steps, etc.
>
> `<url>` - a link to the reduced test case
>
> Any other information you want to share that is relevant to the issue being
> reported. This might include the lines of code that you have identified as
> causing the bug, and potential solutions (and your opinions on their
> merits).
<a name="features"></a>
## Feature requests
Feature requests are welcome. But take a moment to find out whether your idea
fits with the scope and aims of the project. It's up to *you* to make a strong
case to convince the project's developers of the merits of this feature. Please
provide as much detail and context as possible.
<a name="pull-requests"></a>
## Pull requests
Good pull requests - patches, improvements, new features - are a fantastic
help. They should remain focused in scope and avoid containing unrelated
commits.
**Please ask first** before embarking on any significant pull request (e.g.
implementing features, refactoring code, porting to a different language),
otherwise you risk spending a lot of time working on something that the
project's developers might not want to merge into the project.
Please adhere to the coding conventions used throughout a project (indentation,
accurate comments, etc.) and any other requirements (such as test coverage).
Adhering to the following this process is the best way to get your work
included in the project:
1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
and configure the remotes:
```bash
# Clone your fork of the repo into the current directory
git clone https://github.com/<your-username>/html5-boilerplate.git
# Navigate to the newly cloned directory
cd html5-boilerplate
# Assign the original repo to a remote called "upstream"
git remote add upstream https://github.com/h5bp/html5-boilerplate.git
```
2. If you cloned a while ago, get the latest changes from upstream:
```bash
git checkout master
git pull upstream master
```
3. Create a new topic branch (off the main project development branch) to
contain your feature, change, or fix:
```bash
git checkout -b <topic-branch-name>
```
4. Commit your changes in logical chunks. Please adhere to these [git commit
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
or your code is unlikely be merged into the main project. Use Git's
[interactive rebase](https://help.github.com/articles/interactive-rebase)
feature to tidy up your commits before making them public.
5. Locally merge (or rebase) the upstream development branch into your topic branch:
```bash
git pull [--rebase] upstream master
```
6. Push your topic branch up to your fork:
```bash
git push origin <topic-branch-name>
```
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
with a clear title and description.
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
license your work under the the terms of the [MIT License](LICENSE.md).

View file

View file

@ -20,8 +20,9 @@ Choose one of the following options:
[html5boilerplate.com](http://html5boilerplate.com/) or a custom build from [html5boilerplate.com](http://html5boilerplate.com/) or a custom build from
[Initializr](http://www.initializr.com). [Initializr](http://www.initializr.com).
2. Clone the git repo — `git clone 2. Clone the git repo — `git clone
https://github.com/h5bp/html5-boilerplate.git` - and checkout the tagged https://github.com/h5bp/html5-boilerplate.git` - and checkout the [tagged
release you'd like to use. release](https://github.com/h5bp/html5-boilerplate/releases) you'd like to
use.
## Features ## Features
@ -49,15 +50,13 @@ Choose one of the following options:
## Documentation ## Documentation
Take a look at the [documentation table of Take a look at the [documentation table of contents](doc/TOC.md). This
contents](/h5bp/html5-boilerplate/blob/master/doc/README.md). This
documentation is bundled with the project, which makes it readily available for documentation is bundled with the project, which makes it readily available for
offline reading and provides a useful starting point for any documentation offline reading and provides a useful starting point for any documentation you
you want to write about your project. want to write about your project.
## Contributing ## Contributing
Anyone and everyone is welcome to Anyone and everyone is welcome to [contribute](CONTRIBUTING.md). Hundreds of
[contribute](/h5bp/html5-boilerplate/blob/master/doc/contribute.md). Hundreds developers have helped make the HTML5 Boilerplate what it is today.
of developers have helped make the HTML5 Boilerplate what it is today.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -1,6 +1,6 @@
/*! HTML5 Boilerplate v4.3.0 | MIT License | http://h5bp.com/ */
/* /*
* HTML5 Boilerplate
*
* What follows is the result of much research on cross-browser styling. * What follows is the result of much research on cross-browser styling.
* Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
* Kroc Camen, and the H5BP dev community and team. * Kroc Camen, and the H5BP dev community and team.
@ -10,22 +10,15 @@
Base styles: opinionated defaults Base styles: opinionated defaults
========================================================================== */ ========================================================================== */
html, html {
button,
input,
select,
textarea {
color: #222; color: #222;
}
body {
font-size: 1em; font-size: 1em;
line-height: 1.4; line-height: 1.4;
} }
/* /*
* Remove text-shadow in selection highlight: h5bp.com/i * Remove text-shadow in selection highlight: h5bp.com/i
* These selection declarations have to be separate. * These selection rule sets have to be separate.
* Customize the background color to match your design. * Customize the background color to match your design.
*/ */
@ -53,10 +46,15 @@ hr {
} }
/* /*
* Remove the gap between images and the bottom of their containers: h5bp.com/i/440 * Remove the gap between images, videos, audio and canvas and the bottom of
* their containers: h5bp.com/i/440
*/ */
img { audio,
canvas,
img,
svg,
video {
vertical-align: middle; vertical-align: middle;
} }
@ -79,10 +77,10 @@ textarea {
} }
/* ========================================================================== /* ==========================================================================
Chrome Frame prompt Browse Happy prompt
========================================================================== */ ========================================================================== */
.chromeframe { .browsehappy {
margin: 0.2em 0; margin: 0.2em 0;
background: #ccc; background: #ccc;
color: #000; color: #000;
@ -129,7 +127,7 @@ textarea {
content: ""; content: "";
display: block; display: block;
width: 0; width: 0;
height: 100%; height: 150%;
} }
/* /*
@ -212,7 +210,7 @@ textarea {
/* ========================================================================== /* ==========================================================================
EXAMPLE Media Queries for Responsive Design. EXAMPLE Media Queries for Responsive Design.
Theses examples override the primary ('mobile first') styles. These examples override the primary ('mobile first') styles.
Modify as content requires. Modify as content requires.
========================================================================== */ ========================================================================== */
@ -220,8 +218,10 @@ textarea {
/* Style adjustments for viewports that meet the condition */ /* Style adjustments for viewports that meet the condition */
} }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), @media print,
only screen and (min-resolution: 144dpi) { (-o-min-device-pixel-ratio: 5/4),
(-webkit-min-device-pixel-ratio: 1.25),
(min-resolution: 120dpi) {
/* Style adjustments for high resolution devices */ /* Style adjustments for high resolution devices */
} }
@ -234,7 +234,7 @@ textarea {
* { * {
background: transparent !important; background: transparent !important;
color: #000 !important; /* Black prints faster: h5bp.com/s */ color: #000 !important; /* Black prints faster: h5bp.com/s */
box-shadow:none !important; box-shadow: none !important;
text-shadow: none !important; text-shadow: none !important;
} }
@ -280,10 +280,6 @@ textarea {
max-width: 100% !important; max-width: 100% !important;
} }
@page {
margin: 0.5cm;
}
p, p,
h2, h2,
h3 { h3 {

View file

@ -1,11 +1,11 @@
/*! normalize.css v1.0.1 | MIT License | git.io/normalize */ /*! normalize.css v1.1.3 | MIT License | git.io/normalize */
/* ========================================================================== /* ==========================================================================
HTML5 display definitions HTML5 display definitions
========================================================================== */ ========================================================================== */
/* /**
* Corrects `block` display not defined in IE 6/7/8/9 and Firefox 3. * Correct `block` display not defined in IE 6/7/8/9 and Firefox 3.
*/ */
article, article,
@ -16,14 +16,15 @@ figure,
footer, footer,
header, header,
hgroup, hgroup,
main,
nav, nav,
section, section,
summary { summary {
display: block; display: block;
} }
/* /**
* Corrects `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. * Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3.
*/ */
audio, audio,
@ -34,8 +35,8 @@ video {
*zoom: 1; *zoom: 1;
} }
/* /**
* Prevents modern browsers from displaying `audio` without controls. * Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices. * Remove excess height in iOS 5 devices.
*/ */
@ -44,9 +45,8 @@ audio:not([controls]) {
height: 0; height: 0;
} }
/* /**
* Addresses styling for `hidden` attribute not present in IE 7/8/9, Firefox 3, * Address styling not present in IE 7/8/9, Firefox 3, and Safari 4.
* and Safari 4.
* Known issue: no IE 6 support. * Known issue: no IE 6 support.
*/ */
@ -58,21 +58,21 @@ audio:not([controls]) {
Base Base
========================================================================== */ ========================================================================== */
/* /**
* 1. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using * 1. Correct text resizing oddly in IE 6/7 when body `font-size` is set using
* `em` units. * `em` units.
* 2. Prevents iOS text size adjust after orientation change, without disabling * 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom. * user zoom.
*/ */
html { html {
font-size: 100%; /* 1 */ font-size: 100%; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
-ms-text-size-adjust: 100%; /* 2 */ -ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
} }
/* /**
* Addresses `font-family` inconsistency between `textarea` and other form * Address `font-family` inconsistency between `textarea` and other form
* elements. * elements.
*/ */
@ -84,8 +84,8 @@ textarea {
font-family: sans-serif; font-family: sans-serif;
} }
/* /**
* Addresses margins handled incorrectly in IE 6/7. * Address margins handled incorrectly in IE 6/7.
*/ */
body { body {
@ -96,16 +96,16 @@ body {
Links Links
========================================================================== */ ========================================================================== */
/* /**
* Addresses `outline` inconsistency between Chrome and other browsers. * Address `outline` inconsistency between Chrome and other browsers.
*/ */
a:focus { a:focus {
outline: thin dotted; outline: thin dotted;
} }
/* /**
* Improves readability when focused and also mouse hovered in all browsers. * Improve readability when focused and also mouse hovered in all browsers.
*/ */
a:active, a:active,
@ -117,9 +117,9 @@ a:hover {
Typography Typography
========================================================================== */ ========================================================================== */
/* /**
* Addresses font sizes and margins set differently in IE 6/7. * Address font sizes and margins set differently in IE 6/7.
* Addresses font sizes within `section` and `article` in Firefox 4+, Safari 5, * Address font sizes within `section` and `article` in Firefox 4+, Safari 5,
* and Chrome. * and Chrome.
*/ */
@ -149,20 +149,20 @@ h5 {
} }
h6 { h6 {
font-size: 0.75em; font-size: 0.67em;
margin: 2.33em 0; margin: 2.33em 0;
} }
/* /**
* Addresses styling not present in IE 7/8/9, Safari 5, and Chrome. * Address styling not present in IE 7/8/9, Safari 5, and Chrome.
*/ */
abbr[title] { abbr[title] {
border-bottom: 1px dotted; border-bottom: 1px dotted;
} }
/* /**
* Addresses style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. * Address style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome.
*/ */
b, b,
@ -174,16 +174,27 @@ blockquote {
margin: 1em 40px; margin: 1em 40px;
} }
/* /**
* Addresses styling not present in Safari 5 and Chrome. * Address styling not present in Safari 5 and Chrome.
*/ */
dfn { dfn {
font-style: italic; font-style: italic;
} }
/* /**
* Addresses styling not present in IE 6/7/8/9. * Address differences between Firefox and other browsers.
* Known issue: no IE 6/7 normalization.
*/
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
/**
* Address styling not present in IE 6/7/8/9.
*/ */
mark { mark {
@ -191,8 +202,8 @@ mark {
color: #000; color: #000;
} }
/* /**
* Addresses margins set differently in IE 6/7. * Address margins set differently in IE 6/7.
*/ */
p, p,
@ -200,8 +211,8 @@ pre {
margin: 1em 0; margin: 1em 0;
} }
/* /**
* Corrects font family set oddly in IE 6, Safari 4/5, and Chrome. * Correct font family set oddly in IE 6, Safari 4/5, and Chrome.
*/ */
code, code,
@ -213,8 +224,8 @@ samp {
font-size: 1em; font-size: 1em;
} }
/* /**
* Improves readability of pre-formatted text in all browsers. * Improve readability of pre-formatted text in all browsers.
*/ */
pre { pre {
@ -223,16 +234,16 @@ pre {
word-wrap: break-word; word-wrap: break-word;
} }
/* /**
* Addresses CSS quotes not supported in IE 6/7. * Address CSS quotes not supported in IE 6/7.
*/ */
q { q {
quotes: none; quotes: none;
} }
/* /**
* Addresses `quotes` property not supported in Safari 4. * Address `quotes` property not supported in Safari 4.
*/ */
q:before, q:before,
@ -241,16 +252,16 @@ q:after {
content: none; content: none;
} }
/* /**
* Addresses inconsistent and variable font size in all browsers. * Address inconsistent and variable font size in all browsers.
*/ */
small { small {
font-size: 80%; font-size: 80%;
} }
/* /**
* Prevents `sub` and `sup` affecting `line-height` in all browsers. * Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/ */
sub, sub,
@ -273,8 +284,8 @@ sub {
Lists Lists
========================================================================== */ ========================================================================== */
/* /**
* Addresses margins set differently in IE 6/7. * Address margins set differently in IE 6/7.
*/ */
dl, dl,
@ -288,8 +299,8 @@ dd {
margin: 0 0 0 40px; margin: 0 0 0 40px;
} }
/* /**
* Addresses paddings set differently in IE 6/7. * Address paddings set differently in IE 6/7.
*/ */
menu, menu,
@ -298,8 +309,8 @@ ul {
padding: 0 0 0 40px; padding: 0 0 0 40px;
} }
/* /**
* Corrects list images handled incorrectly in IE 7. * Correct list images handled incorrectly in IE 7.
*/ */
nav ul, nav ul,
@ -312,9 +323,9 @@ nav ol {
Embedded content Embedded content
========================================================================== */ ========================================================================== */
/* /**
* 1. Removes border when inside `a` element in IE 6/7/8/9 and Firefox 3. * 1. Remove border when inside `a` element in IE 6/7/8/9 and Firefox 3.
* 2. Improves image quality when scaled in IE 7. * 2. Improve image quality when scaled in IE 7.
*/ */
img { img {
@ -322,8 +333,8 @@ img {
-ms-interpolation-mode: bicubic; /* 2 */ -ms-interpolation-mode: bicubic; /* 2 */
} }
/* /**
* Corrects overflow displayed oddly in IE 9. * Correct overflow displayed oddly in IE 9.
*/ */
svg:not(:root) { svg:not(:root) {
@ -334,8 +345,8 @@ svg:not(:root) {
Figures Figures
========================================================================== */ ========================================================================== */
/* /**
* Addresses margin not present in IE 6/7/8/9, Safari 5, and Opera 11. * Address margin not present in IE 6/7/8/9, Safari 5, and Opera 11.
*/ */
figure { figure {
@ -346,15 +357,15 @@ figure {
Forms Forms
========================================================================== */ ========================================================================== */
/* /**
* Corrects margin displayed oddly in IE 6/7. * Correct margin displayed oddly in IE 6/7.
*/ */
form { form {
margin: 0; margin: 0;
} }
/* /**
* Define consistent border, margin, and padding. * Define consistent border, margin, and padding.
*/ */
@ -364,10 +375,10 @@ fieldset {
padding: 0.35em 0.625em 0.75em; padding: 0.35em 0.625em 0.75em;
} }
/* /**
* 1. Corrects color not being inherited in IE 6/7/8/9. * 1. Correct color not being inherited in IE 6/7/8/9.
* 2. Corrects text not wrapping in Firefox 3. * 2. Correct text not wrapping in Firefox 3.
* 3. Corrects alignment displayed oddly in IE 6/7. * 3. Correct alignment displayed oddly in IE 6/7.
*/ */
legend { legend {
@ -377,11 +388,11 @@ legend {
*margin-left: -7px; /* 3 */ *margin-left: -7px; /* 3 */
} }
/* /**
* 1. Corrects font size not being inherited in all browsers. * 1. Correct font size not being inherited in all browsers.
* 2. Addresses margins set differently in IE 6/7, Firefox 3+, Safari 5, * 2. Address margins set differently in IE 6/7, Firefox 3+, Safari 5,
* and Chrome. * and Chrome.
* 3. Improves appearance and consistency in all browsers. * 3. Improve appearance and consistency in all browsers.
*/ */
button, button,
@ -394,8 +405,8 @@ textarea {
*vertical-align: middle; /* 3 */ *vertical-align: middle; /* 3 */
} }
/* /**
* Addresses Firefox 3+ setting `line-height` on `input` using `!important` in * Address Firefox 3+ setting `line-height` on `input` using `!important` in
* the UA stylesheet. * the UA stylesheet.
*/ */
@ -404,13 +415,25 @@ input {
line-height: normal; line-height: normal;
} }
/* /**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Chrome, Safari 5+, and IE 6+.
* Correct `select` style inheritance in Firefox 4+ and Opera.
*/
button,
select {
text-transform: none;
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls. * and `video` controls.
* 2. Corrects inability to style clickable `input` types in iOS. * 2. Correct inability to style clickable `input` types in iOS.
* 3. Improves usability and consistency of cursor style between image-type * 3. Improve usability and consistency of cursor style between image-type
* `input` and others. * `input` and others.
* 4. Removes inner spacing in IE 7 without affecting normal text inputs. * 4. Remove inner spacing in IE 7 without affecting normal text inputs.
* Known issue: inner spacing remains in IE 6. * Known issue: inner spacing remains in IE 6.
*/ */
@ -423,19 +446,19 @@ input[type="submit"] {
*overflow: visible; /* 4 */ *overflow: visible; /* 4 */
} }
/* /**
* Re-set default cursor for disabled elements. * Re-set default cursor for disabled elements.
*/ */
button[disabled], button[disabled],
input[disabled] { html input[disabled] {
cursor: default; cursor: default;
} }
/* /**
* 1. Addresses box sizing set to content-box in IE 8/9. * 1. Address box sizing set to content-box in IE 8/9.
* 2. Removes excess padding in IE 8/9. * 2. Remove excess padding in IE 8/9.
* 3. Removes excess padding in IE 7. * 3. Remove excess padding in IE 7.
* Known issue: excess padding remains in IE 6. * Known issue: excess padding remains in IE 6.
*/ */
@ -447,9 +470,9 @@ input[type="radio"] {
*width: 13px; /* 3 */ *width: 13px; /* 3 */
} }
/* /**
* 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome. * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
* 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
* (include `-moz` to future-proof). * (include `-moz` to future-proof).
*/ */
@ -460,8 +483,8 @@ input[type="search"] {
box-sizing: content-box; box-sizing: content-box;
} }
/* /**
* Removes inner padding and search cancel button in Safari 5 and Chrome * Remove inner padding and search cancel button in Safari 5 and Chrome
* on OS X. * on OS X.
*/ */
@ -470,8 +493,8 @@ input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none; -webkit-appearance: none;
} }
/* /**
* Removes inner padding and border in Firefox 3+. * Remove inner padding and border in Firefox 3+.
*/ */
button::-moz-focus-inner, button::-moz-focus-inner,
@ -480,9 +503,9 @@ input::-moz-focus-inner {
padding: 0; padding: 0;
} }
/* /**
* 1. Removes default vertical scrollbar in IE 6/7/8/9. * 1. Remove default vertical scrollbar in IE 6/7/8/9.
* 2. Improves readability and alignment in all browsers. * 2. Improve readability and alignment in all browsers.
*/ */
textarea { textarea {
@ -494,7 +517,7 @@ textarea {
Tables Tables
========================================================================== */ ========================================================================== */
/* /**
* Remove most spacing between table cells. * Remove most spacing between table cells.
*/ */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 766 B

View file

@ -12,4 +12,4 @@
# TECHNOLOGY COLOPHON # TECHNOLOGY COLOPHON
HTML5, CSS3 HTML5, CSS3
jQuery, Modernizr Normalize.css, jQuery, Modernizr

View file

View file

View file

@ -1,14 +1,24 @@
// Avoid `console` errors in browsers that lack a console. // Avoid `console` errors in browsers that lack a console.
if (!(window.console && console.log)) { (function() {
(function() { var method;
var noop = function() {}; var noop = function () {};
var methods = ['assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error', 'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log', 'markTimeline', 'profile', 'profileEnd', 'markTimeline', 'table', 'time', 'timeEnd', 'timeStamp', 'trace', 'warn']; var methods = [
var length = methods.length; 'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
var console = window.console = {}; 'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
while (length--) { 'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
console[methods[length]] = noop; 'timeStamp', 'trace', 'warn'
];
var length = methods.length;
var console = (window.console = window.console || {});
while (length--) {
method = methods[length];
// Only stub undefined methods.
if (!console[method]) {
console[method] = noop;
} }
}()); }
} }());
// Place any jQuery/helper plugins in here. // Place any jQuery/helper plugins in here.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,40 +1,42 @@
<!DOCTYPE html> <!doctype html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]--> <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]--> <!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Use title if it's in the page YAML frontmatter --> <!-- Use title if it's in the page YAML frontmatter -->
<title><%= current_page.data.title || "HTML5 Boilerplate" %></title> <title><%= current_page.data.title || "HTML5 Boilerplate" %></title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <!-- Place favicon.ico and apple-touch-icon(s) in the root directory -->
<link rel="stylesheet" href="css/normalize.css"> <link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main.css"> <link rel="stylesheet" href="css/main.css">
<script src="js/vendor/modernizr-2.6.1.min.js"></script> <script src="js/vendor/modernizr-2.7.1.min.js"></script>
</head> </head>
<body> <body>
<!--[if lt IE 7]> <!--[if lt IE 7]>
<p class="chromeframe">You are using an outdated browser. <a href="http://browsehappy.com/">Upgrade your browser today</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to better experience this site.</p> <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]--> <![endif]-->
<%= yield %> <%= yield %>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/vendor/jquery-1.8.0.min.js"><\/script>')</script> <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.11.0.min.js"><\/script>')</script>
<script src="js/plugins.js"></script> <script src="js/plugins.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. --> <!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
<script> <script>
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']]; (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0]; function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js'; e=o.createElement(i);r=o.getElementsByTagName(i)[0];
s.parentNode.insertBefore(g,s)}(document,'script')); e.src='//www.google-analytics.com/analytics.js';
r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
ga('create','UA-XXXXX-X');ga('send','pageview');
</script> </script>
</body> </body>
</html> </html>

View file

@ -1,3 +1,5 @@
# robotstxt.org/ # www.robotstxt.org/
# Allow crawling of all content
User-agent: * User-agent: *
Disallow: