diff --git a/Ars_Magica_5th/Ars_Magica_5th.css b/Ars_Magica_5th/Ars_Magica_5th.css index 396cff7908..67eee12a5d 100644 --- a/Ars_Magica_5th/Ars_Magica_5th.css +++ b/Ars_Magica_5th/Ars_Magica_5th.css @@ -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; } diff --git a/Ars_Magica_5th/Ars_Magica_5th.html b/Ars_Magica_5th/Ars_Magica_5th.html index a1a16eed2e..4affa5bc7d 100644 --- a/Ars_Magica_5th/Ars_Magica_5th.html +++ b/Ars_Magica_5th/Ars_Magica_5th.html @@ -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); diff --git a/Ars_Magica_5th/__tests__/testFramework.js b/Ars_Magica_5th/__tests__/testFramework.js index a4b3e2cabc..72145ce470 100644 --- a/Ars_Magica_5th/__tests__/testFramework.js +++ b/Ars_Magica_5th/__tests__/testFramework.js @@ -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); diff --git a/Ars_Magica_5th/source/Ars_Magica_5th.scss b/Ars_Magica_5th/source/Ars_Magica_5th.scss index c2977f1cfe..3a07eb7845 100644 --- a/Ars_Magica_5th/source/Ars_Magica_5th.scss +++ b/Ars_Magica_5th/source/Ars_Magica_5th.scss @@ -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'); /* diff --git a/Ars_Magica_5th/source/helpers/_helpers.scss b/Ars_Magica_5th/source/helpers/_helpers.scss index d110d1e71b..325903d3f4 100644 --- a/Ars_Magica_5th/source/helpers/_helpers.scss +++ b/Ars_Magica_5th/source/helpers/_helpers.scss @@ -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 { diff --git a/Ars_Magica_5th/source/helpers/helpers.sheet.js b/Ars_Magica_5th/source/helpers/helpers.sheet.js index c0edf524a7..b45a3c336f 100644 --- a/Ars_Magica_5th/source/helpers/helpers.sheet.js +++ b/Ars_Magica_5th/source/helpers/helpers.sheet.js @@ -37,5 +37,4 @@ const kDeleteAlert = function ({ trigger, attributes, sections }) { k.removeRepeatingRow(`${section}_${rowID}`, attributes, sections); }; -k.registerFuncs({ "kDeleteAlert": kDeleteAlert }); - +k.registerFuncs({ "kDeleteAlert": kDeleteAlert }); \ No newline at end of file diff --git a/Ars_Magica_5th/source/updates/updates.sheet.js b/Ars_Magica_5th/source/updates/updates.sheet.js index 25d51e528d..074a532815 100644 --- a/Ars_Magica_5th/source/updates/updates.sheet.js +++ b/Ars_Magica_5th/source/updates/updates.sheet.js @@ -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);