Merge branch 'master' of https://github.com/Automattic/underscores.me …

…into pr/23
Automattic · Aug 11, 2014 · 95c3ca4 · 95c3ca4
2 parents b3d90c4 + ee69a86
commit 95c3ca4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/favicon.ico b/favicon.ico
diff --git a/header.php b/header.php
@@ -35,6 +35,7 @@
 	?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+<link rel="shortcut icon" href="<?php echo get_template_directory_uri(); ?>/favicon.ico" />
 <!--[if lt IE 9]>
 <script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
 <![endif]-->

diff --git a/style.css b/style.css
@@ -439,6 +439,10 @@ a:active {
 	text-align: center;
 	color: #DFDFD0;
 	overflow: hidden;
+	-webkit-backface-visibility: hidden;
+	-moz-backface-visibility: hidden;
+	-webkit-transform: translate3d(0, 0, 0);
+	-moz-transform: translate3d(0, 0, 0);
 }
 
 .site-header .site-title span.site-header-bubblewrap:before {
@@ -1189,6 +1193,12 @@ object {
 }
 
 @media (max-width: 500px) {
+	.site-header .site-description {
+		left: 0;
+		margin: 20px 0 0;
+		position: relative;
+		text-align: center;
+	}
 	#generator h1 {
 		width: 100%;
 	}
@@ -1210,6 +1220,11 @@ object {
 		text-align: center;
 		margin: 0 auto;
 	}
+	.wrap {
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing:    border-box;
+		box-sizing:         border-box;
+	}
 	#intro,
 	#features {
 		width: 90%;