Merge branch 'master' of github.com:Automattic/jetpack-start

Automattic · Jul 11, 2014 · 98290c6 · 98290c6
2 parents f051d30 + 418f9a0
commit 98290c6
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 30 deletions.
diff --git a/css/jetpack-start.css b/css/jetpack-start.css
diff --git a/css/scss/_main.scss b/css/scss/_main.scss
@@ -61,7 +61,11 @@ header {
 	margin: 33px 0 0;
 
 	h1 {
-		font: 300 2.57143em/1.4 'Open Sans', Helvetica, sans-serif; // 36px
+		font: 300 2.5em/1.4 'Open Sans', Helvetica, sans-serif; // 40 / 16
+
+		@include breakpoint(phablet) {
+			font-size: em(30);
+		}
 	}
 }
 .container {
@@ -92,10 +96,14 @@ header {
 }
 .step-description {
 	color: #666;
-	margin: -13px 0 33px;
+	margin: -13px 0 em(33, 18);
 	padding: 0;
-	font-size: 18px;
+	font-size: em(18);
 	line-height: 1.6;
+
+	@include breakpoint(phablet) {
+		font-size: em(16);
+	}
 }
 
 .med-icon {

diff --git a/css/scss/ui-patterns/_connect-jetpack.scss b/css/scss/ui-patterns/_connect-jetpack.scss
@@ -6,10 +6,8 @@
 	position: relative;
 	overflow: hidden; // lazy clearfix
 	margin: 0 auto 80px;
-	// max-width: 650px;
 	background: $jetpack-green;
 	background-image: linear-gradient(top, rgb(129, 168, 68), rgb(142, 183, 78));
-	// box-shadow: 0 1px 3px rgba(0,0,0,.2);
 	text-align: center;
 
 	.button--primary {
@@ -26,8 +24,11 @@
 	margin-top: 60px;
 	color: #fff;
 	text-shadow: rgba(0, 0, 0, 0.117647) 0px 1px 1px;
-	// text-align: center;
 	z-index: 2;
+
+	@media (max-width: 500px) {
+		font-size: 30px;
+	}
 }
 .jetpack-hero__info {
 	position: relative;
@@ -50,12 +51,9 @@
 		margin-bottom: -1px;
 		background: url(../img/the-cloud.svg) center bottom repeat-x;
 		z-index: 4;
-		// background-size: 50%;
 	}
 }
 .flyby {
-	// position: relative;
-	// z-index: 0;
 	@media (max-width: 768px) {
 		display: none;
 	}

diff --git a/css/scss/ui-patterns/_first-post.scss b/css/scss/ui-patterns/_first-post.scss
@@ -2,16 +2,9 @@
 // First Post
 // ==========================================================================
 
-.first-post,
-#title,
-#mce_41-body,
-#postdivrich {
-	max-width:700px;
-}
-
-
 .first-post {
-	margin: 0 auto;
+	margin: 0 15px;
+	max-width: 700px;
 }
 
 #title-prompt-text,
@@ -29,6 +22,10 @@
 	font-size: 28px;
 	font-weight: 700;
 	box-shadow: inset 0 1px 1px rgba(0,0,0,0.1);
+
+	@include breakpoint(tablet) {
+		font-size: 18px;
+	}
 }
 
 #mce_41-body,

diff --git a/views/index.php b/views/index.php
@@ -4,8 +4,9 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<title><?php _e( 'Jetpack Start', 'jetpack-start' ); ?></title>
+	<meta name="viewport" content="width=device-width">
 
-	<link rel="stylesheet" type="text/css" href="<?php echo JETPACK_START_BASE_URL .  '/css/jetpack-start.css'; ?>" /> 
+	<link rel="stylesheet" type="text/css" href="<?php echo JETPACK_START_BASE_URL .  '/css/jetpack-start.css'; ?>" />
 	<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:400italic,400,600,700">
 	<link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css">