Skip to content

Commit c8bb237

Browse files
Merge branch 'develop' into develop
2 parents 060e150 + db40a05 commit c8bb237

22 files changed

+597
-318
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ node_modules/*
22
src/bower_components/*
33
.sass-cache/*
44
.DS_Store
5+
/.eslintignore

dist/index.html

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<div class="pl-c-viewport__iframe-wrapper pl-js-vp-iframe-container">
3939

40-
<iframe class="pl-c-viewport__iframe pl-js-iframe" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"></iframe>
40+
<iframe class="pl-c-viewport__iframe pl-js-iframe" sandbox="allow-same-origin allow-scripts allow-popups allow-forms allow-modals"></iframe>
4141

4242
<div class="pl-c-viewport__resizer pl-js-resize-container">
4343

@@ -49,14 +49,17 @@
4949

5050
</div><!--end pl-c-viewport-->
5151

52-
<div class="pl-c-modal pl-js-modal">
53-
54-
<button class="pl-c-modal__close-btn pl-js-modal-close-btn" title="Hide pattern info">
55-
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" class="pl-c-modal__close-btn-icon">
56-
<title>Close</title>
57-
<path fill="currentColor" d="M11.8905,9.6405 L11.8905,9.6405 L8.25,6 L11.8905,2.3595 L11.8905,2.3595 C11.9295,2.3205 11.958,2.27475 11.976,2.226 C12.0255,2.0925 11.997,1.9365 11.8905,1.82925 L10.17075,0.1095 C10.0635,0.00225 9.9075,-0.02625 9.774,0.024 C9.72525,0.042 9.6795,0.0705 9.6405,0.1095 L9.6405,0.1095 L6,3.75 L2.3595,0.1095 L2.3595,0.1095 C2.3205,0.0705 2.27475,0.042 2.226,0.024 C2.0925,-0.0255 1.9365,0.00225 1.82925,0.1095 L0.1095,1.82925 C0.00225,1.9365 -0.02625,2.0925 0.024,2.226 C0.042,2.27475 0.0705,2.3205 0.1095,2.3595 L0.1095,2.3595 L3.75,6 L0.1095,9.6405 L0.1095,9.6405 C0.0705,9.6795 0.042,9.72525 0.024,9.774 C-0.0255,9.9075 0.00225,10.0635 0.1095,10.17075 L1.82925,11.8905 C1.9365,11.99775 2.0925,12.02625 2.226,11.976 C2.27475,11.958 2.3205,11.9295 2.3595,11.8905 L2.3595,11.8905 L6,8.25 L9.6405,11.8905 L9.6405,11.8905 C9.6795,11.9295 9.72525,11.958 9.774,11.976 C9.9075,12.0255 10.0635,11.99775 10.17075,11.8905 L11.8905,10.17075 C11.99775,10.0635 12.02625,9.9075 11.976,9.774 C11.958,9.72525 11.9295,9.6795 11.8905,9.6405 L11.8905,9.6405 Z"></path>
58-
</svg>
59-
</button><!--end pl-c-modal__close-btn-->
52+
<div class="pl-c-modal__cover pl-js-modal-cover"></div>
53+
<div class="pl-c-modal pl-js-modal">
54+
<div class="pl-c-modal__toolbar">
55+
<div class="pl-c-modal__resizer pl-js-modal-resizer"></div>
56+
<button class="pl-c-modal__close-btn pl-js-modal-close-btn" title="Hide pattern info">
57+
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" class="pl-c-modal__close-btn-icon">
58+
<title>Close</title>
59+
<path fill="currentColor" d="M11.8905,9.6405 L11.8905,9.6405 L8.25,6 L11.8905,2.3595 L11.8905,2.3595 C11.9295,2.3205 11.958,2.27475 11.976,2.226 C12.0255,2.0925 11.997,1.9365 11.8905,1.82925 L10.17075,0.1095 C10.0635,0.00225 9.9075,-0.02625 9.774,0.024 C9.72525,0.042 9.6795,0.0705 9.6405,0.1095 L9.6405,0.1095 L6,3.75 L2.3595,0.1095 L2.3595,0.1095 C2.3205,0.0705 2.27475,0.042 2.226,0.024 C2.0925,-0.0255 1.9365,0.00225 1.82925,0.1095 L0.1095,1.82925 C0.00225,1.9365 -0.02625,2.0925 0.024,2.226 C0.042,2.27475 0.0705,2.3205 0.1095,2.3595 L0.1095,2.3595 L3.75,6 L0.1095,9.6405 L0.1095,9.6405 C0.0705,9.6795 0.042,9.72525 0.024,9.774 C-0.0255,9.9075 0.00225,10.0635 0.1095,10.17075 L1.82925,11.8905 C1.9365,11.99775 2.0925,12.02625 2.226,11.976 C2.27475,11.958 2.3205,11.9295 2.3595,11.8905 L2.3595,11.8905 L6,8.25 L9.6405,11.8905 L9.6405,11.8905 C9.6795,11.9295 9.72525,11.958 9.774,11.976 C9.9075,12.0255 10.0635,11.99775 10.17075,11.8905 L11.8905,10.17075 C11.99775,10.0635 12.02625,9.9075 11.976,9.774 C11.958,9.72525 11.9295,9.6795 11.8905,9.6405 L11.8905,9.6405 Z"></path>
60+
</svg>
61+
</button><!--end pl-c-modal__close-btn-->
62+
</div>
6063

6164
<div class="pl-c-modal__content pl-js-modal-content" />
6265

@@ -222,68 +225,68 @@
222225
<div class="pl-c-pattern-info__header">
223226

224227
<ul class="pl-c-breadcrumb">
225-
228+
226229
{{# patternBreadcrumb }}
227230

228231
<li class="pl-c-breadcrumb__item">{{ patternType }}</li>
229232

230233
{{# patternSubtype }}
231234
<li class="pl-c-breadcrumb__item">{{ patternSubtype }}</li>
232-
{{/ patternSubtype }}
233-
235+
{{/ patternSubtype }}
236+
234237
{{/ patternBreadcrumb }}
235238

236239
</ul><!--end pl-c-breadcrumb-->
237240

238241
<h2 class="pl-c-pattern-info__title">
239-
{{ patternName }}
240-
242+
{{ patternName }}
243+
241244
{{# patternState }}
242245
<span class="pl-c-pattern-state pl-c-pattern-state--{{ patternState }}" title="{{ patternState }}"></span>
243246
{{/ patternState }}
244247
</h2><!--end pl-c-pattern-info__title-->
245248

246249
</div><!--end pl-c-pattern-info__header-->
247-
{{/ isPatternView }}
248-
250+
{{/ isPatternView }}
251+
249252
{{# patternDescExists }}
250253
<div class="pl-c-pattern-info__description pl-c-text-passage">
251254
{{{ patternDesc }}} {{# patternDescAdditions }} {{{ patternDescAdditions }}} {{/ patternDescAdditions }}
252255
</div><!--end pl-c-pattern-info__description-->
253-
{{/ patternDescExists }}
254-
256+
{{/ patternDescExists }}
257+
255258
{{# lineageExists }}
256259
<p class="pl-c-lineage pl-js-lineage">
257-
The <em>{{ patternName }}</em> pattern contains the following patterns:
260+
The <em>{{ patternName }}</em> pattern contains the following patterns:
258261
{{# lineage }}
259262
<a href='{{ lineagePath }}' class='pl-c-lineage__link pl-js-lineage-link' data-patternPartial='{{ lineagePattern }}'>
260-
{{ lineagePattern }}
263+
{{ lineagePattern }}
261264
{{# lineageState }}<span class="pl-c-pattern-state pl-c-pattern-state--{{ lineageState }}" title="{{ lineageState }}" />{{/ lineageState }}
262265
</a><!--end pl-c-lineage__link-->
263-
{{# hasComma }}, {{/ hasComma }}
266+
{{# hasComma }}, {{/ hasComma }}
264267
{{/ lineage }}
265268

266269
</p><!--end pl-c-lineage-->
267-
{{/ lineageExists }}
268-
270+
{{/ lineageExists }}
271+
269272
{{# lineageRExists }}
270273
<p class="pl-c-lineage">
271-
The <em>{{ patternName }}</em> pattern is included in the following patterns:
274+
The <em>{{ patternName }}</em> pattern is included in the following patterns:
272275
{{# lineageR }}
273276
<a href='{{ lineagePath }}' class='pl-c-lineage__link pl-js-lineage-link' data-patternPartial='{{ lineagePattern }}'>
274-
{{ lineagePattern }}
277+
{{ lineagePattern }}
275278
{{# lineageState }}<span class="pl-c-pattern-state pl-c-pattern-state--{{ lineageState }}" title="{{ lineageState }}" />{{/ lineageState }}
276279
</a><!--end pl-c-lineage__link-->
277280
{{# hasComma }}, {{/ hasComma }}
278281
{{/ lineageR }}
279282
</p><!--end pl-c-lineage-->
280-
{{/ lineageRExists }}
281-
283+
{{/ lineageRExists }}
284+
282285
{{# annotationExists }}
283286
<div class="pl-c-annotations pl-c-text-passage pl-js-annotations">
284287
<h2 class="pl-c-annotations__title">Annotations</h2>
285288
<ol class="pl-c-annotations__list">
286-
289+
287290
{{# annotations }}
288291
<li class="pl-c-annotations__item">
289292

@@ -322,6 +325,8 @@ <h3 class="pl-c-annotations__item-title">{{ title }}</h3>
322325

323326
{{# panels }}
324327
<div id="pl-{{ patternPartial }}-{{ id }}-panel" class="pl-c-tabs__panel pl-js-tab-panel">
328+
<button class="pl-c-code-copy-btn pl-js-code-copy-btn" data-clipboard-target="#pl-{{ patternPartial }}-{{ id }}-panel code">Copy</button>
329+
325330
{{{ content }}}
326331
</div><!--end pl-c-tabs__panel-->
327332
{{/ panels }}
@@ -331,13 +336,15 @@ <h3 class="pl-c-annotations__item-title">{{ title }}</h3>
331336
</div><!--end pl-c-tabs-->
332337

333338
</div><!--end pl-c-pattern-info__panel-->
339+
334340
</script>
335341

336342
<!-- the template for code-related tabs in the code view slider -->
337343
<script type="text/mustache" id="pl-panel-template-code">
338344
<pre class="language-markup">
339345
<code id="pl-code-fill-{{ language }}" class="language-{{ language }}">{{{ code }}}</code>
340346
</pre>
347+
341348
</script>
342349

343350
<!-- load Pattern Lab data -->

dist/styleguide/bower_components/prism.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)