Skip to content

Commit f3165ba

Browse files
orffenorffen
authored
Merge pull request #86 from orffen/r15
v13 compatibility and fix custom fonts
2 parents 0b0e1fa + c16d1a9 commit f3165ba

File tree

2 files changed

+104
-90
lines changed

2 files changed

+104
-90
lines changed

‎styles/basicfantasyrpg.css‎

Lines changed: 100 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,128 @@
11
/* Custom Fonts */
22
@font-face {
3-
font-family: 'Soutane';
4-
src: url('soutane-webfont.eot');
5-
src: url('soutane-webfont.eot?#iefix') format('embedded-opentype'),
6-
url('soutane-webfont.woff') format('woff'),
7-
url('soutane-webfont.ttf') format('truetype'),
8-
url('soutane-webfont.svg#soutaneregular') format('svg');
9-
font-weight: normal;
10-
font-style: normal;
3+
font-family: 'Soutane';
4+
src: url('soutane-webfont.eot');
5+
src: url('soutane-webfont.eot?#iefix') format('embedded-opentype'),
6+
url('soutane-webfont.woff') format('woff'),
7+
url('soutane-webfont.ttf') format('truetype'),
8+
url('soutane-webfont.svg#soutaneregular') format('svg');
9+
font-weight: normal;
10+
font-style: normal;
1111
}
1212

1313
@font-face {
14-
font-family: 'Soutane';
15-
src: url('soutanebold-webfont.eot');
16-
src: url('soutanebold-webfont.eot?#iefix') format('embedded-opentype'),
17-
url('soutanebold-webfont.woff') format('woff'),
18-
url('soutanebold-webfont.ttf') format('truetype'),
19-
url('soutanebold-webfont.svg#soutanebold') format('svg');
20-
font-weight: bold;
21-
font-style: normal;
14+
font-family: 'Soutane';
15+
src: url('soutanebold-webfont.eot');
16+
src: url('soutanebold-webfont.eot?#iefix') format('embedded-opentype'),
17+
url('soutanebold-webfont.woff') format('woff'),
18+
url('soutanebold-webfont.ttf') format('truetype'),
19+
url('soutanebold-webfont.svg#soutanebold') format('svg');
20+
font-weight: bold;
21+
font-style: normal;
2222
}
2323

2424
@font-face {
25-
font-family: 'Soutane';
26-
src: url('soutanebolditalic-webfont.eot');
27-
src: url('soutanebolditalic-webfont.eot?#iefix') format('embedded-opentype'),
28-
url('soutanebolditalic-webfont.woff') format('woff'),
29-
url('soutanebolditalic-webfont.ttf') format('truetype'),
30-
url('soutanebolditalic-webfont.svg#soutanebold_italic') format('svg');
31-
font-weight: bold;
32-
font-style: italic;
25+
font-family: 'Soutane';
26+
src: url('soutanebolditalic-webfont.eot');
27+
src: url('soutanebolditalic-webfont.eot?#iefix') format('embedded-opentype'),
28+
url('soutanebolditalic-webfont.woff') format('woff'),
29+
url('soutanebolditalic-webfont.ttf') format('truetype'),
30+
url('soutanebolditalic-webfont.svg#soutanebold_italic') format('svg');
31+
font-weight: bold;
32+
font-style: italic;
3333
}
3434

3535
@font-face {
36-
font-family: 'Soutane';
37-
src: url('soutaneitalic-webfont.eot');
38-
src: url('soutaneitalic-webfont.eot?#iefix') format('embedded-opentype'),
39-
url('soutaneitalic-webfont.woff') format('woff'),
40-
url('soutaneitalic-webfont.ttf') format('truetype'),
41-
url('soutaneitalic-webfont.svg#soutaneitalic') format('svg');
42-
font-weight: normal;
43-
font-style: italic;
36+
font-family: 'Soutane';
37+
src: url('soutaneitalic-webfont.eot');
38+
src: url('soutaneitalic-webfont.eot?#iefix') format('embedded-opentype'),
39+
url('soutaneitalic-webfont.woff') format('woff'),
40+
url('soutaneitalic-webfont.ttf') format('truetype'),
41+
url('soutaneitalic-webfont.svg#soutaneitalic') format('svg');
42+
font-weight: normal;
43+
font-style: italic;
4444
}
4545

