Permalink
Browse files

fixes {% comment %} tags and glyphicons

  • Loading branch information...
1 parent 164aef0 commit 10bb8024c4626f7956f224675801b4a1a7f08a1e @jonschlinkert jonschlinkert committed Dec 22, 2013
View
@@ -78,7 +78,7 @@ module.exports = function(grunt) {
options: {
flatten: true,
assets: '<%= site.assets %>',
- postprocess: pretty,
+ data: '<%= site.data %>/*.{json,yml}',
// Metadata
site: '<%= site %>',
@@ -123,6 +123,7 @@ module.exports = function(grunt) {
files: [
{expand: true, cwd: '<%= bootstrap %>/examples', src: ['**/*.css', '**/*.{jpg,png,gif}'], dest: '<%= site.dest %>/examples/'},
{expand: true, cwd: '<%= bootstrap %>/docs-assets', src: ['**'], dest: '<%= site.assets %>/'},
+ {expand: true, cwd: '<%= bootstrap %>/_data', src: ['**'], dest: '<%= site.data %>/'},
{expand: true, cwd: '<%= bootstrap %>/dist', src: ['**'], dest: '<%= site.assets %>/'},
]
},
View
@@ -44,7 +44,6 @@ assemble: {
options: {
flatten: true,
assets: '<%= site.assets %>',
- postprocess: pretty,
// Metadata
site: '<%= site %>',
View
@@ -7,7 +7,7 @@ dest: <%= site.root %>
assets: <%= site.dest %>/assets
# Data
-data: data/*.{json,yml}
+data: templates/_data
# Templates
templates: templates
View
@@ -1,10 +1,10 @@
{
"name": "boilerplate-bootstrap",
- "version": "0.2.5",
+ "version": "0.2.7",
"main": [
"tasks/replacements.js"
],
"dependencies": {
- "bootstrap": "~3.0.0"
+ "bootstrap": "~3.0.3"
}
}
View
@@ -1,7 +1,7 @@
{
"name": "boilerplate-bootstrap",
"description": "Build Bootstrap with Assemble instead of Jekyll.",
- "version": "0.2.6",
+ "version": "0.2.7",
"homepage": "https://github.com/assemble/boilerplate-bootstrap",
"author": [
{
View
@@ -8,7 +8,7 @@ module.exports = {
examples: [
{
// Fix example assets
- pattern: /(..\/..\/dist\/)/gi,
+ pattern: /(..\/..\/(dist|docs-assets)\/)/g,
replacement: '../../assets/'
}
],
@@ -79,6 +79,28 @@ module.exports = {
pattern: /(?:\n\s*?{%\s*endif\s*%})/g,
replacement: ''
},
+ {
+ pattern: /\{% comment %}/g,
+ replacement: '{{#comment}}'
+ },
+ {
+ pattern: /\{% endcomment %}/g,
+ replacement: '{{/comment}}'
+ },
+ {
+ pattern: /({% for iconClassName .+ %})([\s\S]+)({% endfor %})/,
+ replacement: function(a, b, c, d) {
+ b = '{{#each glyphicons}}\n';
+ c = [
+ '<li>',
+ ' <span class="glyphicon {{.}}"></span>',
+ ' <span class="glyphicon-class">glyphicon {{.}}</span>',
+ '</li>\n'
+ ].join('\n');
+ d = '{{/each}}\n';
+ return b + c + d;
+ }
+ },
/**
@@ -151,6 +173,11 @@ module.exports = {
pattern: /(\{%\s*endhighlight\s*%\})/g,
replacement: '```\n{{/markdown}}\n'
},
+ {
+ // Fix example assets
+ pattern: /"..\/examples/g,
+ replacement: '"examples'
+ },
/**
@@ -0,0 +1,204 @@
+# Generated on Wed Dec 18 2013 20:14:37 GMT-0800 (PST)
+# **Don't edit this directly!**
+# Look at the 'build-glyphicons-data' task in Gruntfile.js
+
+- glyphicon-asterisk
+- glyphicon-plus
+- glyphicon-euro
+- glyphicon-minus
+- glyphicon-cloud
+- glyphicon-envelope
+- glyphicon-pencil
+- glyphicon-glass
+- glyphicon-music
+- glyphicon-search
+- glyphicon-heart
+- glyphicon-star
+- glyphicon-star-empty
+- glyphicon-user
+- glyphicon-film
+- glyphicon-th-large
+- glyphicon-th
+- glyphicon-th-list
+- glyphicon-ok
+- glyphicon-remove
+- glyphicon-zoom-in
+- glyphicon-zoom-out
+- glyphicon-off
+- glyphicon-signal
+- glyphicon-cog
+- glyphicon-trash
+- glyphicon-home
+- glyphicon-file
+- glyphicon-time
+- glyphicon-road
+- glyphicon-download-alt
+- glyphicon-download
+- glyphicon-upload
+- glyphicon-inbox
+- glyphicon-play-circle
+- glyphicon-repeat
+- glyphicon-refresh
+- glyphicon-list-alt
+- glyphicon-lock
+- glyphicon-flag
+- glyphicon-headphones
+- glyphicon-volume-off
+- glyphicon-volume-down
+- glyphicon-volume-up
+- glyphicon-qrcode
+- glyphicon-barcode
+- glyphicon-tag
+- glyphicon-tags
+- glyphicon-book
+- glyphicon-bookmark
+- glyphicon-print
+- glyphicon-camera
+- glyphicon-font
+- glyphicon-bold
+- glyphicon-italic
+- glyphicon-text-height
+- glyphicon-text-width
+- glyphicon-align-left
+- glyphicon-align-center
+- glyphicon-align-right
+- glyphicon-align-justify
+- glyphicon-list
+- glyphicon-indent-left
+- glyphicon-indent-right
+- glyphicon-facetime-video
+- glyphicon-picture
+- glyphicon-map-marker
+- glyphicon-adjust
+- glyphicon-tint
+- glyphicon-edit
+- glyphicon-share
+- glyphicon-check
+- glyphicon-move
+- glyphicon-step-backward
+- glyphicon-fast-backward
+- glyphicon-backward
+- glyphicon-play
+- glyphicon-pause
+- glyphicon-stop
+- glyphicon-forward
+- glyphicon-fast-forward
+- glyphicon-step-forward
+- glyphicon-eject
+- glyphicon-chevron-left
+- glyphicon-chevron-right
+- glyphicon-plus-sign
+- glyphicon-minus-sign
+- glyphicon-remove-sign
+- glyphicon-ok-sign
+- glyphicon-question-sign
+- glyphicon-info-sign
+- glyphicon-screenshot
+- glyphicon-remove-circle
+- glyphicon-ok-circle
+- glyphicon-ban-circle
+- glyphicon-arrow-left
+- glyphicon-arrow-right
+- glyphicon-arrow-up
+- glyphicon-arrow-down
+- glyphicon-share-alt
+- glyphicon-resize-full
+- glyphicon-resize-small
+- glyphicon-exclamation-sign
+- glyphicon-gift
+- glyphicon-leaf
+- glyphicon-fire
+- glyphicon-eye-open
+- glyphicon-eye-close
+- glyphicon-warning-sign
+- glyphicon-plane
+- glyphicon-calendar
+- glyphicon-random
+- glyphicon-comment
+- glyphicon-magnet
+- glyphicon-chevron-up
+- glyphicon-chevron-down
+- glyphicon-retweet
+- glyphicon-shopping-cart
+- glyphicon-folder-close
+- glyphicon-folder-open
+- glyphicon-resize-vertical
+- glyphicon-resize-horizontal
+- glyphicon-hdd
+- glyphicon-bullhorn
+- glyphicon-bell
+- glyphicon-certificate
+- glyphicon-thumbs-up
+- glyphicon-thumbs-down
+- glyphicon-hand-right
+- glyphicon-hand-left
+- glyphicon-hand-up
+- glyphicon-hand-down
+- glyphicon-circle-arrow-right
+- glyphicon-circle-arrow-left
+- glyphicon-circle-arrow-up
+- glyphicon-circle-arrow-down
+- glyphicon-globe
+- glyphicon-wrench
+- glyphicon-tasks
+- glyphicon-filter
+- glyphicon-briefcase
+- glyphicon-fullscreen
+- glyphicon-dashboard
+- glyphicon-paperclip
+- glyphicon-heart-empty
+- glyphicon-link
+- glyphicon-phone
+- glyphicon-pushpin
+- glyphicon-usd
+- glyphicon-gbp
+- glyphicon-sort
+- glyphicon-sort-by-alphabet
+- glyphicon-sort-by-alphabet-alt
+- glyphicon-sort-by-order
+- glyphicon-sort-by-order-alt
+- glyphicon-sort-by-attributes
+- glyphicon-sort-by-attributes-alt
+- glyphicon-unchecked
+- glyphicon-expand
+- glyphicon-collapse-down
+- glyphicon-collapse-up
+- glyphicon-log-in
+- glyphicon-flash
+- glyphicon-log-out
+- glyphicon-new-window
+- glyphicon-record
+- glyphicon-save
+- glyphicon-open
+- glyphicon-saved
+- glyphicon-import
+- glyphicon-export
+- glyphicon-send
+- glyphicon-floppy-disk
+- glyphicon-floppy-saved
+- glyphicon-floppy-remove
+- glyphicon-floppy-save
+- glyphicon-floppy-open
+- glyphicon-credit-card
+- glyphicon-transfer
+- glyphicon-cutlery
+- glyphicon-header
+- glyphicon-compressed
+- glyphicon-earphone
+- glyphicon-phone-alt
+- glyphicon-tower
+- glyphicon-stats
+- glyphicon-sd-video
+- glyphicon-hd-video
+- glyphicon-subtitles
+- glyphicon-sound-stereo
+- glyphicon-sound-dolby
+- glyphicon-sound-5-1
+- glyphicon-sound-6-1
+- glyphicon-sound-7-1
+- glyphicon-copyright-mark
+- glyphicon-registration-mark
+- glyphicon-cloud-download
+- glyphicon-cloud-upload
+- glyphicon-tree-conifer
+- glyphicon-tree-deciduous
@@ -15,12 +15,12 @@
<script src="{{ assets }}/js/customize.js"></script>
{{/is}}
-{% comment %}
+{{#comment}}
Inject Twitter widgets asynchronously. Snippet snipped from Twitter's
JS interface site: https://dev.twitter.com/docs/tfw-javascript
* "js.async=1;" added to add async attribute to the generated script tag.
-{% endcomment %}
+{{/comment}}
<script>
window.twttr = (function (d,s,id) {
var t, js, fjs = d.getElementsByTagName(s)[0];
@@ -18,12 +18,13 @@ base_url: "../"
<p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
<div class="bs-glyphicons">
<ul class="bs-glyphicons-list">
- {% for iconClassName in site.data.glyphicons %}
- <li>
- <span class="glyphicon {{ iconClassName }}"></span>
- <span class="glyphicon-class">glyphicon {{ iconClassName }}</span>
- </li>
- {% endfor %}
+ {{#each glyphicons}}
+<li>
+ <span class="glyphicon {{.}}"></span>
+ <span class="glyphicon-class">glyphicon {{.}}</span>
+</li>
+{{/each}}
+
</ul>
</div>
@@ -1217,7 +1218,7 @@ base_url: "../"
<p>Easily make tabs or pills equal widths of their parent at screens wider than 768px with <code>.nav-justified</code>. On smaller screens, the nav links are stacked.</p>
<div class="bs-callout bs-callout-warning">
<h4>Safari and responsive justified navs</h4>
- <p>Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p>
+ <p>Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="examples/justified-nav/">justified nav example</a>.</p>
</div>
<div class="bs-example">
<ul class="nav nav-tabs nav-justified">
View
@@ -406,7 +406,7 @@ base_url: "../"
```
{{/markdown}}
- <p>In addition to column clearing at responsive breakpoints, you may need to <strong>reset offsets, pushes, or pulls</strong>. Those resets are available for medium and large grid tiers only, since they start only at the (second) small grid tier. See this in action in <a href="../examples/grid/">the grid example</a>.</p>
+ <p>In addition to column clearing at responsive breakpoints, you may need to <strong>reset offsets, pushes, or pulls</strong>. Those resets are available for medium and large grid tiers only, since they start only at the (second) small grid tier. See this in action in <a href="examples/grid/">the grid example</a>.</p>
{{#markdown}}
```html
Oops, something went wrong.

0 comments on commit 10bb802

Please sign in to comment.