From 4e9f888fec5fde729b6deb7ae7962bd59a2ea554 Mon Sep 17 00:00:00 2001 From: Nora Cahill <55991978+NorWhal@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:29:12 -0700 Subject: [PATCH 1/2] Revert "Pendragon 3.0 by Chaosium" --- Pendragon6thEdition/package.json | 2 +- Pendragon6thEdition/pendragon.css | 111 ++- Pendragon6thEdition/pendragon.html | 639 ++---------------- .../src/js/drag_and_drop/get_rep_update.js | 16 - .../src/js/drag_and_drop/handle_horse.js | 24 - .../src/js/drag_and_drop/handle_item.js | 4 - .../src/js/drag_and_drop/handle_squire.js | 7 - .../src/js/drag_and_drop/handle_weapon.js | 4 - .../src/js/drag_and_drop/helpers.js | 28 - .../js/drag_and_drop/reset_repeating_rows.js | 9 - .../src/js/drag_and_drop/reset_skill_list.js | 13 - .../src/js/drag_and_drop/roll_20_attribute.js | 7 - .../src/js/drag_and_drop/update_attack.js | 44 -- .../src/js/drag_and_drop/update_item.js | 13 - .../src/js/drag_and_drop/update_section.js | 5 - Pendragon6thEdition/src/js/drop.js | 210 ------ Pendragon6thEdition/src/js/helpers.js | 82 ++- Pendragon6thEdition/src/js/scripts.js | 17 +- Pendragon6thEdition/src/js/variables.js | 76 --- Pendragon6thEdition/src/js/versioning.js | 96 --- .../src/pages/components/_attacks.scss | 14 +- .../pages/components/_characteristics.scss | 4 - .../src/pages/components/_equipment.scss | 13 +- .../src/pages/components/_squire.scss | 2 - .../src/pages/components/attacks.pug | 43 +- .../src/pages/components/characteristics.pug | 2 +- .../src/pages/components/equipment.pug | 44 +- .../src/pages/components/horse.pug | 17 +- .../src/pages/components/passions.pug | 6 +- .../pages/components/personality-traits.pug | 6 +- .../src/pages/components/skills.pug | 4 +- .../src/pages/components/squire.pug | 7 +- Pendragon6thEdition/src/pages/npc.pug | 1 + Pendragon6thEdition/src/pendragon.pug | 77 +-- .../src/pug/abstracts/mixins.pug | 18 +- .../src/pug/abstracts/variables.pug | 4 +- .../src/scss/components/_shield.scss | 20 +- .../scss/vendor/_repeating-containers.scss | 2 +- .../src/scss/vendor/drop-target.scss | 44 +- Pendragon6thEdition/translation.json | 14 +- 40 files changed, 282 insertions(+), 1467 deletions(-) delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/get_rep_update.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/handle_horse.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/handle_item.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/handle_squire.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/handle_weapon.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/helpers.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/reset_repeating_rows.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/reset_skill_list.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/roll_20_attribute.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/update_attack.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/update_item.js delete mode 100644 Pendragon6thEdition/src/js/drag_and_drop/update_section.js delete mode 100644 Pendragon6thEdition/src/js/drop.js delete mode 100644 Pendragon6thEdition/src/js/variables.js diff --git a/Pendragon6thEdition/package.json b/Pendragon6thEdition/package.json index 9f9ef41939..3ae2f1dedf 100644 --- a/Pendragon6thEdition/package.json +++ b/Pendragon6thEdition/package.json @@ -1,6 +1,6 @@ { "name": "pendragon6thedition", - "version": "3.0.0", + "version": "2.4.2", "description": "You need to run npm start to get the compilers going.", "dependencies": { "20": "^3.1.9", diff --git a/Pendragon6thEdition/pendragon.css b/Pendragon6thEdition/pendragon.css index 294ffc2748..242cef34d0 100644 --- a/Pendragon6thEdition/pendragon.css +++ b/Pendragon6thEdition/pendragon.css @@ -393,9 +393,9 @@ div.sheet-attacks input[name="attr_damage"], div.sheet-attacks span[name*="damage"] { text-align: center; } -div.sheet-attacks div.sheet-table.sheet-damage div.sheet-header, -div.sheet-attacks div.sheet-table.sheet-damage div.sheet-body div.sheet-row { - grid-template-columns: 2fr 1fr 2.5em; } +div.sheet-attacks div.sheet-table.sheet-brawling div.sheet-header, +div.sheet-attacks div.sheet-table.sheet-brawling div.sheet-body div.sheet-row { + grid-template-columns: 2fr 1fr 5em 2.5em; } div.sheet-attacks div.sheet-repeating-container div.sheet-row, div.sheet-attacks div.sheet-repeating-container div.sheet-header { @@ -407,14 +407,6 @@ div.sheet-attacks label[data-i18n-title="other skill"] { div.sheet-attacks input[name="attr_skill"][value*="other"] + label { visibility: visible; } -div.sheet-attacks select[name="attr_skill"] { - margin-left: -5px; } - -div.sheet-attacks h3, -div.sheet-attacks span[data-i18n*="brawling"], -div.sheet-attacks span[name*="damage"] { - color: #000; } - div.sheet-character div.sheet-horse input[type="text"], div.sheet-character div.sheet-horse input[type="number"] { text-align: center; @@ -473,22 +465,8 @@ div.sheet-character div.sheet-squire div.sheet-skill { div.sheet-character div.sheet-squire input[name="attr_squire_age"] { text-align: center; } -div.sheet-character div.sheet-squire div.sheet-notes { - grid-template-columns: 1fr 10px; - padding: 1% 2%; } - div.sheet-character div.sheet-squire div.sheet-notes input.sheet-flag, - div.sheet-character div.sheet-squire div.sheet-notes span.sheet-pictos { - grid-area: 1/2/2/3; } - div.sheet-character div.sheet-squire div.sheet-notes textarea, - div.sheet-character div.sheet-squire div.sheet-notes span.sheet-display { - grid-area: 1/1/2/2; } - -div.sheet-character div.sheet-equipment span[name="attr_value"], -div.sheet-character div.sheet-equipment input[name="attr_value"] { - text-align: center; } - -div.sheet-character div.sheet-equipment div.sheet-col { - grid-template-rows: min-content 1fr; } +div.sheet-character div.sheet-equipment input[name="attr_category"] { + font-weight: bold; } div.sheet-character div.sheet-equipment div.sheet-2autocolumn { align-content: end; } @@ -497,9 +475,6 @@ div.sheet-character div.sheet-equipment span[name="attr_equipment"], div.sheet-character div.sheet-equipment span[name="attr_category"] { min-height: 20px; } -div.sheet-character div.sheet-equipment div.sheet-category { - grid-template-columns: 3fr 1fr; } - div.sheet-character div.sheet-equipment div.sheet-repeating-container div.sheet-flags { grid-template-columns: 1fr 25px; } @@ -520,9 +495,6 @@ div.sheet-character div.sheet-characteristics div.sheet-core { grid-auto-flow: column; grid-column-gap: 2%; } -div.sheet-character div.sheet-characteristics span { - color: #000; } - div.sheet-character h2 { text-overflow: ellipsis; width: fit-content; } @@ -807,18 +779,25 @@ div.sheet-table { /* TABLE ============================= */ div.sheet-shield { - border-radius: 50% 50% 50% 50% / 12% 12% 88% 88%; - border: 5px solid #240202; height: 50px; - width: 50px; } + width: 50px; + border: 5px solid #240202; + border-radius: 50% 50% 50% 50% / 12% 12% 88% 88%; } + div.sheet-shield label, + div.sheet-shield span { + align-items: center; + display: grid; + font-weight: bold; + height: 100%; + justify-content: center; + text-align: center; + width: 100%; } + div.sheet-shield:hover span, div.sheet-shield input[type="number"] { - font-weight: bolder; - width: 3em; } - div.sheet-shield input[type="number"]:placeholder-shown, div.sheet-shield input[type="number"]:hover { - background-color: #fffde7; } - div.sheet-shield input[type="number"]::-webkit-outer-spin-button, div.sheet-shield input[type="number"]::-webkit-inner-spin-button { - -webkit-appearance: none; - margin: 0; } + display: none; } + div.sheet-shield:hover input[type="number"] { + display: inline; + background-color: #fffde7; } /* ROLL TEMPLATE STYLE ----------------------------- */ @@ -927,33 +906,43 @@ div.sheet-repeating-container div.sheet-notes { font-family: "pictos"; z-index: 100; position: absolute; - right: 1.5%; } + left: 85%; } /* DRAG & DROP ============================= */ .sheet-dropzone.active-drop-target.dropping { + opacity: 0.5; + transition: opacity 0.15s ease-in-out; -moz-transition: opacity 0.15s ease-in-out; -webkit-transition: opacity 0.15s ease-in-out; - background-color: transparent; - opacity: 0.5; - transition: opacity 0.15s ease-in-out; } + background-color: transparent; } -.sheet-compendium_warning { +.sheet-compendium_warning, +.sheet-monster_confirm { display: none; } -.sheet-dropzone.active-drop-target.dropping ~ .sheet-compendium_warning { - position: absolute; - background: white; - border-radius: 0.5em; - border: 2px solid #000; - box-shadow: 0 0 50px #000; +.sheet-dropzone.active-drop-target.dropping ~ .sheet-compendium_warning, +.sheet-monster_confirm_flag[value="1"] ~ .sheet-monster_confirm { display: block; - height: 100px; - left: 50%; - margin: -70px 0 0 -170px; - min-height: max-content; - padding: 2em; - text-align: center; + position: fixed; top: 50%; + background: white; + left: 50%; + z-index: 100; + border: 2px solid black; width: 300px; - z-index: 100; } + height: 100px; + text-align: center; + margin: -70px 0 0 -170px; } + +.charsheet input.sheet-licensedsheet[value="1"] ~ .sheet-compendium_warning, +.charsheet input.sheet-licensedsheet[value="1"] ~ .sheet-monster_confirm { + position: absolute !important; + padding: 2em 0 !important; + min-height: max-content; + box-shadow: 0 0 50px #000; + border: 2px solid #000 !important; + border-radius: 0.5em; } + +.sheet-dropzone.active-drop-target.dropping ~ .sheet-compendium_warning span { + line-height: 100px; } diff --git a/Pendragon6thEdition/pendragon.html b/Pendragon6thEdition/pendragon.html index f41e4d8ef9..254ae0b919 100644 --- a/Pendragon6thEdition/pendragon.html +++ b/Pendragon6thEdition/pendragon.html @@ -1,4 +1,4 @@ -


B;#aE~`ALFNUzgeGU#!rTL?R5l?_@M1|Yw8(`g;v`U$9z^WV
z1D+;E(QmCwC`FQtBenwoaffm1WDM|gTSo^eJooUu)NeyK#{E`kr0ajAbmZMCeXjfFDBCyua%YJy!sko}
ze1H_jVyS^`1c~{fo4>n=x;phE+tM;a-a8w=&B)AZZdu^;u+&+666ls>yY|fU#=TMt
zd32qBw||{TvM~|;$Q1)-FAG~%O!e%o*hE9hLcIRSKRu|Jxu~IM@85c7n(OzDJ?Fb|
z^-86j!j3}bko8aR@%(;06-Z1~mq?Xd
+!=MPfLXFxx{ADe9qH$U6GrLolPX(RV>?#c)!$mb3NWI
zCA_Wo;DHYz(=`t_yhi90WKDGag#@o9w;ESR)>i9Hp?mLeUdLP2zB=58|Jtk;_WDH<
z<*qNMI?sJSzE7}k7N|vWoO_elZO1NPPlG#7vog$05qJ0bETd9KX!|+p|vNB8IVv8=0
zrij1ma_wmkD=$v<%(RZMR)1Po#aYZfntWH4{Mj|zsjXh2!UXy1k%zP7+GZ#58S#k}
z6}-ByH4K$lo;qA+X~i|T;b7JB%Fe>$hp>g@a+2_H`*NAKsBc@Fka3&v%}&}L&2uK4
zd2Yh{af?rG$$zz0WxA1i1evqlWV6!+V=t(GeNy_Oc!A@KP}%t?xpI5%np-3zPG=!8fm8sCWd=XQ)(;a0i`566
zl%p}AQ&A-e*!s*e^z1_HA_7G3Gj(?XX9ho0=W~Mwl&?8B6<3s%QA~s$X0hFN^~ji)
ze;_hnk%Rq}HKNtE{g1TI(SK+GhWK_!nv0}iHLjc6Rv8CY+gloVcPy{TOyPf!VDP(4
zbC?an6Eda1vBlea%=;S?CF?O!O?xwIqZ?L4=ch7*Hw4nzs6Q;-$duZA6*R3xch`H!
zGbPrMdFmK>?X-HI{92nV-egBpE)C(1-bbK%A+h`%vtR}*+TOP2=Gx9mcD+{GiPvRA
z3L$~`LTuaEH^qsE=JuGk%g>QjwZUC3y6*yv*xnF?5nO)cin+cMZ_T0>(d%NeaO59Q
zZbAL%%zFBX^LPyMMcBf;jLKL%Gj?|eZaO~+E?MqE5o!B;!DH9Z3?vUMQ_0o0+F0#s
z=l