From 5ff85310195021014d25ffb5bcce7c8306d66afb Mon Sep 17 00:00:00 2001 From: Daniel Honus Date: Thu, 9 Mar 2023 09:08:43 +0100 Subject: [PATCH] more readable padding size --- package-lock.json | 20 ++++++++++---------- package.json | 6 +++--- src-tauri/Cargo.lock | 12 ++---------- src-tauri/Cargo.toml | 4 +--- src-tauri/src/routes/parser.rs | 2 -- src/lib/CollapsibleSection.svelte | 4 ++-- src/style.sass | 6 ++---- 7 files changed, 20 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca0f0fd..3f06999 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,21 +1,21 @@ { "name": "arcanum", - "version": "0.0.0", + "version": "1.0.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "arcanum", - "version": "0.0.0", + "version": "1.0.9", "dependencies": { "@tauri-apps/api": "^1.2.0" }, "devDependencies": { - "@sveltejs/vite-plugin-svelte": "^2.0.0", + "@sveltejs/vite-plugin-svelte": "^2.0.3", "@tauri-apps/cli": "^1.2.2", "sass": "^1.58.3", "svelte": "^3.54.0", - "vite": "^4.0.0" + "vite": "^4.0.4" } }, "node_modules/@esbuild/android-arm": { @@ -948,9 +948,9 @@ } }, "node_modules/rollup": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.17.3.tgz", - "integrity": "sha512-p5LaCXiiOL/wrOkj8djsIDFmyU9ysUxcyW+EKRLHb6TKldJzXpImjcRSR+vgo09DBdofGcOoLOsRyxxG2n5/qQ==", + "version": "3.18.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.18.0.tgz", + "integrity": "sha512-J8C6VfEBjkvYPESMQYxKHxNOh4A5a3FlP+0BETGo34HEcE4eTlgCrO2+eWzlu2a/sHs2QUkZco+wscH7jhhgWg==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -1612,9 +1612,9 @@ } }, "rollup": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.17.3.tgz", - "integrity": "sha512-p5LaCXiiOL/wrOkj8djsIDFmyU9ysUxcyW+EKRLHb6TKldJzXpImjcRSR+vgo09DBdofGcOoLOsRyxxG2n5/qQ==", + "version": "3.18.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.18.0.tgz", + "integrity": "sha512-J8C6VfEBjkvYPESMQYxKHxNOh4A5a3FlP+0BETGo34HEcE4eTlgCrO2+eWzlu2a/sHs2QUkZco+wscH7jhhgWg==", "dev": true, "requires": { "fsevents": "~2.3.2" diff --git a/package.json b/package.json index 3ab0ad4..0bf2ca0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "arcanum", "private": true, - "version": "1.0.6", + "version": "1.0.9", "type": "module", "scripts": { "dev": "vite", @@ -13,10 +13,10 @@ "@tauri-apps/api": "^1.2.0" }, "devDependencies": { - "@sveltejs/vite-plugin-svelte": "^2.0.0", + "@sveltejs/vite-plugin-svelte": "^2.0.3", "@tauri-apps/cli": "^1.2.2", "sass": "^1.58.3", "svelte": "^3.54.0", - "vite": "^4.0.0" + "vite": "^4.0.4" } } diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 88b94a4..3924a05 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -54,7 +54,6 @@ dependencies = [ "chrono", "csv", "futures", - "quick-xml 0.27.1", "rand 0.8.5", "reqwest", "rss", @@ -63,7 +62,6 @@ dependencies = [ "tauri", "tauri-build", "tokio", - "xml-rs", ] [[package]] @@ -485,9 +483,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ "csv-core", "itoa 1.0.5", @@ -3996,9 +3994,3 @@ checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ "libc", ] - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 7e29ea9..c71d7b7 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -19,9 +19,7 @@ tauri = { version = "1.2", features = ["fs-all", "shell-open"] } reqwest = { version = "0.11.14", features = ["blocking", "json", "gzip"] } rss = {version = "2.0.2", features = ["serde"] } tokio = "1.25.0" -xml-rs = "0.8.4" -quick-xml = "0.27.1" -csv = "1.2.0" +csv = "1.2.1" rand = "0.8.5" chrono = "0.4.23" futures = "0.3.26" diff --git a/src-tauri/src/routes/parser.rs b/src-tauri/src/routes/parser.rs index d7f5675..e41c344 100644 --- a/src-tauri/src/routes/parser.rs +++ b/src-tauri/src/routes/parser.rs @@ -1,5 +1,3 @@ -extern crate xml; - use std::fs::File; use std::io::BufReader; use std::{io}; diff --git a/src/lib/CollapsibleSection.svelte b/src/lib/CollapsibleSection.svelte index 1a58990..081e5b7 100644 --- a/src/lib/CollapsibleSection.svelte +++ b/src/lib/CollapsibleSection.svelte @@ -34,12 +34,12 @@ align-items: center; gap: .6rem; margin: .3rem 0; - padding: .6rem 0.5rem; + padding: .3rem 0.5rem; background: none; color: whitesmoke; border-radius: 7px; font-weight: bold; - font-size: .9rem; + font-size: .8rem; width: 100%; border: 1px solid transparent; } diff --git a/src/style.sass b/src/style.sass index 2e51b4a..767c80f 100644 --- a/src/style.sass +++ b/src/style.sass @@ -70,11 +70,9 @@ div.layout border-radius: 5px flex: 1 border: 1px solid $border-color - transition: all .2s ease-in-out &:focus outline: none background: #3b3b3b - transition: all .2s ease-in-out div.spinner display: flex justify-content: center @@ -125,12 +123,12 @@ div.layout display: flex flex-direction: row align-items: center - padding: 0.4rem 1.6rem + padding: 0.3rem 1.6rem border-radius: 7px border: 1px solid transparent margin: .3rem 0 p - font-size: 1rem + font-size: .8rem margin: 0 flex: 1 span.count