From 66ab04c9b0cc60ec7e534ee25d33b0c73d218fbc Mon Sep 17 00:00:00 2001 From: Moises Sacal Date: Mon, 18 Dec 2023 12:07:41 +1100 Subject: [PATCH] style changes --- package-lock.json | 18 ++-- package.json | 4 +- src/components/Help.vue | 10 +- src/components/Input.vue | 189 ++++++++++++++++++----------------- src/components/PieChart.vue | 30 +++++- src/styles/element/dark.scss | 2 + 6 files changed, 139 insertions(+), 114 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e4221c..6386a49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,14 @@ { "name": "socrates-web", - "version": "1.0.9", + "version": "1.0.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "socrates-web", - "version": "1.0.9", + "version": "1.0.10", "dependencies": { - "chart.js": "^4.3.0", + "chart.js": "^4.4.1", "element-plus": "^2.3.5", "json-2-csv": "^4.0.0", "lodash": "^4.17.21", @@ -1757,9 +1757,9 @@ } }, "node_modules/chart.js": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz", - "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz", + "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==", "dependencies": { "@kurkle/color": "^0.3.0" }, @@ -5514,9 +5514,9 @@ } }, "chart.js": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz", - "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz", + "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==", "requires": { "@kurkle/color": "^0.3.0" } diff --git a/package.json b/package.json index 53c65be..34a2085 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "socrates-web", "private": true, - "version": "1.0.9", + "version": "1.0.10", "type": "module", "homepage": "https://soil-and-land.github.io/socrates-web/", "scripts": { @@ -10,7 +10,7 @@ "preview": "vite preview" }, "dependencies": { - "chart.js": "^4.3.0", + "chart.js": "^4.4.1", "element-plus": "^2.3.5", "json-2-csv": "^4.0.0", "lodash": "^4.17.21", diff --git a/src/components/Help.vue b/src/components/Help.vue index e74b9e5..6d2c4fb 100644 --- a/src/components/Help.vue +++ b/src/components/Help.vue @@ -6,7 +6,7 @@
-

S.O.C.R.A.T.E.S. Help

+

S.O.C.R.A.T.E.S. Help
@@ -111,10 +111,10 @@ (including roots) will be estimated from these figures.

Model will calculate annual yields

-

When yields are not available, SOCRATES can estimate them using a modified form of the French-Schultz - growing season rainfall (+ stored water) vs yield model (these can be modified by the user if site - specific data is available, see next paragraph). We assume that during as average season crops and - pastures will have available (before evaporation) approximately 70% of the growing season rainfall.

+

When yields are not available, SOCRATES estimates them based on annual rainfall and derivations of + growing season rainfall and stored water combined with water use efficiency. We assume that during as + average season crops and pastures will have available (before evaporation) approximately 70% of the + growing season rainfall.

diff --git a/src/components/Input.vue b/src/components/Input.vue index 4032ce9..77b8c1b 100644 --- a/src/components/Input.vue +++ b/src/components/Input.vue @@ -325,7 +325,7 @@ function scrollToTop(id) { setTimeout(function () { // window.scroll({top: 0, left:0, behavior: 'smooth'}); // document.getElementById(id).scrollIntoView({behavior: 'smooth'}); - const yOffset = -40; + const yOffset = -50; const element = document.getElementById(id); const y = element.getBoundingClientRect().top + window.pageYOffset + yOffset; window.scrollTo({top: y, behavior: 'smooth'}); @@ -372,7 +372,7 @@ function isIterable(obj) {