From bd31b0fa2c1c0a0997c0ad36d0d96912c5e8f329 Mon Sep 17 00:00:00 2001 From: DavidArthurCole Date: Wed, 13 Mar 2024 09:42:05 -0400 Subject: [PATCH 1/3] Change dubcap crate from mk2's asset store to local asset --- www/images/icon_afx_chest_2.png | Bin 0 -> 5598 bytes www/templates/ShipDisplay.vue | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 www/images/icon_afx_chest_2.png diff --git a/www/images/icon_afx_chest_2.png b/www/images/icon_afx_chest_2.png new file mode 100644 index 0000000000000000000000000000000000000000..23a66020ce8a3bd41975d835b73ff376cc9201cf GIT binary patch literal 5598 zcmV<46(Q=0P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00009 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 literal 0 HcmV?d00001 diff --git a/www/templates/ShipDisplay.vue b/www/templates/ShipDisplay.vue index 6e3b104..904ebc0 100644 --- a/www/templates/ShipDisplay.vue +++ b/www/templates/ShipDisplay.vue @@ -24,7 +24,7 @@ > Artifact Crate From 756f30578c4ebd411cfea4f4f14b64c36a00ce02 Mon Sep 17 00:00:00 2001 From: DavidArthurCole Date: Wed, 13 Mar 2024 09:49:27 -0400 Subject: [PATCH 2/3] Better colission detection for View Row --- www/index.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/index.html b/www/index.html index eaf3e8e..943314e 100644 --- a/www/index.html +++ b/www/index.html @@ -2579,7 +2579,13 @@

Known issues

function triggerRowView(event){ rowViewBeingLoaded.value = true; var missionIds = []; - for(const missionChild of event.target.parentNode.parentNode.children[1].children){ + var children = event.target.parentNode.parentNode.children[1].children; + if(children == null || children.length == 0) children = event.target.parentNode.children[1].children; + if(children == null){ + rowViewBeingLoaded.value = false; + return false; + } + for(const missionChild of children){ missionIds.push(missionChild.getAttribute('data-missionid')); } viewRowOfMissions(missionIds); From 8f69c3f96eb04ddf00633e459d095a29d88b38f8 Mon Sep 17 00:00:00 2001 From: DavidArthurCole Date: Fri, 15 Mar 2024 11:53:28 -0400 Subject: [PATCH 3/3] Fix some CSS, fix issue with filter --- VERSION | 2 +- tailwind.config.js | 4 + www/custom.css | 6 +- www/index.html | 237 ++++++++++++++++++++-------------- www/templates/DropDisplay.vue | 16 ++- www/templates/ShipDisplay.vue | 4 +- 6 files changed, 158 insertions(+), 111 deletions(-) diff --git a/VERSION b/VERSION index 66e6750..0edd95c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.9 \ No newline at end of file +1.5.10 \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index 3161f49..d3778fa 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -48,6 +48,7 @@ module.exports = { '40': '10rem', '6/10': '60%', '60vh': '60vh', + '80vh': '80vh', '90vh': '90vh', }, width: { @@ -93,12 +94,14 @@ module.exports = { '1rem': '1rem', '2rem': '2rem', '3rem': '3rem', + '7rem': '7rem', }, margin: { '0': '0rem !important', '025rem': '0.25rem !important', '075rem': '0.75rem', '05rem': '0.5rem', + '2rem': '2rem', }, padding: { '0': '0rem', @@ -106,6 +109,7 @@ module.exports = { '1rem:' : '1rem', '2rem': '2rem', 'select': '2.5rem', + '7rem': '7rem', }, fontSize: { 'star': '1.4rem', diff --git a/www/custom.css b/www/custom.css index 15da29a..364bbad 100644 --- a/www/custom.css +++ b/www/custom.css @@ -171,7 +171,7 @@ content: ''; position: absolute; top: 0; - right: 10%; + right: 7%; width: 20px; height: 100%; border-right: 2px solid; @@ -182,8 +182,8 @@ content: ''; position: absolute; top: 0; - right: 0; - width: 10%; + right: -3%; + width: 12%; height: calc(100%); border-top: 2px solid; border-bottom: 2px solid; diff --git a/www/index.html b/www/index.html index 943314e..6b35a13 100644 --- a/www/index.html +++ b/www/index.html @@ -416,7 +416,7 @@

Known issues

>
-
+
-
+
-
-
+
+
Known issues Known issues
- Filter: + Filter
Known issues +
+
+ + + + + + + + + + + + + + + + + + + + +
+ Drops Sort Method
+ + + + + + + + +
+
- Menno's Ship Data
- - - -
-
- Data last refreshed on {{ lastMennoUpdateString }}
-
- To reduce the load on Menno's API, manual refreshes can be performed once every day +
+ Menno's Ship Data + +
+
+ + + +
+
+ Data last refreshed on {{ lastMennoUpdateString }}
+
+ To reduce the load on Menno's API, manual refreshes can be performed once every day +
@@ -684,8 +703,8 @@

Known issues