ustyle 1.4.1 → 1.5.8

data/grunt/modules/html-parser.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var cheerio = require('cheerio');
+
+module.exports = {
+  extractSubNav: function(content){
+    var $ = cheerio.load(content),
+            contents = [];
+
+    function buildHashOfContents(i, el) {
+      contents.push({name: $(el).text(), link: $(el).attr('href')});
+    }
+
+    $('ul.table-of-contents a').map(buildHashOfContents);
+    return contents;
+  },
+
+  removeSubNav: function(content){
+    var $ = cheerio.load(content);
+
+    $('ul.table-of-contents').remove();
+    return $.html();
+  }
+}

data/grunt/tasks/styleguide.js

@@ -11,6 +11,7 @@ module.exports = function(grunt){
         fs              = require('fs'),
         dssHelper       = require('../modules/dss-helper'),
         fileHelper      = require('../modules/file'),
+        parser          = require('../modules/html-parser'),
         humanize        = require("underscore.string/humanize"),
         underscored     = require("underscore.string/underscored"),
         slugify         = require("underscore.string/slugify"),
@@ -135,7 +136,9 @@ module.exports = function(grunt){
           })
           .map(function(file){
             var data = matter.read(file),
+                html = parser.removeSubNav(data.content),
                 extension = path.extname(file),
+                subNavData = parser.extractSubNav(data.content),
                 section = path.dirname(file).replace((new RegExp(contentPath + "\/?", "g")), ""),
                 filename = path.basename(file, extension);
 
@@ -144,7 +147,8 @@ module.exports = function(grunt){
               page: filename + '.html',
               template: _getTemplate(data.data.template || options.contentTemplate),
               section: section,
-              content: (fileHelper.isMarkdown(extension) ? marked(data.content) : data.content)
+              content: (fileHelper.isMarkdown(extension) ? marked(html) : html),
+              subNav: subNavData
             }
           });
 

data/lib/ustyle/version.rb

@@ -1,4 +1,4 @@
 module Ustyle
-  version = "1.4.1"
+  version = "1.5.8"
   VERSION = version
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ustyle",
-  "version": "1.4.1",
+  "version": "1.5.8",
   "description": "A living styleguide and pattern library by uSwitch.",
   "keywords": [
     "css",
@@ -39,6 +39,7 @@
     "autoprefixer-core": "^4.0.1",
     "bluebird": "^2.9.7",
     "browser-sync": "^1.8.2",
+    "cheerio": "^0.20.0",
     "cssstats": "^1.0.1",
     "dss": "^1.0.4",
     "gray-matter": "^2.0.0",

data/styleguide/assets/sass/main.scss

@@ -30,12 +30,14 @@ $icons: (
   envelope
   exit-noexit
   facebook
+  facebook-brand
   filter
   fixed-variable
   gas
   gauge
   github
   google
+  google-brand
   graph-up
   happy
   home
@@ -93,6 +95,7 @@ $icons: (
   tick
   tv
   twitter
+  twitter-brand
   uswitch
   variable
   warning-circle
@@ -144,6 +147,7 @@ $sidebar-padding        : 0;
 @import "modules/tooltip";
 @import "modules/table";
 @import "modules/markdown";
+@import "modules/images";
 @import "modules/typography";
 
 @import "vendor/highlight";

data/styleguide/assets/sass/modules/_images.scss

@@ -0,0 +1,24 @@
+.image {
+  &-tip,
+  &-examples {
+    border: 1px solid $c-bordergrey;
+
+    img {
+      margin-bottom: $gutter-width/2;
+    }
+
+    &:nth-child(2n+1) {
+      clear: left;
+    }
+  }
+
+  &-tip {
+    &__reason {
+      margin-bottom: $gutter-width;
+    }
+  }
+}
+
+.image-examples {
+  margin-bottom: $gutter-width;
+}