diff --git a/Cargo.lock b/Cargo.lock index e36a8f4..6837ad1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,12 +333,6 @@ version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - [[package]] name = "byteorder" version = "1.4.3" @@ -1763,12 +1757,6 @@ dependencies = [ "unicase 2.6.0", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -1882,36 +1870,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nom_locate" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e299bf5ea7b212e811e71174c5d1a5d065c4c0ad0c8691ecb1f97e3e66025e" -dependencies = [ - "bytecount", - "memchr", - "nom", -] - -[[package]] -name = "normpath" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04aaf5e9cb0fbf883cc0423159eacdf96a9878022084b35c462c428cab73bcaf" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "normpath" version = "1.1.1" @@ -1967,38 +1925,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.15" @@ -2743,7 +2669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276cac97fcddca93d741a4a530f58969f45a5bdb587f8c6b04c75cf849ca7f4c" dependencies = [ "glob", - "normpath 1.1.1", + "normpath", "notify 5.2.0", "rocket 0.5.0-rc.3", "tera", @@ -2793,23 +2719,6 @@ dependencies = [ "uncased", ] -[[package]] -name = "rsass" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab003a9ff922b4d7b1f5f383bc54645887ad278f534dfc65e071096fcb30023" -dependencies = [ - "fastrand", - "lazy_static", - "nom", - "nom_locate", - "num-bigint", - "num-integer", - "num-rational", - "num-traits", - "tracing", -] - [[package]] name = "rusqlite" version = "0.29.0" @@ -2937,19 +2846,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "sass-rocket-fairing" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d28e2ca5de41fca4b254204d186f0bc15cc09ecc00f807cf1af20c4f0209237d" -dependencies = [ - "normpath 0.3.2", - "notify 4.0.17", - "rocket 0.5.0-rc.3", - "rsass", - "walkdir", -] - [[package]] name = "schannel" version = "0.1.22" @@ -3338,7 +3234,6 @@ dependencies = [ "rocket_contrib", "rocket_dyn_templates", "rusqlite", - "sass-rocket-fairing", "serde", "serde_json", "serde_yaml", diff --git a/Cargo.toml b/Cargo.toml index 856106b..c5a00f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,6 @@ rocket = { version = "=0.5.0-rc.3", features = ["secrets", "json"] } rocket_contrib = { version = "0.4.11", features = ["templates"] } rocket_dyn_templates = { version = "0.1.0-rc.3", features = ["tera"] } rusqlite = { version = "0.29.0", features = ["chrono"] } -sass-rocket-fairing = "0.2.0" serde = "1.0.163" serde_json = "1.0.96" serde_yaml = "0.9.21" diff --git a/shell.nix b/shell.nix index eee66fc..7f6b223 100644 --- a/shell.nix +++ b/shell.nix @@ -19,5 +19,6 @@ pkgs.mkShell { openssl gettext sqlite + dart-sass ]; } diff --git a/src/main.rs b/src/main.rs index 3472744..2c62483 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,6 @@ extern crate rocket; use poise::serenity_prelude::Http; use rocket::{fs::{relative, FileServer}, Rocket, Ignite}; use rocket_dyn_templates::{tera, Template}; -use sass_rocket_fairing::SassFairing; use std::{collections::HashMap, env}; use clap::{Parser, Subcommand}; @@ -114,7 +113,6 @@ async fn rocket() -> Result, rocket::Error> { }, ) })) - .attach(SassFairing::default()) .ignite().await .unwrap() .launch().await diff --git a/styles/.gitignore b/styles/.gitignore new file mode 100644 index 0000000..dac138d --- /dev/null +++ b/styles/.gitignore @@ -0,0 +1 @@ +css diff --git a/styles/css/.gitignore b/styles/css/.gitignore deleted file mode 100644 index 2318862..0000000 --- a/styles/css/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.css \ No newline at end of file diff --git a/styles/sass/style.scss b/styles/sass/style.scss index 2bf823d..900367c 100644 --- a/styles/sass/style.scss +++ b/styles/sass/style.scss @@ -1,7 +1,7 @@ @use "sass:color"; $bg: #FFFDF3; -$bg0: #{color.adjust($bg, $lightness: -5%, $hue: -2%, $saturation: -50%)}; +$bg0: #{color.adjust($bg, $lightness: -5%, $hue: -7deg, $saturation: -50%)}; $fg: #011627; :root {