Nighthawk/roll20-character-sheets
1
0
Fork 0
mirror of https://github.com/Nighthawk42/roll20-character-sheets.git synced 2026-08-30 03:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of Riernar/arm5-sheet into arm5/fix-font-imports

Browse Source
This commit is contained in:
Riernar
2023-06-29 08:40:57 +02:00
parent 9771c304d3 e6c17cd39f
commit be34efc05c
7 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ars_Magica_5th/Ars_Magica_5th.css
+2 -2
View File
@@ -1,6 +1,6 @@
@import url("https://fonts.googleapis.com/css?family=Material+Icons&display=swap");
@import url("https://fonts.googleapis.com/css?family=Material+Icons|Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200&display=swap");
@import url("https://fonts.googleapis.com/css?family=Delius|Bilbo+Swash+Caps|Kavivanar|Fredericka+the+Great|Macondo|Uncial+Antiqua|Material+Icons|Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200&display=swap");
@import url("https://fonts.googleapis.com/css?family=Material+Icons|Material+Symbols+Outlined&display=swap");
@import url("https://fonts.googleapis.com/css?family=Delius|Bilbo+Swash+Caps|Kavivanar|Fredericka+the+Great|Macondo|Uncial+Antiqua|Material+Icons&display=swap");
.tabs__container:not(.k-active-tab) {
display: none !important;
}
Ars_Magica_5th/Ars_Magica_5th.html
+15 -2
View File
@@ -4469,8 +4469,6 @@ const kDeleteAlert = function ({ trigger, attributes, sections }) {
};
k.registerFuncs({ "kDeleteAlert": kDeleteAlert });
@@ -4664,6 +4662,21 @@ const updateToKScaffold = function updateToKScaffold({ trigger, attributes, sect
};
k.registerFuncs({ updateToKScaffold }, { type: ["new"] });
// const _testAlerts = function ({ trigger, attributes, sections }) {
// ["info", "warning", "error", "success"].forEach(level => {
// kCreateAlert({
// name: "global-alerts",
// title: "test alert",
// text: "test alert\nnewline",
// level,
// attributes,
// sections
// });
// });
// }
// k.registerFuncs({ _testAlerts }, { type: ["opener"] });
// const displayKScaffoldArgs = function ({ trigger, attributes, sections, casc }) {
// console.log("Displaying kScaffold arguments");
// console.log(trigger);
Ars_Magica_5th/__tests__/testFramework.js
+15 -2
View File
@@ -1727,8 +1727,6 @@ const kDeleteAlert = function ({ trigger, attributes, sections }) {
};
k.registerFuncs({ "kDeleteAlert": kDeleteAlert });
@@ -1922,6 +1920,21 @@ const updateToKScaffold = function updateToKScaffold({ trigger, attributes, sect
};
k.registerFuncs({ updateToKScaffold }, { type: ["new"] });
// const _testAlerts = function ({ trigger, attributes, sections }) {
// ["info", "warning", "error", "success"].forEach(level => {
// kCreateAlert({
// name: "global-alerts",
// title: "test alert",
// text: "test alert\nnewline",
// level,
// attributes,
// sections
// });
// });
// }
// k.registerFuncs({ _testAlerts }, { type: ["opener"] });
// const displayKScaffoldArgs = function ({ trigger, attributes, sections, casc }) {
// console.log("Displaying kScaffold arguments");
// console.log(trigger);
Ars_Magica_5th/source/Ars_Magica_5th.scss
+1 -1
View File
@@ -7,7 +7,7 @@
@use 'elements/_elements.scss';
@use 'header/_header.scss';
@import url('https://fonts.googleapis.com/css?family=Delius|Bilbo+Swash+Caps|Kavivanar|Fredericka+the+Great|Macondo|Uncial+Antiqua|Material+Icons|Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200&display=swap');
@import url('https://fonts.googleapis.com/css?family=Delius|Bilbo+Swash+Caps|Kavivanar|Fredericka+the+Great|Macondo|Uncial+Antiqua|Material+Icons&display=swap');
/*
Ars_Magica_5th/source/helpers/_helpers.scss
+1 -1
View File
@@ -1,6 +1,6 @@
@use 'k-scaffold' as k;
@use '../shared/heading_label.scss';
@import url('https://fonts.googleapis.com/css?family=Material+Icons|Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200&display=swap');
@import url('https://fonts.googleapis.com/css?family=Material+Icons|Material+Symbols+Outlined&display=swap');
.ui-dialog .tab-content .charsheet {
Ars_Magica_5th/source/helpers/helpers.sheet.js
+1 -2
View File
@@ -37,5 +37,4 @@ const kDeleteAlert = function ({ trigger, attributes, sections }) {
k.removeRepeatingRow(`${section}_${rowID}`, attributes, sections);
};
k.registerFuncs({ "kDeleteAlert": kDeleteAlert });
k.registerFuncs({ "kDeleteAlert": kDeleteAlert });
Ars_Magica_5th/source/updates/updates.sheet.js
+15
View File
@@ -189,6 +189,21 @@ const updateToKScaffold = function updateToKScaffold({ trigger, attributes, sect
};
k.registerFuncs({ updateToKScaffold }, { type: ["new"] });
// const _testAlerts = function ({ trigger, attributes, sections }) {
// ["info", "warning", "error", "success"].forEach(level => {
// kCreateAlert({
// name: "global-alerts",
// title: "test alert",
// text: "test alert\nnewline",
// level,
// attributes,
// sections
// });
// });
// }
// k.registerFuncs({ _testAlerts }, { type: ["opener"] });
// const displayKScaffoldArgs = function ({ trigger, attributes, sections, casc }) {
// console.log("Displaying kScaffold arguments");
// console.log(trigger);