Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
dmolsen committed Mar 2, 2015
2 parents 89dcdae + d0ca70d commit 41e41e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pattern-lab/styleguidekit-twig-default",
"description": "The default Twig-based styleguide mark-up and styles for Pattern Lab",
"description": "The default Twig-based StyleguideKit for Pattern Lab. Contains styles and mark-up for Pattern Lab's front-end.",
"keywords": ["twig", "pattern lab", "styleguide"],
"homepage": "http://patternlab.io",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion views/partials/patternSection.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="sg-pattern-head">
<h3><a href="../../patterns/{{ partial.patternLink }}" class="patternLink" data-patternpartial="{{ partial.patternPartial }}">{{ partial.patternName }}</a></h3>
<div class="sg-pattern-head-actions">
Pattern header options
<!--Pattern header options-->
</div>
</div>
{% if partial.patternDescExists %}
Expand Down

0 comments on commit 41e41e2

Please sign in to comment.