4646
@font-face {
47-
font-family: 'SoutaneBlack';
48-
src: url('soutaneblack-webfont.eot');
49-
src: url('soutaneblack-webfont.eot?#iefix') format('embedded-opentype'),
50-
url('soutaneblack-webfont.woff') format('woff'),
51-
url('soutaneblack-webfont.ttf') format('truetype'),
52-
url('soutaneblack-webfont.svg#soutaneblackregular') format('svg');
53-
font-weight: normal;
54-
font-style: normal;
47+
font-family: 'SoutaneBlack';
48+
src: url('soutaneblack-webfont.eot');
49+
src: url('soutaneblack-webfont.eot?#iefix') format('embedded-opentype'),
50+
url('soutaneblack-webfont.woff') format('woff'),
51+
url('soutaneblack-webfont.ttf') format('truetype'),
52+
url('soutaneblack-webfont.svg#soutaneblackregular') format('svg');
53+
font-weight: normal;
54+
font-style: normal;
5555
}
5656

5757
@font-face {
58-
font-family: 'TeX Gyre Adventor';
59-
src: url('texgyreadventor-regular-webfont.eot');
60-
src: url('texgyreadventor-regular-webfont.eot?#iefix') format('embedded-opentype'),
61-
url('texgyreadventor-regular-webfont.woff') format('woff'),
62-
url('texgyreadventor-regular-webfont.ttf') format('truetype'),
63-
url('texgyreadventor-regular-webfont.svg#tex_gyre_adventorregular') format('svg');
64-
font-weight: normal;
65-
font-style: normal;
58+
font-family: 'TeX Gyre Adventor';
59+
src: url('texgyreadventor-regular-webfont.eot');
60+
src: url('texgyreadventor-regular-webfont.eot?#iefix') format('embedded-opentype'),
61+
url('texgyreadventor-regular-webfont.woff') format('woff'),
62+
url('texgyreadventor-regular-webfont.ttf') format('truetype'),
63+
url('texgyreadventor-regular-webfont.svg#tex_gyre_adventorregular') format('svg');
64+
font-weight: normal;
65+
font-style: normal;
6666
}
6767

6868
@font-face {
69-
font-family: 'TeX Gyre Adventor';
70-
src: url('texgyreadventor-italic-webfont.eot');
71-
src: url('texgyreadventor-italic-webfont.eot?#iefix') format('embedded-opentype'),
72-
url('texgyreadventor-italic-webfont.woff') format('woff'),
73-
url('texgyreadventor-italic-webfont.ttf') format('truetype'),
74-
url('texgyreadventor-italic-webfont.svg#tex_gyre_adventoritalic') format('svg');
75-
font-weight: normal;
76-
font-style: italic;
69+
font-family: 'TeX Gyre Adventor';
70+
src: url('texgyreadventor-italic-webfont.eot');
71+
src: url('texgyreadventor-italic-webfont.eot?#iefix') format('embedded-opentype'),
72+
url('texgyreadventor-italic-webfont.woff') format('woff'),
73+
url('texgyreadventor-italic-webfont.ttf') format('truetype'),
74+
url('texgyreadventor-italic-webfont.svg#tex_gyre_adventoritalic') format('svg');
75+
font-weight: normal;
76+
font-style: italic;
7777
}
7878

7979
@font-face {
80-
font-family: 'TeX Gyre Adventor';
81-
src: url('texgyreadventor-bold-webfont.eot');
82-
src: url('texgyreadventor-bold-webfont.eot?#iefix') format('embedded-opentype'),
83-
url('texgyreadventor-bold-webfont.woff') format('woff'),
84-
url('texgyreadventor-bold-webfont.ttf') format('truetype'),
85-
url('texgyreadventor-bold-webfont.svg#tex_gyre_adventorbold') format('svg');
86-
font-weight: bold;
87-
font-style: normal;
80+
font-family: 'TeX Gyre Adventor';
81+
src: url('texgyreadventor-bold-webfont.eot');
82+
src: url('texgyreadventor-bold-webfont.eot?#iefix') format('embedded-opentype'),
83+
url('texgyreadventor-bold-webfont.woff') format('woff'),
84+
url('texgyreadventor-bold-webfont.ttf') format('truetype'),
85+
url('texgyreadventor-bold-webfont.svg#tex_gyre_adventorbold') format('svg');
86+
font-weight: bold;
87+
font-style: normal;
8888
}
8989

