Skip to content

Commit 2b68c24

Browse files
bmuenzenmeyerbmuenzenmeyer
authored
Merge pull request #55 from pattern-lab/dev
v3.4.0
2 parents 2fdbbc9 + 3f41502 commit 2b68c24

File tree

11 files changed

+72
-16
lines changed

11 files changed

+72
-16
lines changed

‎dist/index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@
7676
{{/ patternItems }}
7777
</ol></li>
7878
{{/ patternTypes }}
79-
<li><a href="styleguide/html/styleguide.html" class="sg-pop" data-patternpartial="all">All</a></li>
80-
79+
{{^ ishControlsHide.views-all }}
80+
<li><a href="styleguide/html/styleguide.html" class="sg-pop" data-patternpartial="all">All</a></li>
81+
{{/ ishControlsHide.views-all }}
8182
</script>
8283

8384
<script type="text/mustache" id="pl-ish-controls-template">

‎dist/styleguide/css/styleguide.css‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,13 +869,16 @@
869869
@media all and (min-width: 42em) {
870870
.sg-pattern-extra-inner {
871871
display: -webkit-box;
872+
display: -webkit-flex;
872873
display: -ms-flexbox;
873874
display: flex;
874875
-webkit-box-align: stretch;
876+
-webkit-align-items: stretch;
875877
-ms-flex-align: stretch;
876878
align-items: stretch;
877879
width: 100%;
878880
-webkit-box-flex: 1;
881+
-webkit-flex: 1 1 auto;
879882
-ms-flex: 1 1 auto;
880883
flex: 1 1 auto;
881884
}
@@ -928,15 +931,18 @@
928931
*/
929932
.sg-pattern-extra-code {
930933
display: -webkit-box;
934+
display: -webkit-flex;
931935
display: -ms-flexbox;
932936
display: flex;
933937
-webkit-box-orient: vertical;
934938
-webkit-box-direction: normal;
939+
-webkit-flex-direction: column;
935940
-ms-flex-direction: column;
936941
flex-direction: column;
937942
font-size: 90%;
938943
padding: 0.5rem;
939944
-webkit-box-flex: 1;
945+
-webkit-flex: 1 1 auto;
940946
-ms-flex: 1 1 auto;
941947
flex: 1 1 auto;
942948
/**
@@ -950,6 +956,7 @@
950956
margin: 0 !important;
951957
line-height: 1 !important;
952958
-webkit-box-flex: 1;
959+
-webkit-flex: 1 1 auto;
953960
-ms-flex: 1 1 auto;
954961
flex: 1 1 auto;
955962
border-radius: 0 6px 6px 6px !important;
@@ -1012,19 +1019,33 @@
10121019
display: none;
10131020
}
10141021

1022+
.language-markup code[class*=language-],
1023+
.language-markup pre[class*=language-] {
1024+
white-space: pre-wrap;
1025+
}
1026+
@media all and (min-width: 42em) {
1027+
.language-markup code[class*=language-],
1028+
.language-markup pre[class*=language-] {
1029+
white-space: pre;
1030+
}
1031+
}
1032+
10151033
/*------------------------------------*\
10161034
#TABS
10171035
\*------------------------------------*/
10181036
.sg-tabs {
10191037
-webkit-box-flex: 1;
1038+
-webkit-flex: 1 1 auto;
10201039
-ms-flex: 1 1 auto;
10211040
flex: 1 1 auto;
10221041
width: 100%;
10231042
display: -webkit-box;
1043+
display: -webkit-flex;
10241044
display: -ms-flexbox;
10251045
display: flex;
10261046
-webkit-box-orient: vertical;
10271047
-webkit-box-direction: normal;
1048+
-webkit-flex-direction: column;
10281049
-ms-flex-direction: column;
10291050
flex-direction: column;
10301051
font: "HelveticaNeue", "Helvetica", "Arial", sans-serif !important;
@@ -1077,13 +1098,16 @@
10771098

10781099
.sg-tabs-content {
10791100
-webkit-box-flex: 1;
1101+
-webkit-flex: 1 1 auto;
10801102
-ms-flex: 1 1 auto;
10811103
flex: 1 1 auto;
10821104
display: -webkit-box;
1105+
display: -webkit-flex;
10831106
display: -ms-flexbox;
10841107
display: flex;
10851108
-webkit-box-orient: vertical;
10861109
-webkit-box-direction: normal;
1110+
-webkit-flex-direction: column;
10871111
-ms-flex-direction: column;
10881112
flex-direction: column;
10891113
border: 1px solid #ccc;
@@ -1094,13 +1118,16 @@
10941118
.sg-tabs-panel {
10951119
display: none;
10961120
display: -webkit-box;
1121+
display: -webkit-flex;
10971122
display: -ms-flexbox;
10981123
display: flex;
10991124
-webkit-box-orient: vertical;
11001125
-webkit-box-direction: normal;
1126+
-webkit-flex-direction: column;
11011127
-ms-flex-direction: column;
11021128
flex-direction: column;
11031129
-webkit-box-flex: 1;
1130+
-webkit-flex: 1 1 auto;
11041131
-ms-flex: 1 1 auto;
11051132
flex: 1 1 auto;
11061133
position: relative;
@@ -1133,10 +1160,12 @@
11331160
width: 100%;
11341161
height: 50%;
11351162
display: -webkit-box;
1163+
display: -webkit-flex;
11361164
display: -ms-flexbox;
11371165
display: flex;
11381166
-webkit-box-orient: vertical;
11391167
-webkit-box-direction: normal;
1168+
-webkit-flex-direction: column;
11401169
-ms-flex-direction: column;
11411170
flex-direction: column;
11421171
/**
@@ -1182,6 +1211,7 @@
11821211
}
11831212
.sg-modal .sg-pattern-extra {
11841213
-webkit-box-flex: 1;
1214+
-webkit-flex: 1 1 auto;
11851215
-ms-flex: 1 1 auto;
11861216
flex: 1 1 auto;
11871217
max-height: none;
@@ -1242,13 +1272,16 @@
12421272
*/
12431273
.sg-modal-content {
12441274
display: -webkit-box;
1275+
display: -webkit-flex;
12451276
display: -ms-flexbox;
12461277
display: flex;
12471278
-webkit-box-flex: 1;
1279+
-webkit-flex: 1 1 auto;
12481280
-ms-flex: 1 1 auto;
12491281
flex: 1 1 auto;
12501282
-webkit-box-orient: vertical;
12511283
-webkit-box-direction: normal;
1284+
-webkit-flex-direction: column;
12521285
-ms-flex-direction: column;
12531286
flex-direction: column;
12541287
overflow-y: auto;
@@ -1260,13 +1293,16 @@
12601293
*/
12611294
.sg-modal-content-inner {
12621295
display: -webkit-box;
1296+
display: -webkit-flex;
12631297
display: -ms-flexbox;
12641298
display: flex;
12651299
-webkit-box-flex: 1;
1300+
-webkit-flex: 1 1 auto;
12661301
-ms-flex: 1 1 auto;
12671302
flex: 1 1 auto;
12681303
-webkit-box-orient: vertical;
12691304
-webkit-box-direction: normal;
1305+
-webkit-flex-direction: column;
12701306
-ms-flex-direction: column;
12711307
flex-direction: column;
12721308
}
@@ -1344,12 +1380,15 @@
13441380
counter-increment: the-count;
13451381
font-size: 85%;
13461382
display: -webkit-box;
1383+
display: -webkit-flex;
13471384
display: -ms-flexbox;
13481385
display: flex;
13491386
-webkit-box-align: center;
1387+
-webkit-align-items: center;
13501388
-ms-flex-align: center;
13511389
align-items: center;
13521390
-webkit-box-pack: center;
1391+
-webkit-justify-content: center;
13531392
-ms-flex-pack: center;
13541393
justify-content: center;
13551394
width: 14px;

‎dist/styleguide/css/styleguide.min.css‎

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

‎dist/styleguide/js/patternlab-pattern.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ var urlHandler = {
245245
history.pushState(data, null, addressReplacement);
246246
}
247247
document.getElementById("title").innerHTML = "Pattern Lab - "+pattern;
248-
if (document.getElementById("sg-raw") !== undefined) {
248+
if (document.getElementById("sg-raw") !== null) {
249249
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(pattern));
250250
}
251251
}
@@ -276,7 +276,9 @@ var urlHandler = {
276276
var obj = JSON.stringify({ "event": "patternLab.updatePath", "path": iFramePath });
277277
document.getElementById("sg-viewport").contentWindow.postMessage( obj, urlHandler.targetOrigin);
278278
document.getElementById("title").innerHTML = "Pattern Lab - "+patternName;
279-
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(patternName));
279+
if (document.getElementById("sg-raw") !== null) {
280+
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(patternName));
281+
}
280282

281283
/*
282284
if (wsnConnected !== undefined) {

‎dist/styleguide/js/patternlab-pattern.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.

‎dist/styleguide/js/patternlab-viewer.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ var urlHandler = {
338338
history.pushState(data, null, addressReplacement);
339339
}
340340
document.getElementById("title").innerHTML = "Pattern Lab - "+pattern;
341-
if (document.getElementById("sg-raw") !== undefined) {
341+
if (document.getElementById("sg-raw") !== null) {
342342
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(pattern));
343343
}
344344
}
@@ -369,7 +369,9 @@ var urlHandler = {
369369
var obj = JSON.stringify({ "event": "patternLab.updatePath", "path": iFramePath });
370370
document.getElementById("sg-viewport").contentWindow.postMessage( obj, urlHandler.targetOrigin);
371371
document.getElementById("title").innerHTML = "Pattern Lab - "+patternName;
372-
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(patternName));
372+
if (document.getElementById("sg-raw") !== null) {
373+
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(patternName));
374+
}
373375

374376
/*
375377
if (wsnConnected !== undefined) {
@@ -1831,7 +1833,7 @@ window.addEventListener("message", receiveIframeMessage, false);
18311833
history.replaceState({ "pattern": patternName }, null, null);
18321834
}
18331835

1834-
if (document.getElementById("sg-raw") !== undefined) {
1836+
if (document.getElementById("sg-raw") !== null) {
18351837
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(patternName));
18361838
}
18371839

‎dist/styleguide/js/patternlab-viewer.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.

‎src/html/partials/pattern-nav.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@
1212
{{/ patternItems }}
1313
</ol></li>
1414
{{/ patternTypes }}
15-
<li><a href="styleguide/html/styleguide.html" class="sg-pop" data-patternpartial="all">All</a></li>
15+
{{^ ishControlsHide.views-all }}
16+
<li><a href="styleguide/html/styleguide.html" class="sg-pop" data-patternpartial="all">All</a></li>
17+
{{/ ishControlsHide.views-all }}

‎src/js/styleguide.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
history.replaceState({ "pattern": patternName }, null, null);
518518
}
519519

520-
if (document.getElementById("sg-raw") !== undefined) {
520+
if (document.getElementById("sg-raw") !== null) {
521521
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(patternName));
522522
}
523523

‎src/js/url-handler.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ var urlHandler = {
153153
history.pushState(data, null, addressReplacement);
154154
}
155155
document.getElementById("title").innerHTML = "Pattern Lab - "+pattern;
156-
if (document.getElementById("sg-raw") !== undefined) {
156+
if (document.getElementById("sg-raw") !== null) {
157157
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(pattern));
158158
}
159159
}
@@ -184,7 +184,9 @@ var urlHandler = {
184184
var obj = JSON.stringify({ "event": "patternLab.updatePath", "path": iFramePath });
185185
document.getElementById("sg-viewport").contentWindow.postMessage( obj, urlHandler.targetOrigin);
186186
document.getElementById("title").innerHTML = "Pattern Lab - "+patternName;
187-
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(patternName));
187+
if (document.getElementById("sg-raw") !== null) {
188+
document.getElementById("sg-raw").setAttribute("href",urlHandler.getFileName(patternName));
189+
}
188190

189191
/*
190192
if (wsnConnected !== undefined) {

0 commit comments

Comments
 (0)