Skip to content

Commit 4840332

Browse files
mrozillamrozilla
committed
Merge branch 'develop'
2 parents a724ef4 + dafbd6f commit 4840332

File tree

5 files changed

+128
-53
lines changed

5 files changed

+128
-53
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"dependencies": {
2121
"@mdx-js/react": "^1.5.1",
2222
"@mrozilla/gatsby-theme-netlify_cms": "0.0.3",
23-
"gatsby": "2.17.7",
24-
"gatsby-plugin-google-analytics": "2.1.23",
23+
"gatsby": "2.17.9",
24+
"gatsby-plugin-google-analytics": "2.1.24",
2525
"gatsby-plugin-manifest": "2.2.26",
2626
"gatsby-plugin-netlify": "2.1.23",
2727
"gatsby-plugin-react-helmet": "3.1.13",

‎src/cms/pages/demo.mdx‎

Lines changed: 53 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,20 @@ blocks:
1313
title: Demo
1414
url: /demo/
1515
type: announcement
16+
- icon: FaEye
17+
type: icon
18+
- tagline: Demo
19+
type: tagline
1620
- title: Demo
1721
type: title
1822
- subtitle: Demo
1923
type: subtitle
2024
- mdx: Lorem ipsum dolor sit amet
2125
type: mdx
26+
- image:
27+
src: ../../../static/assets/illustration.png
28+
ratio: 1/1
29+
alt: Demo
2230
- buttons:
2331
- look: primary
2432
title: Demo
@@ -64,20 +72,24 @@ blocks:
6472
width: 1fr
6573
textAlign: center
6674
header:
75+
- body: Lorem ipsum dolor sit amet
76+
title: Demo
77+
url: /demo/
78+
type: announcement
6779
- icon: FaEye
6880
type: icon
69-
- image:
70-
src: ../../../static/assets/illustration.png
71-
ratio: 1/1
72-
alt: Demo
7381
- tagline: Demo
7482
type: tagline
7583
- title: Demo
7684
type: title
7785
- subtitle: Demo
7886
type: subtitle
79-
- mdx: Demo
87+
- mdx: Lorem ipsum dolor sit amet
8088
type: mdx
89+
- image:
90+
src: ../../../static/assets/illustration.png
91+
ratio: 1/1
92+
alt: Demo
8193
- buttons:
8294
- look: primary
8395
title: Demo
@@ -87,20 +99,24 @@ blocks:
8799
- mdx: Demo
88100
subtitle: Demo
89101
- header:
102+
- body: Lorem ipsum dolor sit amet
103+
title: Demo
104+
url: /demo/
105+
type: announcement
90106
- icon: FaEye
91107
type: icon
92-
- image:
93-
src: ../../../static/assets/illustration.png
94-
ratio: 1/1
95-
alt: Demo
96108
- tagline: Demo
97109
type: tagline
98110
- title: Demo
99111
type: title
100112
- subtitle: Demo
101113
type: subtitle
102-
- mdx: Demo
114+
- mdx: Lorem ipsum dolor sit amet
103115
type: mdx
116+
- image:
117+
src: ../../../static/assets/illustration.png
118+
ratio: 1/1
119+
alt: Demo
104120
- buttons:
105121
- look: primary
106122
title: Demo
@@ -117,20 +133,24 @@ blocks:
117133
testimonial: Demo
118134
type: testimonials
119135
- header:
136+
- body: Lorem ipsum dolor sit amet
137+
title: Demo
138+
url: /demo/
139+
type: announcement
120140
- icon: FaEye
121141
type: icon
122-
- image:
123-
src: ../../../static/assets/illustration.png
124-
ratio: 1/1
125-
alt: Demo
126142
- tagline: Demo
127143
type: tagline
128144
- title: Demo
129145
type: title
130146
- subtitle: Demo
131147
type: subtitle
132-
- mdx: Demo
148+
- mdx: Lorem ipsum dolor sit amet
133149
type: mdx
150+
- image:
151+
src: ../../../static/assets/illustration.png
152+
ratio: 1/1
153+
alt: Demo
134154
- buttons:
135155
- look: primary
136156
title: Demo
@@ -145,20 +165,24 @@ blocks:
145165
url: Demo
146166
type: logos
147167
- header:
168+
- body: Lorem ipsum dolor sit amet
169+
title: Demo
170+
url: /demo/
171+
type: announcement
148172
- icon: FaEye
149173
type: icon
150-
- image:
151-
src: ../../../static/assets/illustration.png
152-
ratio: 1/1
153-
alt: Demo
154174
- tagline: Demo
155175
type: tagline
156176
- title: Demo
157177
type: title
158178
- subtitle: Demo
159179
type: subtitle
160-
- mdx: Demo
180+
- mdx: Lorem ipsum dolor sit amet
161181
type: mdx
182+
- image:
183+
src: ../../../static/assets/illustration.png
184+
ratio: 1/1
185+
alt: Demo
162186
- buttons:
163187
- look: primary
164188
title: Demo
@@ -173,20 +197,24 @@ blocks:
173197
title: Demo
174198
type: pricing
175199
- header:
200+
- body: Lorem ipsum dolor sit amet
201+
title: Demo
202+
url: /demo/
203+
type: announcement
176204
- icon: FaEye
177205
type: icon
178-
- image:
179-
src: ../../../static/assets/illustration.png
180-
ratio: 1/1
181-
alt: Demo
182206
- tagline: Demo
183207
type: tagline
184208
- title: Demo
185209
type: title
186210
- subtitle: Demo
187211
type: subtitle
188-
- mdx: Demo
212+
- mdx: Lorem ipsum dolor sit amet
189213
type: mdx
214+
- image:
215+
src: ../../../static/assets/illustration.png
216+
ratio: 1/1
217+
alt: Demo
190218
- buttons:
191219
- look: primary
192220
title: Demo

‎src/components/composites/web/BlockHeader.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@ import { Text } from '~components/primitives/Text';
2323

2424
export const query = graphql`
2525
fragment BlockHeaderFragment on MdxFrontmatterBlocksHeader {
26-
icon
27-
tagline
26+
icon
27+
tagline
28+
title
29+
subtitle
30+
mdx
31+
buttons {
2832
title
29-
subtitle
30-
mdx
31-
buttons {
32-
title
33-
url
34-
look
35-
}
36-
image {
37-
src {
38-
childImageSharp {
39-
fluid(maxWidth: 900) {
40-
...GatsbyImageSharpFluid_withWebp
41-
}
33+
url
34+
look
35+
}
36+
image {
37+
src {
38+
childImageSharp {
39+
fluid(maxWidth: 900) {
40+
...GatsbyImageSharpFluid_withWebp
4241
}
4342
}
44-
ratio
45-
alt
4643
}
44+
ratio
45+
alt
46+
}
4747
}
4848
`;
4949

‎src/gatsby-theme-netlify_cms/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// import
33
// ─────────────────────────────────────────────────────────────────────────────
44

5-
import config from 'gatsby-theme-netlify_cms/src/config';
5+
import config from '@mrozilla/gatsby-theme-netlify_cms/src/config';
66

77
// ─────────────────────────────────────────────────────────────────────────────
88
// adjustments

‎yarn.lock‎

Lines changed: 55 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,6 +2378,15 @@ array-unique@^0.3.2:
23782378
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
23792379
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
23802380

2381+
array.prototype.flatmap@^1.2.2:
2382+
version "1.2.2"
2383+
resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.2.tgz#28d621d351c19a62b84331b01669395ef6cef4c4"
2384+
integrity sha512-ZZtPLE74KNE+0XcPv/vQmcivxN+8FhwOLvt2udHauO0aDEpsXDQrmd5HuJGpgPVyaV8HvkDPWnJ2iaem0oCKtA==
2385+
dependencies:
2386+
define-properties "^1.1.3"
2387+
es-abstract "^1.15.0"
2388+
function-bind "^1.1.1"
2389+
23812390
arraybuffer.slice@~0.0.7:
23822391
version "0.0.7"
23832392
resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
@@ -5204,6 +5213,22 @@ es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.0, es-abstract@^1.5.1
52045213
is-regex "^1.0.4"
52055214
object-keys "^1.0.12"
52065215

5216+
es-abstract@^1.15.0:
5217+
version "1.16.0"
5218+
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d"
5219+
integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==
5220+
dependencies:
5221+
es-to-primitive "^1.2.0"
5222+
function-bind "^1.1.1"
5223+
has "^1.0.3"
5224+
has-symbols "^1.0.0"
5225+
is-callable "^1.1.4"
5226+
is-regex "^1.0.4"
5227+
object-inspect "^1.6.0"
5228+
object-keys "^1.1.1"
5229+
string.prototype.trimleft "^2.1.0"
5230+
string.prototype.trimright "^2.1.0"
5231+
52075232
es-to-primitive@^1.2.0:
52085233
version "1.2.0"
52095234
resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
@@ -6324,10 +6349,10 @@ gatsby-page-utils@^0.0.28:
63246349
micromatch "^3.1.10"
63256350
slash "^3.0.0"
63266351

6327-
gatsby-plugin-google-analytics@2.1.23:
6328-
version "2.1.23"
6329-
resolved "https://registry.yarnpkg.com/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-2.1.23.tgz#7bad5dc36787a5b2317f3c8043ff2febe7c0932e"
6330-
integrity sha512-pVGGYRnx6zIDvKPmhWaK7U2coec1F1ZIGe8326hV5E/2EtgVaVsRXAiCnGrLfHs/lEVs03t6DaemomtktM57gg==
6352+
gatsby-plugin-google-analytics@2.1.24:
6353+
version "2.1.24"
6354+
resolved "https://registry.yarnpkg.com/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-2.1.24.tgz#ab1aa59503d236d61873a1b14205976d89ddabb3"
6355+
integrity sha512-2kvz7KJr/Kp3ViC6BWpPT8lZAgT/5F6sfZ9UkoOKoGv3YBwEWbZxxBX1WAiLcpjFGbmaWrX8QhD7HXdaTMHCOg==
63316356
dependencies:
63326357
"@babel/runtime" "^7.6.3"
63336358

@@ -6559,10 +6584,10 @@ gatsby-transformer-sharp@^2.3.2:
65596584
semver "^5.7.1"
65606585
sharp "^0.23.2"
65616586

6562-
gatsby@2.17.7:
6563-
version "2.17.7"
6564-
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-2.17.7.tgz#8aa71868044a42e27dc0314f5c99bac8777e0ff5"
6565-
integrity sha512-gAqV+ZIdF2Tj55Rpt1Vmm0tTUsvdN+TgcA2R1MdsoAZ9VdALKpCNFJWe1EDB761qmjp8PGpHg9X2RMmxwrsq7Q==
6587+
gatsby@2.17.9:
6588+
version "2.17.9"
6589+
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-2.17.9.tgz#e6db8aef4562949bfc2058ec6074778b100ed90d"
6590+
integrity sha512-b0+lsOeoJjgIPjjnyplFt4qAuwVpbRJclbpAeXTrQnwtQ/EZXg10vRz216mosGQwt7PrO7tYcHAJw6JcP/x+Qw==
65666591
dependencies:
65676592
"@babel/code-frame" "^7.5.5"
65686593
"@babel/core" "^7.6.4"
@@ -6578,6 +6603,7 @@ gatsby@2.17.7:
65786603
"@typescript-eslint/eslint-plugin" "^2.6.0"
65796604
"@typescript-eslint/parser" "^2.6.0"
65806605
address "1.1.2"
6606+
array.prototype.flatmap "^1.2.2"
65816607
autoprefixer "^9.7.0"
65826608
axios "^0.19.0"
65836609
babel-core "7.0.0-bridge.0"
@@ -10441,6 +10467,11 @@ object-hash@^1.1.4:
1044110467
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
1044210468
integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
1044310469

10470+
object-inspect@^1.6.0:
10471+
version "1.6.0"
10472+
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
10473+
integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
10474+
1044410475
object-is@^1.0.1:
1044510476
version "1.0.1"
1044610477
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
@@ -14073,6 +14104,22 @@ string.prototype.trim@^1.1.2:
1407314104
es-abstract "^1.5.0"
1407414105
function-bind "^1.0.2"
1407514106

14107+
string.prototype.trimleft@^2.1.0:
14108+
version "2.1.0"
14109+
resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
14110+
integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
14111+
dependencies:
14112+
define-properties "^1.1.3"
14113+
function-bind "^1.1.1"
14114+
14115+
string.prototype.trimright@^2.1.0:
14116+
version "2.1.0"
14117+
resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
14118+
integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
14119+
dependencies:
14120+
define-properties "^1.1.3"
14121+
function-bind "^1.1.1"
14122+
1407614123
string_decoder@^1.0.0, string_decoder@^1.1.1:
1407714124
version "1.2.0"
1407814125
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"

0 commit comments

Comments
 (0)