Skip to content

Commit f395179

Browse files
gordonwoodhullgordonwoodhull
committed
remove brand.typography.base.color
for posit-dev/brand-yml#27
1 parent 8f2b063 commit f395179

File tree

14 files changed

+47
-62
lines changed

14 files changed

+47
-62
lines changed

‎src/resources/editor/tools/vs-code.mjs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11911,6 +11911,7 @@ var require_yaml_intelligence_resources = __commonJS({
1191111911
closed: true,
1191211912
properties: {
1191311913
images: {
11914+
description: "A dictionary of named logo resources.",
1191411915
schema: {
1191511916
object: {
1191611917
additionalProperties: {
@@ -12095,31 +12096,31 @@ var require_yaml_intelligence_resources = __commonJS({
1209512096
ref: "brand-typography-options-base"
1209612097
},
1209712098
headings: {
12098-
description: "Settings for headings\n",
12099+
description: "Settings for headings, or a string specifying the font family only.",
1209912100
ref: "brand-typography-options-headings"
1210012101
},
1210112102
monospace: {
12102-
description: "Settings for monospace text\n",
12103+
description: "Settings for monospace text, or a string specifying the font family only.",
1210312104
ref: "brand-typography-options-monospace"
1210412105
},
1210512106
"monospace-inline": {
12106-
description: "Settings for inline code",
12107+
description: "Settings for inline code, or a string specifying the font family only.",
1210712108
ref: "brand-typography-options-monospace-inline"
1210812109
},
1210912110
"monospace-block": {
12110-
description: "Settings for code blocks",
12111+
description: "Settings for code blocks, or a string specifying the font family only.",
1211112112
ref: "brand-typography-options-monospace-block"
1211212113
},
1211312114
link: {
12114-
description: "Settings for links",
12115+
description: "Settings for links.",
1211512116
ref: "brand-typography-options-link"
1211612117
}
1211712118
}
1211812119
}
1211912120
},
1212012121
{
1212112122
id: "brand-typography-options-base",
12122-
description: "Typographic options.",
12123+
description: "Base typographic options.",
1212312124
anyOf: [
1212412125
"string",
1212512126
{
@@ -12131,9 +12132,6 @@ var require_yaml_intelligence_resources = __commonJS({
1213112132
weight: {
1213212133
ref: "brand-font-weight"
1213312134
},
12134-
color: {
12135-
ref: "brand-maybe-named-color"
12136-
},
1213712135
"line-height": {
1213812136
ref: "line-height-number-string"
1213912137
}
@@ -12144,7 +12142,7 @@ var require_yaml_intelligence_resources = __commonJS({
1214412142
},
1214512143
{
1214612144
id: "brand-typography-options-headings",
12147-
description: "Typographic options without a font size.",
12145+
description: "Typographic options for headings.",
1214812146
anyOf: [
1214912147
"string",
1215012148
{
@@ -22809,6 +22807,7 @@ var require_yaml_intelligence_resources = __commonJS({
2280922807
},
2281022808
"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.",
2281122809
"Use the specified file as a style reference in producing a docx,\npptx, or odt file.",
22810+
"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.",
2281222811
"Theme name, theme scss file, or a mix of both.",
2281322812
"The light theme name, theme scss file, or a mix of both.",
2281422813
"The light theme name, theme scss file, or a mix of both.",
@@ -24131,12 +24130,12 @@ var require_yaml_intelligence_resources = __commonJS({
2413124130
mermaid: "%%"
2413224131
},
2413324132
"handlers/mermaid/schema.yml": {
24134-
_internalId: 193258,
24133+
_internalId: 193399,
2413524134
type: "object",
2413624135
description: "be an object",
2413724136
properties: {
2413824137
"mermaid-format": {
24139-
_internalId: 193250,
24138+
_internalId: 193391,
2414024139
type: "enum",
2414124140
enum: [
2414224141
"png",
@@ -24152,7 +24151,7 @@ var require_yaml_intelligence_resources = __commonJS({
2415224151
exhaustiveCompletions: true
2415324152
},
2415424153
theme: {
24155-
_internalId: 193257,
24154+
_internalId: 193398,
2415624155
type: "anyOf",
2415724156
anyOf: [
2415824157
{

‎src/resources/editor/tools/yaml/web-worker.js‎

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/resources/editor/tools/yaml/yaml-intelligence-resources.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4883,6 +4883,7 @@
48834883
"closed": true,
48844884
"properties": {
48854885
"images": {
4886+
"description": "A dictionary of named logo resources.",
48864887
"schema": {
48874888
"object": {
48884889
"additionalProperties": {
@@ -5067,31 +5068,31 @@
50675068
"ref": "brand-typography-options-base"
50685069
},
50695070
"headings": {
5070-
"description": "Settings for headings\n",
5071+
"description": "Settings for headings, or a string specifying the font family only.",
50715072
"ref": "brand-typography-options-headings"
50725073
},
50735074
"monospace": {
5074-
"description": "Settings for monospace text\n",
5075+
"description": "Settings for monospace text, or a string specifying the font family only.",
50755076
"ref": "brand-typography-options-monospace"
50765077
},
50775078
"monospace-inline": {
5078-
"description": "Settings for inline code",
5079+
"description": "Settings for inline code, or a string specifying the font family only.",
50795080
"ref": "brand-typography-options-monospace-inline"
50805081
},
50815082
"monospace-block": {
5082-
"description": "Settings for code blocks",
5083+
"description": "Settings for code blocks, or a string specifying the font family only.",
50835084
"ref": "brand-typography-options-monospace-block"
50845085
},
50855086
"link": {
5086-
"description": "Settings for links",
5087+
"description": "Settings for links.",
50875088
"ref": "brand-typography-options-link"
50885089
}
50895090
}
50905091
}
50915092
},
50925093
{
50935094
"id": "brand-typography-options-base",
5094-
"description": "Typographic options.",
5095+
"description": "Base typographic options.",
50955096
"anyOf": [
50965097
"string",
50975098
{
@@ -5103,9 +5104,6 @@
51035104
"weight": {
51045105
"ref": "brand-font-weight"
51055106
},
5106-
"color": {
5107-
"ref": "brand-maybe-named-color"
5108-
},
51095107
"line-height": {
51105108
"ref": "line-height-number-string"
51115109
}
@@ -5116,7 +5114,7 @@
51165114
},
51175115
{
51185116
"id": "brand-typography-options-headings",
5119-
"description": "Typographic options without a font size.",
5117+
"description": "Typographic options for headings.",
51205118
"anyOf": [
51215119
"string",
51225120
{
@@ -15781,6 +15779,7 @@
1578115779
},
1578215780
"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.",
1578315781
"Use the specified file as a style reference in producing a docx,\npptx, or odt file.",
15782+
"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.",
1578415783
"Theme name, theme scss file, or a mix of both.",
1578515784
"The light theme name, theme scss file, or a mix of both.",
1578615785
"The light theme name, theme scss file, or a mix of both.",
@@ -17103,12 +17102,12 @@
1710317102
"mermaid": "%%"
1710417103
},
1710517104
"handlers/mermaid/schema.yml": {
17106-
"_internalId": 193258,
17105+
"_internalId": 193399,
1710717106
"type": "object",
1710817107
"description": "be an object",
1710917108
"properties": {
1711017109
"mermaid-format": {
17111-
"_internalId": 193250,
17110+
"_internalId": 193391,
1711217111
"type": "enum",
1711317112
"enum": [
1711417113
"png",
@@ -17124,7 +17123,7 @@
1712417123
"exhaustiveCompletions": true
1712517124
},
1712617125
"theme": {
17127-
"_internalId": 193257,
17126+
"_internalId": 193398,
1712817127
"type": "anyOf",
1712917128
"anyOf": [
1713017129
{

‎src/resources/filters/quarto-post/typst-brand-yaml.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ function render_typst_brand_yaml()
9696
'#set text(',
9797
-- '#show par: set text(', overrules #show heading!
9898
conditional_entry('weight', base.weight),
99-
conditional_entry('fill', base.color, false),
10099
')'
101100
}))
102101
end

‎src/resources/schema/definitions.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2711,8 +2711,6 @@
27112711
size: string
27122712
weight:
27132713
ref: brand-font-weight
2714-
color:
2715-
ref: brand-maybe-named-color
27162714
line-height:
27172715
ref: line-height-number-string
27182716

‎src/resources/schema/json-schemas.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3415,9 +3415,6 @@
34153415
"weight": {
34163416
"$ref": "#/$defs/BrandFontWeight"
34173417
},
3418-
"color": {
3419-
"$ref": "#/$defs/BrandMaybeNamedColor"
3420-
},
34213418
"line-height": {
34223419
"$ref": "#/$defs/LineHeightNumberString"
34233420
}

‎src/resources/types/schema-types.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,19 +1349,18 @@ export type BrandTypography = {
13491349

13501350
export type BrandTypographyOptionsBase = string | {
13511351
"line-height"?: LineHeightNumberString;
1352-
color?: BrandMaybeNamedColor;
13531352
family?: string;
13541353
size?: string;
13551354
weight?: BrandFontWeight;
1356-
}; /* Typographic options. */
1355+
}; /* Base typographic options. */
13571356

13581357
export type BrandTypographyOptionsHeadings = string | {
13591358
"line-height"?: LineHeightNumberString;
13601359
color?: BrandMaybeNamedColor;
13611360
family?: string;
13621361
style?: BrandFontStyle;
13631362
weight?: BrandFontWeight;
1364-
}; /* Typographic options without a font size. */
1363+
}; /* Typographic options for headings. */
13651364

13661365
export type BrandTypographyOptionsMonospace = string | {
13671366
"background-color"?: BrandMaybeNamedColor;

‎tests/docs/brand-yaml/kitchen-sink/_brand.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ color:
44
black: "#002040"
55

66
primary: red
7-
foreground: black
7+
foreground: "#21f"
88
background: "#e6f8ff"
99

1010
typography:
@@ -26,7 +26,6 @@ typography:
2626
# sass fails to typecheck
2727
size: 12pt
2828
weight: 400
29-
color: "#21f"
3029
line-height: 0.9
3130
headings:
3231
family: PT Sans

‎tests/docs/brand-yaml/monospace-colors/_brand.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
color:
2-
## ERROR: Expecting punctuation: "}" if no palette
3-
palette:
4-
orangeblue: "#ccc"
52
background: "#e6f8ff"
63
typography:
74
monospace:
85
color: "#eee"
9-
background-color: "#0a3c07"
6+
background-color: "#339d2c"

‎tests/docs/brand-yaml/monospace-colors/brand-typography.qmd‎

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

1414
We're using only `brand.typography.monospace.color` and `.background-color`.
1515

16-
Raw inlines `3 * fib(5)` and raw blocks will inherit the same colors, off-white and dark green.
16+
Raw inlines `3 * fib(5)` and raw blocks will inherit the same colors, off-white and green.
1717

1818
:::{.sourceCode}
1919
```

0 commit comments

Comments
 (0)