Merge branch 'release-0.6.2'

dmolsen · dmolsen · commit 846766458850 · 2013-12-05T16:40:27.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.6.2
+ - FIX: a few small sass and styling tweaks
+ - THX: thanks to @griffinartworks for the sass and styling fixes
+
 PL-v0.6.1
  - FIX: fixed the height of the HTML pre element on the pattern detail view
  - ADD: added in support for viewing the generated CSS on the pattern detail view
diff --git a/builder/builder.php b/builder/builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.6.1
+ * Pattern Lab Builder CLI - v0.6.2
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/builder.lib.php b/builder/lib/builder.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.6.1
+ * Pattern Lab Builder Class - v0.6.2
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/generator.lib.php b/builder/lib/generator.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.6.1
+ * Pattern Lab Generator Class - v0.6.2
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/watcher.lib.php b/builder/lib/watcher.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.6.1
+ * Pattern Lab Watcher Class - v0.6.2
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/public/styleguide/css/static.scss b/public/styleguide/css/static.scss
@@ -139,6 +139,7 @@ input[type=search] {
 		padding: 0 1em;
 		margin: 0 auto;
 		overflow: hidden;
+	}
 }
 /*End Footer*/
 
diff --git a/public/styleguide/css/styleguide.scss b/public/styleguide/css/styleguide.scss
@@ -528,6 +528,8 @@ $animate-quick: 0.2s;
 	height: 100%; 
 	text-align: center; 
 	margin: 0 auto;
+	-webkit-overflow-scrolling: touch;
+  	overflow: scroll;
 
 	&.hay-mode {
 		-webkit-transition: all 40s linear;
@@ -864,4 +866,4 @@ $animate-quick: 0.2s;
 }
 .icon-eye:before {
 	content: "\e001";
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/*!`
`4`		`- * Pattern Lab Builder CLI - v0.6.1`
	`4`	`+ * Pattern Lab Builder CLI - v0.6.2`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2013 Dave Olsen, http://dmolsen.com`
`7`	`7`	`* Licensed under the MIT license`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ input[type=search] {`
`139`	`139`	`padding: 0 1em;`
`140`	`140`	`margin: 0 auto;`
`141`	`141`	`overflow: hidden;`
	`142`	`+ }`
`142`	`143`	`}`
`143`	`144`	`/End Footer/`
`144`	`145`