Merge branch 'release-0.7.7'

pattern-lab · Feb 25, 2014 · 2cbcfb3 · 2cbcfb3
2 parents 7cc9a50 + 3aa5954
commit 2cbcfb3
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.7.7
+ - ADD: can hide all of the patterns for a given pattern type from being shown on the styleguide. good for nested pages/templates
+ - FIX: the MQ menu is hidden on smaller viewports
+
 PL-v0.7.6
  - FIX: pattern search now searches the entire name of a pattern
  - FIX: the MQ menu lines up with the navigation item

diff --git a/core/config/config.ini.default b/core/config/config.ini.default
@@ -3,7 +3,7 @@
  * If config.ini doesn't exist Pattern Lab will try to create a new version
  */
 
-v  = "0.7.6"
+v  = "0.7.7"
 
 // file extensions to ignore when building or watching the source dir, separate with a comma
 ie = "scss,DS_Store,less"
@@ -26,3 +26,6 @@ ishControlsHide = ""
 
 // the order of pattern states
 patternStates = "inprogress,inreview,complete"
+
+// the pattern types that shouldn't be included in the style guide
+styleGuideExcludes = ""
diff --git a/core/lib/PatternLab/Builder.php b/core/lib/PatternLab/Builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.7.6
+ * Pattern Lab Builder Class - v0.7.7
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -50,6 +50,7 @@ class Builder {
 	protected $mainPageFoot;      // the footer to be included on main pages
 	protected $addPatternHF;      // should the pattern header and footer be added
 	protected $cleanPublic;       // whether the public directory should be cleaned out or not on generate
+	protected $styleGuideExcludes;// which pattern types to exclude from the style guide
 
 	/**
 	* When initializing the Builder class or the sub-classes make sure the base properties are configured
@@ -67,7 +68,8 @@ public function __construct($config = array()) {
 		foreach ($config as $key => $value) {
 
 			// if the variables are array-like make sure the properties are validated/trimmed/lowercased before saving
-			if (($key == "ie") || ($key == "id") || ($key == "patternStates")) {
+			$arrayKeys = array("ie","id","patternStates","styleGuideExcludes");
+			if (in_array($key,$arrayKeys)) {
 				$values = explode(",",$value);
 				array_walk($values,'PatternLab\Builder::trim');
 				$this->$key = $values;
@@ -886,7 +888,7 @@ protected function gatherPatternInfo() {
 			$patternTypeDash = $patternTypeValues["patternTypeDash"];
 
 			// if this has a second level of patterns check them out (means we don't process pages & templates)
-			if (isset($patternTypeValues["patternTypeItems"])) {
+			if (isset($patternTypeValues["patternTypeItems"]) && (!in_array($patternType,$this->styleGuideExcludes))) {
 
 				$arrayReset = false;
 

diff --git a/core/lib/PatternLab/Configurer.php b/core/lib/PatternLab/Configurer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Configurer Class - v0.7.6
+ * Pattern Lab Configurer Class - v0.7.7
  *
  * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

diff --git a/core/lib/PatternLab/Generator.php b/core/lib/PatternLab/Generator.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.7.6
+ * Pattern Lab Generator Class - v0.7.7
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

diff --git a/core/lib/PatternLab/Migrator.php b/core/lib/PatternLab/Migrator.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Migrator Class - v0.7.6
+ * Pattern Lab Migrator Class - v0.7.7
  *
  * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

diff --git a/core/lib/PatternLab/Watcher.php b/core/lib/PatternLab/Watcher.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.7.6
+ * Pattern Lab Watcher Class - v0.7.7
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

diff --git a/core/styleguide/css/styleguide.css b/core/styleguide/css/styleguide.css
@@ -284,12 +284,12 @@
       border: 0;
       border-left: 1px solid rgba(255, 255, 255, 0.05); } }
 
-.sg-find {
+.sg-find, .sg-mqs {
 	display: none;
 }
 
 @media all and (min-width: 48em) {
-	.sg-find {
+	.sg-find, .sg-mqs {
 		display: block;
 	}
 }

diff --git a/core/templates/partials/ishControls.mustache b/core/templates/partials/ishControls.mustache
@@ -20,7 +20,7 @@
 					</ul>
 				</li>
 				{{^ ishControlsHide.mqs }}
-				<li class="sg-half">
+				<li class="sg-mqs">
 					<a href="#" class="mode-link sg-acc-handle" id="sg-size-mq" title="Media query values found in stylesheet">MQ</a>
 					<ul class="sg-acc-panel sg-left" id="sg-mq">
 						{{# mqs }}

diff --git a/public/styleguide/css/styleguide.css b/public/styleguide/css/styleguide.css
@@ -284,12 +284,12 @@
       border: 0;
       border-left: 1px solid rgba(255, 255, 255, 0.05); } }
 
-.sg-find {
+.sg-find, .sg-mqs {
 	display: none;
 }
 
 @media all and (min-width: 48em) {
-	.sg-find {
+	.sg-find, .sg-mqs {
 		display: block;
 	}
 }