Skip to content

Commit 0199e28

Browse files
committed
Merge branch 'main' of github.com:iterative/gatsby-theme-iterative into subtler-tab-styling
2 parents 4a298ed + b5185ef commit 0199e28

File tree

6 files changed

+38
-7
lines changed

6 files changed

+38
-7
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Check Deployment
2+
on:
3+
workflow_call:
4+
inputs:
5+
passci:
6+
description: 'Pass CI'
7+
required: true
8+
type: boolean
9+
workflow_dispatch:
10+
inputs:
11+
passci:
12+
description: 'Pass CI'
13+
required: true
14+
type: boolean
15+
pull_request:
16+
types: [opened, synchronize, reopened, labeled]
17+
18+
jobs:
19+
check-branches:
20+
if:
21+
startsWith(github.head_ref, 'renovate/') || contains(github.head_ref,
22+
'no-deploy')
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Fail if no passci inputs or pass-ci label
26+
if:
27+
${{ !inputs.passci &&
28+
!contains(github.event.pull_request.labels.*.name, 'pass-ci') }}
29+
run: exit 1

packages/gatsby-theme-iterative/gatsby-config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ module.exports = ({
159159
author: 'Iterative',
160160
titleTemplate: '',
161161
twitterUsername: '',
162+
imageAlt: '',
162163
plausibleSrc,
163164
plausibleAPI,
164165
plausibleDomain

packages/gatsby-theme-iterative/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dvcorg/gatsby-theme-iterative",
3-
"version": "0.2.5",
3+
"version": "0.2.6",
44
"description": "",
55
"main": "index.js",
66
"types": "src/typings.d.ts",

packages/gatsby-theme-iterative/src/components/Documentation/RightPanel/styles.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414

1515
.contentBlock {
16-
@apply basis-36 grow min-h-[6rem];
16+
@apply basis-auto min-h-[6rem];
1717

1818
overflow-y: scroll;
1919
margin-bottom: 17px;

packages/gatsby-theme-iterative/src/components/SEO/index.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ const SEO: React.FC<ISEOProps> = ({
5757
return buildMetadata({
5858
siteUrl: siteMeta.siteUrl,
5959
siteName: siteMeta.title,
60-
title: pageTitle,
60+
title: pageTitle || siteMeta.title,
6161
defaultMetaTitle,
62-
description,
63-
keywords,
62+
description: description || siteMeta.description,
63+
keywords: keywords || siteMeta.keywords,
6464
image,
65-
imageAlt,
65+
imageAlt: imageAlt || siteMeta.imageAlt,
6666
imageHeight,
6767
imageWidth,
6868
pathname,
@@ -93,7 +93,6 @@ const SEO: React.FC<ISEOProps> = ({
9393
? ''
9494
: siteMeta.titleTemplate || `%s | ${siteMeta.title}`
9595
}
96-
{...(skipTitleTemplate && { titleTemplate: '' })}
9796
meta={[...prebuildMeta, ...meta]}
9897
link={[
9998
...(canonicalUrl

packages/gatsby-theme-iterative/src/queries/siteMeta.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ interface ISiteMeta {
66
keywords: string
77
siteUrl: string
88
titleTemplate: string
9+
imageAlt?: string
910
plausibleDomain: string | null
1011
plausibleSrc: string | null
1112
plausibleAPI: string | null
@@ -25,6 +26,7 @@ export default function siteMeta(): ISiteMeta {
2526
keywords
2627
siteUrl
2728
titleTemplate
29+
imageAlt
2830
plausibleDomain
2931
plausibleSrc
3032
plausibleAPI

0 commit comments

Comments
 (0)