Merge pull request pattern-lab#16 from pattern-lab/styleguide-integra…

…tion Styleguide integration
tommcc · Apr 14, 2016 · fb5975a · fb5975a
2 parents 560e649 + 16e7b4e
commit fb5975a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 36 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -92,7 +92,7 @@ function getTemplateWatches() {
   });
 }
 
-gulp.task('connect', ['lab'], function() {
+gulp.task('pl-connect', ['lab'], function() {
   browserSync.init({
     server: {
       baseDir: path.resolve(paths().public.root)
@@ -145,7 +145,7 @@ gulp.task('assets', ['pl-copy:js', 'pl-copy:img', 'pl-copy:font', 'pl-copy:data'
 gulp.task('prelab', ['pl-clean', 'assets']);
 gulp.task('lab', ['prelab', 'patternlab'], function(cb){cb();});
 gulp.task('patterns', ['patternlab:only_patterns']);
-gulp.task('serve', ['lab', 'connect']);
+gulp.task('pl-serve', ['lab', 'pl-connect']);
 
 gulp.task('version', ['patternlab:version']);
 gulp.task('help', ['patternlab:help']);
diff --git a/package.json b/package.json
@@ -10,6 +10,8 @@
     "handlebars": "^4.0.5",
     "mustache": "^2.2.1",
     "patternlab-node": "pattern-lab/patternlab-node#dev-2.0-core",
+    "styleguidekit-assets-default": "pattern-lab/styleguidekit-assets-default#dev",
+    "styleguidekit-mustache-default": "pattern-lab/styleguidekit-mustache-default#dev-node",
     "twig": "^0.8.9",
     "underscore": "^1.8.3"
   },

diff --git a/patternlab-config.json b/patternlab-config.json
@@ -4,8 +4,8 @@
       "root": "./source/",
       "patterns" : "./source/_patterns/",
       "data" : "./source/_data/",
-      "styleguide" : "./node_modules/patternlab-node/core/styleguide/",
-      "patternlabFiles" : "./node_modules/patternlab-node/core/",
+      "styleguide" : "./node_modules/styleguidekit-assets-default/dist/",
+      "patternlabFiles" : "./node_modules/styleguidekit-mustache-default/views/",
       "js" : "./source/js",
       "images" : "./source/images",
       "fonts" : "./source/fonts",
@@ -14,7 +14,8 @@
     "public" : {
       "root" : "./public/",
       "patterns" : "./public/patterns/",
-      "data" : "./public/data/",
+      "data" : "./public/styleguide/data/",
+      "annotations" : "./public/annotations/",
       "styleguide" : "./public/styleguide/",
       "js" : "./public/js",
       "images" : "./public/images",
@@ -29,33 +30,33 @@
   "defaultPattern": "all",
   "ignored-extensions" : ["scss", "DS_Store", "less"],
   "ignored-directories" : ["scss"],
-  "debug": true,
-  "ishControlsVisible": {
-    "s": true,
-    "m": true,
-    "l": true,
-    "full": true,
-    "random": true,
-    "disco": true,
+  "debug": false,
+  "ishControlsHide": {
+    "s": false,
+    "m": false,
+    "l": false,
+    "full": false,
+    "random": false,
+    "disco": false,
     "hay": true,
-    "mqs": true,
-    "find": true,
-    "views-all": true,
-    "views-annotations": true,
-    "views-code": true,
-    "views-new": true,
-    "tools-all": true,
-    "tools-sync": true,
-    "tools-shortcuts": true,
-    "tools-docs": true
+    "mqs": false,
+    "find": false,
+    "views-all": false,
+    "views-annotations": false,
+    "views-code": false,
+    "views-new": false,
+    "tools-all": false,
+    "tools-docs": false
   },
+  "ishMinimum": "240",
+  "ishMaximum": "2600",
   "patternStateCascade": ["inprogress", "inreview", "complete"],
   "patternStates": {
     "molecules-single-comment" : "complete",
     "organisms-sticky-comment" : "inreview",
     "templates-article" : "complete"
   },
-  "patternExportKeys": [],
+  "patternExportPatternPartials": [],
   "patternExportDirectory": "./pattern_exports/",
   "baseurl" : "",
   "cacheBust": true

diff --git a/source/_patterns/00-atoms/00-meta/_00-head.mustache b/source/_patterns/00-atoms/00-meta/_00-head.mustache
@@ -1,15 +1,16 @@
 <!DOCTYPE html>
 <html class="{{ htmlClass }}">
-<head>
-    <title>{{ title }}</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width" />
+	<head>
+		<title>{{ title }}</title>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width" />
 
-    <link rel="stylesheet" href="../../css/style.css?{{ cacheBuster }}" media="all" />
+		<link rel="stylesheet" href="../../css/style.css?{{ cacheBuster }}" media="all" />
 
-    <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
-    {% pattern-lab-head %}
-    <!-- End Pattern Lab -->
+		<!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
+		{{{ patternLabHead }}}
+		<!-- End Pattern Lab -->
 
-</head>
-<body class="{{ bodyClass }}">
+	</head>
+	<body class="{{ bodyClass }}">
+
diff --git a/source/_patterns/00-atoms/00-meta/_01-foot.mustache b/source/_patterns/00-atoms/00-meta/_01-foot.mustache
@@ -1,7 +1,6 @@
 
 <!--DO NOT REMOVE-->
-{% pattern-lab-foot %}
+{{{ patternLabFoot }}}
 
 </body>
 </html>
-