Skip to content

Commit 446fbd3

Browse files
committed
Merge branch 'dev'
Conflicts: dist/styleguide/css/styleguide.css dist/styleguide/css/styleguide.min.css src/sass/styleguide.scss
2 parents 6a4d21f + a93d9d2 commit 446fbd3

File tree

8 files changed

+1272
-1148
lines changed

8 files changed

+1272
-1148
lines changed

dist/index.html

+17-17
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@
148148

149149
<!-- description, etc. -->
150150
{{# descBlockExists }}
151-
151+
152152
<div class="sg-pattern-extra-info">
153-
153+
154154
{{# isPatternView }}
155155
<!-- if this is for a single pattern provide some extra info -->
156156
<div class="sg-pattern-head">
157-
157+
158158
<div class="sg-pattern-breadcrumb">
159159
{{# patternBreadcrumb }}
160160
{{ patternType }}
@@ -163,17 +163,17 @@
163163
{{/ patternSubtype }}
164164
{{/ patternBreadcrumb }}
165165
</div>
166-
166+
167167
<h2 class="sg-pattern-title">
168168
{{ patternNameCaps }}
169169
{{# patternState }}
170170
<span class="sg-pattern-state {{ patternState }}">{{ patternState }}</span>
171171
{{/ patternState }}
172172
</h2>
173-
173+
174174
</div><!--end .sg-pattern-head-->
175175
{{/ isPatternView }}
176-
176+
177177
{{# patternDescExists }}
178178
<div class="sg-pattern-desc">
179179
{{{ patternDesc }}}
@@ -182,7 +182,7 @@ <h2 class="sg-pattern-title">
182182
{{/ patternDescAdditions }}
183183
</div><!--end .sg-pattern-desc-->
184184
{{/ patternDescExists }}
185-
185+
186186
{{# lineageExists }}
187187
<p class="sg-pattern-lineage">
188188
The <strong>{{ patternName }}</strong> pattern contains the following patterns:
@@ -193,7 +193,7 @@ <h2 class="sg-pattern-title">
193193
</span>
194194
</p><!--end .sg-pattern-lineage-->
195195
{{/ lineageExists }}
196-
196+
197197
{{# lineageRExists }}
198198
<p class="sg-pattern-lineage">
199199
The <strong>{{ patternName }}</strong> pattern is included in the following patterns:
@@ -204,42 +204,42 @@ <h2 class="sg-pattern-title">
204204
</span>
205205
</p><!--end .sg-pattern-lineage-->
206206
{{/ lineageRExists }}
207-
207+
208208
{{# annotationExists }}
209209
<div class="sg-annotations" id="sg-annotations">
210210
<h2 class="sg-annotations-title">Annotations</h2>
211211
<ol class="sg-annotations-list">
212212
{{# annotations }}
213-
<li><strong>{{ title }}</strong>{{{ comment }}}</li>
213+
<li><h4 class="sg-annotations-list-title">{{ title }}</h4> {{{ comment }}}</li>
214214
{{/ annotations }}
215215
</ol>
216216
</div>
217217
{{/ annotationExists }}
218-
218+
219219
</div><!--end .sg-pattern-extra-info-->
220220
{{/ descBlockExists }}
221-
221+
222222
<div class="sg-pattern-extra-code">
223-
223+
224224
<div id="sg-{{ patternPartial }}-tabs" class="sg-tabs">
225225
<ul class="sg-tabs-list">
226226
{{# panels }}
227227
<li id="sg-{{ patternPartial }}-{{ id }}-tab" data-patternpartial="{{ patternPartial }}" data-panelid="{{ id }}"><a href="#sg-{{ patternPartial }}-{{ id }}-panel" class="active">{{ name }}</a></li>
228228
{{/ panels }}
229229
</ul><!--end .sg-tabs-list-->
230-
230+
231231
<div id="sg-{{ patternPartial }}-panels" class="sg-tabs-content">
232232
{{# panels }}
233233
<div id="sg-{{ patternPartial }}-{{ id }}-panel" class="sg-tabs-panel" style="display: none">
234234
{{{ content }}}
235235
</div>
236236
{{/ panels }}
237237
</div><!--end .sg-tabs-content-->
238-
238+
239239
</div><!--end .sg-tabs-->
240-
240+
241241
</div><!--end .sg-pattern-extra-code-->
242-
242+
243243
</div><!--end .sg-pattern-extra-inner-->
244244

245245
</script>

0 commit comments

Comments
 (0)