diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/Justfile b/Justfile new file mode 100644 index 0000000..a84b573 --- /dev/null +++ b/Justfile @@ -0,0 +1,18 @@ +build: + #!/bin/bash + set -e + if ! command -v inkscape &> /dev/null; then + echo "inkscape not installed. aborting" + exit 1 + fi + widths=(64 128 256 512 1024) + mkdir -p pngs + for svg in src/logo*.svg; do + for width in "${widths[@]}"; do + filename=$(basename -- "$svg") + filename="${filename%.*}" + inkscape "$svg" --export-type=png --export-filename="pngs/$filename-w$width.png" --export-width="$width" + done + done + inkscape "src/social-card.svg" --export-type=png --export-filename="pngs/social-card.png" --export-width="1920" + diff --git a/README.md b/README.md index 963e79f..148b156 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ # lukin -Brand assets for jasima.app \ No newline at end of file +Brand assets for jasima.app + +## Regenerate PNGs + +```bash +nix develop --command just build +``` + diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..29b411c --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..b2a31a0 --- /dev/null +++ b/flake.nix @@ -0,0 +1,37 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + outputs = + { + self, + nixpkgs, + flake-utils, + ... + }: + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = import nixpkgs { + inherit system; + }; + fontConfigFile = pkgs.makeFontsConf { + fontDirectories = [ pkgs.freefont_ttf ]; + }; + in + with pkgs; + { + devShells.default = mkShell { + buildInputs = [ + inkscape + just + ]; + shellHook = '' + export FONTCONFIG_FILE=${fontConfigFile} + ''; + }; + } + ); +} + diff --git a/jasima/export-pngs.sh b/jasima/export-pngs.sh deleted file mode 100644 index 3c4a68b..0000000 --- a/jasima/export-pngs.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -set -e - -if ! command -v inkscape &> /dev/null; then - echo "inkscape not installed. aborting" - exit 1 -fi - -widths=(64 128 256 512) -mkdir -p pngs -for svg in *.svg; do - for width in "${widths[@]}"; do - filename=$(basename -- "$svg") - filename="${filename%.*}" - inkscape "$svg" --export-type=png --export-filename="pngs/$filename-w$width.png" --export-width="$width" - done -done - diff --git a/jasima/pngs/logomark-colour-w128.png b/jasima/pngs/logomark-colour-w128.png deleted file mode 100644 index 5f496e3..0000000 Binary files a/jasima/pngs/logomark-colour-w128.png and /dev/null differ diff --git a/jasima/pngs/logomark-colour-w256.png b/jasima/pngs/logomark-colour-w256.png deleted file mode 100644 index cbb72e4..0000000 Binary files a/jasima/pngs/logomark-colour-w256.png and /dev/null differ diff --git a/jasima/pngs/logomark-colour-w512.png b/jasima/pngs/logomark-colour-w512.png deleted file mode 100644 index e559d70..0000000 Binary files a/jasima/pngs/logomark-colour-w512.png and /dev/null differ diff --git a/jasima/pngs/logomark-colour-w64.png b/jasima/pngs/logomark-colour-w64.png deleted file mode 100644 index 9b44715..0000000 Binary files a/jasima/pngs/logomark-colour-w64.png and /dev/null differ diff --git a/pngs/logo-colour-w1024.png b/pngs/logo-colour-w1024.png new file mode 100644 index 0000000..ff8a78e Binary files /dev/null and b/pngs/logo-colour-w1024.png differ diff --git a/jasima/pngs/logo-colour-w128.png b/pngs/logo-colour-w128.png similarity index 100% rename from jasima/pngs/logo-colour-w128.png rename to pngs/logo-colour-w128.png diff --git a/jasima/pngs/logo-colour-w256.png b/pngs/logo-colour-w256.png similarity index 100% rename from jasima/pngs/logo-colour-w256.png rename to pngs/logo-colour-w256.png diff --git a/jasima/pngs/logo-colour-w512.png b/pngs/logo-colour-w512.png similarity index 100% rename from jasima/pngs/logo-colour-w512.png rename to pngs/logo-colour-w512.png diff --git a/jasima/pngs/logo-colour-w64.png b/pngs/logo-colour-w64.png similarity index 100% rename from jasima/pngs/logo-colour-w64.png rename to pngs/logo-colour-w64.png diff --git a/pngs/logomark-colour-w1024.png b/pngs/logomark-colour-w1024.png new file mode 100644 index 0000000..2813b29 Binary files /dev/null and b/pngs/logomark-colour-w1024.png differ diff --git a/pngs/logomark-colour-w128.png b/pngs/logomark-colour-w128.png new file mode 100644 index 0000000..863816f Binary files /dev/null and b/pngs/logomark-colour-w128.png differ diff --git a/pngs/logomark-colour-w256.png b/pngs/logomark-colour-w256.png new file mode 100644 index 0000000..0657fe0 Binary files /dev/null and b/pngs/logomark-colour-w256.png differ diff --git a/pngs/logomark-colour-w512.png b/pngs/logomark-colour-w512.png new file mode 100644 index 0000000..2d7f568 Binary files /dev/null and b/pngs/logomark-colour-w512.png differ diff --git a/pngs/logomark-colour-w64.png b/pngs/logomark-colour-w64.png new file mode 100644 index 0000000..bd02304 Binary files /dev/null and b/pngs/logomark-colour-w64.png differ diff --git a/pngs/social-card.png b/pngs/social-card.png new file mode 100644 index 0000000..7892af8 Binary files /dev/null and b/pngs/social-card.png differ diff --git a/social/card.png b/social/card.png deleted file mode 100644 index 1eacf82..0000000 Binary files a/social/card.png and /dev/null differ diff --git a/social/card.svg b/social/card.svg deleted file mode 100644 index f7631a2..0000000 --- a/social/card.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - jasima.app - - - BY GUARDIAN PROJECT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Break through - censorship - Respect user - - - privacy - - - - - diff --git a/jasima/logo-colour.svg b/src/logo-colour.svg similarity index 100% rename from jasima/logo-colour.svg rename to src/logo-colour.svg diff --git a/jasima/logomark-colour.svg b/src/logomark-colour.svg similarity index 65% rename from jasima/logomark-colour.svg rename to src/logomark-colour.svg index 34136a9..44de5de 100644 --- a/jasima/logomark-colour.svg +++ b/src/logomark-colour.svg @@ -1,67 +1,69 @@ - - + + - + - - + + - - - - + + + + + + + + + + + - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/social-card.svg b/src/social-card.svg new file mode 100644 index 0000000..15eb024 --- /dev/null +++ b/src/social-card.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +