Skip to content

Commit f0afee6

Browse files
Merge branch 'master' into lazy-contribs
2 parents 9444bdc + 198c534 commit f0afee6

40 files changed

+1010
-657
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
"tap-spot": "^1.1.1",
131131
"through2": "^2.0.3",
132132
"uglifyjs-webpack-plugin": "^1.1.6",
133-
"webpack": "^4.29.6",
133+
"webpack": "^4.30.0",
134134
"webpack-cli": "^3.2.3",
135135
"webpack-dev-server": "^3.2.1",
136136
"webpack-merge": "^4.1.0"

repositories/loaders.json

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"webpack-contrib/cache-loader",
3838
"webpack-contrib/thread-loader",
3939
"webpack-contrib/polymer-webpack-loader",
40-
"webpack-contrib/config-loader",
4140
"babel/babel-loader",
4241
"postcss/postcss-loader",
4342
"peerigon/extract-loader"

src/components/Contributors/Contributors.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
height: 45px;
1818
width: 45px;
1919
border-radius: 50%;
20-
box-shadow: 0 0 2px rgba(0,0,0,0.3);
20+
box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
2121
}
2222

2323
.contributor__name {
@@ -30,7 +30,7 @@
3030
overflow-wrap: break-word;
3131
hyphens: auto;
3232
color: getColor(fiord);
33-
box-shadow: 0 0 2px rgba(0,0,0,0.3);
33+
box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
3434
background: transparentize(getColor(white), 0.05);
3535
transition: color 0.1s;
3636
}

src/components/Dropdown/Dropdown.scss

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
}
2222

2323
.dropdown__arrow {
24-
2524
&:before {
26-
content: "\25be";
25+
content: '\25be';
2726
}
2827
}
2928

@@ -34,7 +33,7 @@
3433
right: 0;
3534
font-size: getFontSize(-1);
3635
margin: auto;
37-
background-color: #2B3A42;
36+
background-color: #2b3a42;
3837
z-index: 1;
3938

4039
ul {
@@ -47,7 +46,9 @@
4746
color: #fff;
4847
transition: all 250ms;
4948

50-
a:link, a:visited, a:hover {
49+
a:link,
50+
a:visited,
51+
a:hover {
5152
color: #fff;
5253
}
5354

src/components/Footer/Footer.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
.footer__left {
3737
@include break {
38-
padding-left:1.5em;
38+
padding-left: 1.5em;
3939
}
4040
}
4141

@@ -55,12 +55,12 @@
5555
}
5656

5757
.footer__icon {
58-
display:inline-block;
59-
height:35px;
58+
display: inline-block;
59+
height: 35px;
6060

6161
img {
62-
width:auto;
63-
height:100%;
62+
width: auto;
63+
height: 100%;
6464
}
6565
}
6666

src/components/Logo/Logo.scss

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.logo {
2-
float:left;
3-
width:auto;
4-
height:35px;
5-
opacity:0.9;
6-
transition:opacity 250ms;
2+
float: left;
3+
width: auto;
4+
height: 35px;
5+
opacity: 0.9;
6+
transition: opacity 250ms;
77

88
&:hover {
9-
opacity:1;
9+
opacity: 1;
1010
}
1111
}

src/components/Markdown/Markdown.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
color: inherit;
4545
}
4646

47-
a[aria-hidden="true"] {
47+
a[aria-hidden='true'] {
4848
margin-left: 8px;
4949
font-size: 0.8em;
5050
height: 1em;
@@ -53,7 +53,7 @@
5353
transition: all 250ms;
5454
}
5555

56-
&:hover a[aria-hidden="true"] {
56+
&:hover a[aria-hidden='true'] {
5757
opacity: 1;
5858
visibility: visible;
5959
}
@@ -171,7 +171,7 @@
171171
color: #907a6e;
172172

173173
.tip-content::before {
174-
content: "[TODO]: ";
174+
content: '[TODO]: ';
175175
font-style: normal;
176176
}
177177
}
@@ -275,7 +275,7 @@
275275
}
276276
}
277277

278-
img:not([class*="support__"]) {
278+
img:not([class*='support__']) {
279279
max-width: 100%;
280280
height: auto;
281281
}
@@ -329,7 +329,7 @@
329329
cursor: pointer;
330330

331331
&::after {
332-
content: "\F103";
332+
content: '\F103';
333333
float: left;
334334
position: relative;
335335
left: -2px;

src/components/Markdown/prism-theme.scss

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@import 'functions';
22
@import 'mixins';
33

4-
code[class*="lang-"],
5-
pre[class*="lang-"] {
4+
code[class*='lang-'],
5+
pre[class*='lang-'] {
66
text-align: left;
77
white-space: pre;
88
word-spacing: normal;
@@ -20,17 +20,17 @@ pre[class*="lang-"] {
2020
}
2121

2222
/* Code blocks */
23-
pre[class*="lang-"] {
24-
padding: .4em .8em;
25-
margin: .5em 0;
23+
pre[class*='lang-'] {
24+
padding: 0.4em 0.8em;
25+
margin: 0.5em 0;
2626
overflow: auto;
2727
background-color: getColor(elephant);
2828
}
2929

3030
/* Inline code */
31-
:not(pre) > code[class*="lang-"] {
32-
padding: .2em;
33-
border-radius: .3em;
31+
:not(pre) > code[class*='lang-'] {
32+
padding: 0.2em;
33+
border-radius: 0.3em;
3434
box-shadow: none;
3535
white-space: normal;
3636
}
@@ -47,7 +47,7 @@ pre[class*="lang-"] {
4747
}
4848

4949
.namespace {
50-
opacity: .7;
50+
opacity: 0.7;
5151
}
5252

5353
.token.property,
@@ -66,7 +66,7 @@ pre[class*="lang-"] {
6666
.token.regex,
6767
.token.attr-value,
6868
.token.important {
69-
color: desaturate(#2dd271, 23%)
69+
color: desaturate(#2dd271, 23%);
7070
}
7171

7272
.token.inserted {

src/components/Navigation/Navigation.scss

+7-3
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
text-shadow: 0 0 0 #666;
120120
transition: all 250ms;
121121

122-
&::-webkit-input-placeholder{
122+
&::-webkit-input-placeholder {
123123
color: lighten(getColor(fiord), 15%);
124124
text-shadow: none;
125125
-webkit-text-fill-color: initial;
@@ -213,8 +213,12 @@
213213
}
214214

215215
@media (max-width: 720px) {
216-
.navigation__mobile { display: block; }
217-
.navigation__items { display: none; }
216+
.navigation__mobile {
217+
display: block;
218+
}
219+
.navigation__items {
220+
display: none;
221+
}
218222
.navigation--search .navigation__logo {
219223
pointer-events: none;
220224
overflow: hidden;

src/components/Navigation/Search.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
content: none;
1414
}
1515

16-
[class^=ds-dataset-] {
16+
[class^='ds-dataset-'] {
1717
border-radius: 0;
1818
border-color: getColor(malibu);
1919
border-width: 2px 0;
@@ -75,7 +75,7 @@
7575
padding: 8px 16px 8px 12px;
7676
}
7777

78-
.ds-suggestion:nth-child(n+2) {
78+
.ds-suggestion:nth-child(n + 2) {
7979
.algolia-docsearch-suggestion--category-header {
8080
border-top: 1px solid #dedede;
8181
}

src/components/Organization/Organization.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
margin-bottom: 1em;
2727
padding: 1em;
2828
border-radius: 2px;
29-
box-shadow: 0 0 1px getColor(dove-grey);
29+
box-shadow: 0 0 1px getColor(dove-grey);
3030
overflow: hidden;
3131
background: getColor(concrete);
3232
transition: all 250ms;

src/components/Placeholder/Placeholder.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@import 'functions';
22

33
.placeholder {
4-
5-
h2, p {
4+
h2,
5+
p {
66
background-color: getColor(concrete);
77
// use system font to prevent layout change
88
font-family: sans-serif;

src/components/SidebarItem/SidebarItem.scss

+7-3
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,12 @@
5757
padding-left: 1em;
5858
@include control-overflow;
5959

60-
&:first-child { margin-top: 0; }
61-
&:last-child { margin-bottom: 0; }
60+
&:first-child {
61+
margin-top: 0;
62+
}
63+
&:last-child {
64+
margin-bottom: 0;
65+
}
6266
&:before {
6367
content: '';
6468
position: absolute;
@@ -90,7 +94,7 @@
9094

9195
&--disabled {
9296
.sidebar-item__toggle {
93-
color: #AAA;
97+
color: #aaa;
9498
}
9599
}
96100
}

src/components/SidebarMobile/SidebarMobile.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
}
2828

29-
&.no-delay{
29+
&.no-delay {
3030
transition-duration: 0ms;
3131
}
3232
}
@@ -79,7 +79,7 @@
7979
border-left: 2px solid getColor(malibu);
8080

8181
.sidebar-mobile__section-header {
82-
color: lighten(getColor(fiord), 15%)
82+
color: lighten(getColor(fiord), 15%);
8383
}
8484
}
8585
}
@@ -101,13 +101,13 @@
101101
padding: 0.5em 17px;
102102
text-transform: capitalize;
103103
color: getColor(dove-grey);
104-
-webkit-tap-highlight-color: rgba(0,0,0,0);
104+
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
105105

106106
&:active,
107107
&--active {
108108
color: getColor(mine-shaft);
109109
font-weight: 600;
110-
background: #F1F4F4;
110+
background: #f1f4f4;
111111
}
112112

113113
&:hover {

src/components/Splash/Splash.scss

+7-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
h2 {
1010
justify-content: center;
1111
}
12-
12+
1313
&__section {
14-
position:relative;
15-
text-align:center;
14+
position: relative;
15+
text-align: center;
1616

1717
&--dark {
1818
background-color: #f3f3f3;
@@ -64,6 +64,10 @@
6464
width: 100%;
6565
float: left;
6666

67+
p {
68+
text-align: left;
69+
}
70+
6771
@include break {
6872
width: 50%;
6973
padding: 0 15px;

src/components/Support/Support.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
&__rank {
1515
text-transform: capitalize;
1616

17-
&:after { content: ' '; }
17+
&:after {
18+
content: ' ';
19+
}
1820
}
1921

2022
&__item {

src/content/api/module-methods.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if ( module.hot ) {
7474

7575
W> This feature relies on [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) internally. If you use `import()` with older browsers, remember to shim `Promise` using a polyfill such as [es6-promise](https://github.com/stefanpenner/es6-promise) or [promise-polyfill](https://github.com/taylorhakes/promise-polyfill).
7676

77-
## Magic Comments
77+
#### Magic Comments
7878

7979
Inline comments to make features work. By adding comments to the import we can do things such as name our chunk or select different modes. For a full list of these magic comments see the code below followed by an explanation of what these comments do.
8080

src/content/contribute/writing-a-loader.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@ export default (fixture, options = {}) => {
309309

310310
return new Promise((resolve, reject) => {
311311
compiler.run((err, stats) => {
312-
if (err || stats.hasErrors()) reject(err);
312+
if (err) reject(err);
313+
if (stats.hasErrors()) reject(new Error(stats.toJson().errors));
313314

314315
resolve(stats);
315316
});

0 commit comments

Comments
 (0)