Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/remove brand typography base color #11253

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Bugfix/remove brand typography base color #11253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
030b46d
copy edits for brand reference docs
gordonwoodhull Oct 30, 2024
2c91b3c
remove brand.typography.base.color
gordonwoodhull Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions src/resources/editor/tools/vs-code.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11911,6 +11911,7 @@ var require_yaml_intelligence_resources = __commonJS({
closed: true,
properties: {
images: {
description: "A dictionary of named logo resources.",
schema: {
object: {
additionalProperties: {
Expand Down Expand Up @@ -12095,31 +12096,31 @@ var require_yaml_intelligence_resources = __commonJS({
ref: "brand-typography-options-base"
},
headings: {
description: "Settings for headings\n",
description: "Settings for headings, or a string specifying the font family only.",
ref: "brand-typography-options-headings"
},
monospace: {
description: "Settings for monospace text\n",
description: "Settings for monospace text, or a string specifying the font family only.",
ref: "brand-typography-options-monospace"
},
"monospace-inline": {
description: "Settings for inline code",
description: "Settings for inline code, or a string specifying the font family only.",
ref: "brand-typography-options-monospace-inline"
},
"monospace-block": {
description: "Settings for code blocks",
description: "Settings for code blocks, or a string specifying the font family only.",
ref: "brand-typography-options-monospace-block"
},
link: {
description: "Settings for links",
description: "Settings for links.",
ref: "brand-typography-options-link"
}
}
}
},
{
id: "brand-typography-options-base",
description: "Typographic options.",
description: "Base typographic options.",
anyOf: [
"string",
{
Expand All @@ -12131,9 +12132,6 @@ var require_yaml_intelligence_resources = __commonJS({
weight: {
ref: "brand-font-weight"
},
color: {
ref: "brand-maybe-named-color"
},
"line-height": {
ref: "line-height-number-string"
}
Expand All @@ -12144,7 +12142,7 @@ var require_yaml_intelligence_resources = __commonJS({
},
{
id: "brand-typography-options-headings",
description: "Typographic options without a font size.",
description: "Typographic options for headings.",
anyOf: [
"string",
{
Expand Down Expand Up @@ -22809,6 +22807,7 @@ var require_yaml_intelligence_resources = __commonJS({
},
"If <code>true</code>, force the presence of the OJS runtime. If\n<code>false</code>, force the absence instead. If unset, the OJS runtime\nis included only if OJS cells are present in the document.",
"Use the specified file as a style reference in producing a docx,\npptx, or odt file.",
"Branding information to use for this document. If a string, the path\nto a brand file. If false, don\u2019t use branding on this document. If an\nobject, an inline brand definition.",
"Theme name, theme scss file, or a mix of both.",
"The light theme name, theme scss file, or a mix of both.",
"The light theme name, theme scss file, or a mix of both.",
Expand Down Expand Up @@ -24131,12 +24130,12 @@ var require_yaml_intelligence_resources = __commonJS({
mermaid: "%%"
},
"handlers/mermaid/schema.yml": {
_internalId: 193258,
_internalId: 193399,
type: "object",
description: "be an object",
properties: {
"mermaid-format": {
_internalId: 193250,
_internalId: 193391,
type: "enum",
enum: [
"png",
Expand All @@ -24152,7 +24151,7 @@ var require_yaml_intelligence_resources = __commonJS({
exhaustiveCompletions: true
},
theme: {
_internalId: 193257,
_internalId: 193398,
type: "anyOf",
anyOf: [
{
Expand Down
25 changes: 12 additions & 13 deletions src/resources/editor/tools/yaml/web-worker.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 12 additions & 13 deletions src/resources/editor/tools/yaml/yaml-intelligence-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4883,6 +4883,7 @@
"closed": true,
"properties": {
"images": {
"description": "A dictionary of named logo resources.",
"schema": {
"object": {
"additionalProperties": {
Expand Down Expand Up @@ -5067,31 +5068,31 @@
"ref": "brand-typography-options-base"
},
"headings": {
"description": "Settings for headings\n",
"description": "Settings for headings, or a string specifying the font family only.",
"ref": "brand-typography-options-headings"
},
"monospace": {
"description": "Settings for monospace text\n",
"description": "Settings for monospace text, or a string specifying the font family only.",
"ref": "brand-typography-options-monospace"
},
"monospace-inline": {
"description": "Settings for inline code",
"description": "Settings for inline code, or a string specifying the font family only.",
"ref": "brand-typography-options-monospace-inline"
},
"monospace-block": {
"description": "Settings for code blocks",
"description": "Settings for code blocks, or a string specifying the font family only.",
"ref": "brand-typography-options-monospace-block"
},
"link": {
"description": "Settings for links",
"description": "Settings for links.",
"ref": "brand-typography-options-link"
}
}
}
},
{
"id": "brand-typography-options-base",
"description": "Typographic options.",
"description": "Base typographic options.",
"anyOf": [
"string",
{
Expand All @@ -5103,9 +5104,6 @@
"weight": {
"ref": "brand-font-weight"
},
"color": {
"ref": "brand-maybe-named-color"
},
"line-height": {
"ref": "line-height-number-string"
}
Expand All @@ -5116,7 +5114,7 @@
},
{
"id": "brand-typography-options-headings",
"description": "Typographic options without a font size.",
"description": "Typographic options for headings.",
"anyOf": [
"string",
{
Expand Down Expand Up @@ -15781,6 +15779,7 @@
},
"If <code>true</code>, force the presence of the OJS runtime. If\n<code>false</code>, force the absence instead. If unset, the OJS runtime\nis included only if OJS cells are present in the document.",
"Use the specified file as a style reference in producing a docx,\npptx, or odt file.",
"Branding information to use for this document. If a string, the path\nto a brand file. If false, don’t use branding on this document. If an\nobject, an inline brand definition.",
"Theme name, theme scss file, or a mix of both.",
"The light theme name, theme scss file, or a mix of both.",
"The light theme name, theme scss file, or a mix of both.",
Expand Down Expand Up @@ -17103,12 +17102,12 @@
"mermaid": "%%"
},
"handlers/mermaid/schema.yml": {
"_internalId": 193258,
"_internalId": 193399,
"type": "object",
"description": "be an object",
"properties": {
"mermaid-format": {
"_internalId": 193250,
"_internalId": 193391,
"type": "enum",
"enum": [
"png",
Expand All @@ -17124,7 +17123,7 @@
"exhaustiveCompletions": true
},
"theme": {
"_internalId": 193257,
"_internalId": 193398,
"type": "anyOf",
"anyOf": [
{
Expand Down
1 change: 0 additions & 1 deletion src/resources/filters/quarto-post/typst-brand-yaml.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ function render_typst_brand_yaml()
'#set text(',
-- '#show par: set text(', overrules #show heading!
conditional_entry('weight', base.weight),
conditional_entry('fill', base.color, false),
')'
}))
end
Expand Down
19 changes: 8 additions & 11 deletions src/resources/schema/definitions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2538,6 +2538,7 @@
closed: true
properties:
images:
description: A dictionary of named logo resources.
schema:
object:
additionalProperties:
Expand Down Expand Up @@ -2684,25 +2685,23 @@
all text.
ref: brand-typography-options-base
headings:
description: >
Settings for headings
description: Settings for headings, or a string specifying the font family only.
ref: brand-typography-options-headings
monospace:
description: >
Settings for monospace text
description: Settings for monospace text, or a string specifying the font family only.
ref: brand-typography-options-monospace
monospace-inline:
description: Settings for inline code
description: Settings for inline code, or a string specifying the font family only.
ref: brand-typography-options-monospace-inline
monospace-block:
description: Settings for code blocks
description: Settings for code blocks, or a string specifying the font family only.
ref: brand-typography-options-monospace-block
link:
description: Settings for links
description: Settings for links.
ref: brand-typography-options-link

- id: brand-typography-options-base
description: Typographic options.
description: Base typographic options.
anyOf:
- string
- object:
Expand All @@ -2712,13 +2711,11 @@
size: string
weight:
ref: brand-font-weight
color:
ref: brand-maybe-named-color
line-height:
ref: line-height-number-string

- id: brand-typography-options-headings
description: Typographic options without a font size.
description: Typographic options for headings.
anyOf:
- string
- object:
Expand Down
3 changes: 0 additions & 3 deletions src/resources/schema/json-schemas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3415,9 +3415,6 @@
"weight": {
"$ref": "#/$defs/BrandFontWeight"
},
"color": {
"$ref": "#/$defs/BrandMaybeNamedColor"
},
"line-height": {
"$ref": "#/$defs/LineHeightNumberString"
}
Expand Down
5 changes: 2 additions & 3 deletions src/resources/types/schema-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,19 +1349,18 @@ export type BrandTypography = {

export type BrandTypographyOptionsBase = string | {
"line-height"?: LineHeightNumberString;
color?: BrandMaybeNamedColor;
family?: string;
size?: string;
weight?: BrandFontWeight;
}; /* Typographic options. */
}; /* Base typographic options. */

export type BrandTypographyOptionsHeadings = string | {
"line-height"?: LineHeightNumberString;
color?: BrandMaybeNamedColor;
family?: string;
style?: BrandFontStyle;
weight?: BrandFontWeight;
}; /* Typographic options without a font size. */
}; /* Typographic options for headings. */

export type BrandTypographyOptionsMonospace = string | {
"background-color"?: BrandMaybeNamedColor;
Expand Down
Loading
Loading