9090
@font-face {
91-
font-family: 'TeX Gyre Adventor';
92-
src: url('texgyreadventor-bolditalic-webfont.eot');
93-
src: url('texgyreadventor-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
94-
url('texgyreadventor-bolditalic-webfont.woff') format('woff'),
95-
url('texgyreadventor-bolditalic-webfont.ttf') format('truetype'),
96-
url('texgyreadventor-bolditalic-webfont.svg#tex_gyre_adventorbold_italic') format('svg');
97-
font-weight: bold;
98-
font-style: italic;
91+
font-family: 'TeX Gyre Adventor';
92+
src: url('texgyreadventor-bolditalic-webfont.eot');
93+
src: url('texgyreadventor-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
94+
url('texgyreadventor-bolditalic-webfont.woff') format('woff'),
95+
url('texgyreadventor-bolditalic-webfont.ttf') format('truetype'),
96+
url('texgyreadventor-bolditalic-webfont.svg#tex_gyre_adventorbold_italic') format('svg');
97+
font-weight: bold;
98+
font-style: italic;
9999
}
100100

101101
/* Global styles */
102-
.game {
103-
font-family: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-primary);
104-
}
105-
106-
.rollable:hover, .rollable:focus {
102+
@layer variables.base {
103+
body {
104+
--font-body: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
105+
--font-primary: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
106+
--font-h1: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
107+
--font-h2: "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
108+
--font-h3: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
109+
}
110+
111+
body .game .app {
112+
--font-primary: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
113+
}
114+
}
115+
116+
.rollable:hover,
117+
.rollable:focus {
107118
color: #000;
108119
text-shadow: 0 0 10px red;
109120
cursor: pointer;
110121
}
111122

112-
.chat-message {
113-
font-family: "Century Gothic", "TeX Gyre Adventor", var(--font-primary);
123+
.chat-message,
124+
.chat-message h4 {
125+
font-family: "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
114126
}
115127

116128
.chat-message .chat-item-name {
@@ -122,8 +134,8 @@
122134
}
123135

124136
.chat-message .chat-item-description {
125-
font-family: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-primary);
126-
font-size: 14px;
137+
/* font-family: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-sans); */
138+
font-size: 16px;
127139
}
128140

129141
.basicfantasyrpg .success-text,
@@ -374,7 +386,7 @@
374386
/* Styles limited to basicfantasyrpg sheets */
375387

376388
.basicfantasyrpg.sheet.actor {
377-
font-family: "Century Gothic", "TeX Gyre Adventor", "Soutane", var(--font-primary);
389+
font-family: "Century Gothic", "TeX Gyre Adventor", "Soutane", var(--font-sans);
378390
}
379391

380392
.basicfantasyrpg .sheet-header {
@@ -443,7 +455,7 @@
443455
}
444456

445457
.basicfantasyrpg .editor-content {
446-
font-family: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-primary);
458+
font-family: "Soutane", "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
447459
font-size: 18px;
448460
overflow-y: hidden;
449461
}
@@ -476,7 +488,7 @@
476488
font-weight: bold;
477489
}
478490

479-
.basicfantasyrpg .items-header > * {
491+
.basicfantasyrpg .items-header>* {
480492
font-size: 14px;
481493
text-align: center;
482494
}
@@ -537,10 +549,12 @@
537549
display: flex;
538550
}
539551

540-
.basicfantasyrpg .items-list .item-name h3, .basicfantasyrpg .items-list .item-name h4 {
552+
.basicfantasyrpg .items-list .item-name h3,
553+
.basicfantasyrpg .items-list .item-name h4 {
541554
margin: 0;
542555
white-space: nowrap;
543556
overflow-x: hidden;
557+
font-family: "Century Gothic", "TeX Gyre Adventor", var(--font-sans);
544558
}
545559

546560
.basicfantasyrpg .items-list .item-controls {
@@ -613,7 +627,7 @@
613627
font-weight: bold;
614628
}
615629

616-
.basicfantasyrpg .items-list .items-header > * {
630+
.basicfantasyrpg .items-list .items-header>* {
617631
font-size: 12px;
618632
text-align: center;
619633
}

‎system.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"id": "basicfantasyrpg",
33
"title": "Basic Fantasy RPG",
44
"description": "The Basic Fantasy RPG system for FoundryVTT!",
5-
"version": "r14",
5+
"version": "r15",
66
"compatibility": {
77
"minimum": "11",
8-
"verified": "12"
8+
"verified": "13"
99
},
1010
"authors": [
1111
{
@@ -45,6 +45,6 @@
4545
"secondaryTokenAttribute": null,
4646
"url": "https://github.com/orffen/basicfantasyrpg",
4747
"manifest": "https://raw.githubusercontent.com/orffen/basicfantasyrpg/main/system.json",
48-
"download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r14.zip",
48+
"download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r15.zip",
4949
"license": "LICENSE.txt"
50-
}
50+
}

0 commit comments

Comments
 (0)