Skip to content

Commit

Permalink
css/js performance test cameronwp#3
Browse files Browse the repository at this point in the history
  • Loading branch information
craraulsalazar committed May 25, 2015
1 parent b09dc72 commit 752877c
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 33 deletions.
4 changes: 4 additions & 0 deletions css/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
@font-face {
font-family: 'Open Sans';
font-style: normal;
Expand All @@ -11,6 +12,7 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzOgdm0LZdjqr5-oayXSOefg.woff2) format('woff2'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff) format('woff');
}
html {
font-size: 100%;
overflow-y: scroll;
Expand Down Expand Up @@ -55,6 +57,8 @@ footer {
}
footer span { float: right; font-style: italic; }
*/

/* Smartphones (portrait) */
@media only screen and (max-width: 480px) {
body { font-size: 12px;}
Expand Down
101 changes: 75 additions & 26 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,71 @@
<!-- Hmm, what is the impact of web fonts on speed? Measure it... -->
<!--<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet">-->

<!--
<script type="text/javascript">
WebFontConfig = {
google: { families: [ 'Open+Sans:400,700:latin' ] }
};
(function() {
var wf = document.createElement('script');
wf.src ='http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
wf.type = 'text/javascript';
wf.async = 'true';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(wf, s);
})(); </script>
-->

<link href="css/style.css" rel="stylesheet">
<link href="css/print.css" rel="stylesheet" media="print">

<!--
<script>
(function(w,g){w['GoogleAnalyticsObject']=g;
w[g]=w[g]||function(){(w[g].q=w[g].q||[]).push(arguments)};w[g].l=1*new Date();})(window,'ga');
// TODO: replace with your Google Analytics profile ID.
ga('create', 'UA-XXXX-Y');
ga('send', 'pageview');
</script>
-->
<style>

@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/cJZKeOuBrn4kERxqtaUH3VtXRa8TVwTICgirnJhmVJw.woff2) format('woff2'), url(http://fonts.gstatic.com/s/opensans/v13/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzOgdm0LZdjqr5-oayXSOefg.woff2) format('woff2'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff) format('woff');
}

html {
font-size: 100%;
overflow-y: scroll;
-webkit-tap-highlight-color: rgba(0,0,0,0);
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: none;
}

body {background: #fff; margin: 0; font-size: 14px; line-height: 1.61; font-weight: 400; font-family: 'Open Sans', sans-serif; color: #333; }
button, input, select, textarea {color: #333; }

a { color: #12C; }
a:visited { color: #61C; }
a:focus { outline: thin dotted; }
a:hover, a:active { color: #c00; outline: 0; }

b, strong { font-weight: bold; }
pre, code { font-family: monospace, monospace; font-size: 1em; }
ul, ol { margin: 1em 0; padding: 0 0 0 20px; }
img { border: 0; max-width: 100%; }

header, footer, .container { max-width: 45em; margin: 0 auto; }

header { padding: 0 0.5em; color: #C90B0B; }
header img { border-radius: 40px; float: left; }
header p { font-size:1.5em; font-weight: bold; padding-left: 4em;}
header p span { font-size: 0.8em; font-weight: normal;}

.hero { padding: 2em; background-color: #f8f8f8; font-size:1.2em;
border-bottom: 1px solid #ccc;
border-top: 1px solid #ccc;
}

.content { padding: 1em 1em; }
.content li { list-style-type: none; font-size: 1.1em;}
li img { float:left; padding-right: 1em; }
li p { font-size: 0.9em; font-style: italic; }

footer {
padding: 0 0.5em;
border-top: 1px solid #ccc;
}
footer span { float: right; font-style: italic; }

</style>


<link href="css/print.css" rel="stylesheet" media="print">

</head>

Expand Down Expand Up @@ -85,9 +122,21 @@
<p>&copy; Web Performance 2014 <span id="crp-stats"></span></p>
</footer>


<script src="http://www.google-analytics.com/analytics.js" async></script>

<script src="js/perfmatters.js" async></script>

<script>
(function(w,g){w['GoogleAnalyticsObject']=g;
w[g]=w[g]||function(){(w[g].q=w[g].q||[]).push(arguments)};w[g].l=1*new Date();})(window,'ga');

// TODO: replace with your Google Analytics profile ID.
ga('create', 'UA-XXXX-Y');
ga('send', 'pageview');

</script>


</body>
</html>
7 changes: 0 additions & 7 deletions js/perfmatters.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,4 @@ window.addEventListener("load", function(event) {
logCRP();


//(function(w,g){w['GoogleAnalyticsObject']=g;
// w[g]=w[g]||function(){(w[g].q=w[g].q||[]).push(arguments)};w[g].l=1*new Date();})(window,'ga');

// TODO: replace with your Google Analytics profile ID.
//ga('create', 'UA-XXXX-Y');
//ga('send', 'pageview');

});
Binary file modified views/images/pizzeria.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 752877c

Please sign in to comment.