diff --git a/flake.lock b/flake.lock index 22b680b..198ad88 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1746783057, - "narHash": "sha256-Ksu/8ra1q2OZSiYlUfB2nA6zucDu7xIbe0twESxQpM4=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09e24d201f135a1f1751e8c9682ed2ba4564c696", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "master", + "ref": "nixos-25.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 6d4643e..04a699a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Invoiceplane invoice template development shell"; - inputs.nixpkgs.url = "nixpkgs/master"; + inputs.nixpkgs.url = "nixpkgs/nixos-25.05"; outputs = { self, nixpkgs, ... }@inputs: let @@ -22,19 +22,24 @@ (self: super: { froide-govplan = super.froide-govplan.overrideAttrs (oldAttrs: rec { src = ./.; - #pkgs.fetchFromGitHub { - # owner = "onny"; - # repo = "froide-govplan"; - # rev = "81697ce37cfdee7b5d0f667c50b13062ed9786c3"; - # hash = "sha256-ooHGlCKgZL+TMh6OtopKtbkV0MhT4udLCOIC+C3Ytdw="; - #}; postInstall = oldAttrs.postInstall + '' rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates ln -sf /var/lib/froide-govplan/templates $out/${pkgs.python3.sitePackages}/froide_govplan/templates cp -r froide_govplan/static $out/${pkgs.python3.sitePackages}/froide_govplan/ ''; }); - }) + + pythonPackagesExtensions = super.pythonPackagesExtensions ++ [ + ( + python-final: python-prev: { + moto = python-prev.moto.overridePythonAttrs (oldAttrs: { doCheck = false; }); + } + ) + ]; + + + + }) ]; }; modules = [ diff --git a/froide_govplan/static/froide_govplan/images/teaser_image_1.webp b/froide_govplan/static/froide_govplan/images/teaser_image_1.webp new file mode 100644 index 0000000..e0bcb6a Binary files /dev/null and b/froide_govplan/static/froide_govplan/images/teaser_image_1.webp differ diff --git a/froide_govplan/templates/cms/mypage.html b/froide_govplan/templates/cms/mypage.html index 9a7d903..cc3597a 100644 --- a/froide_govplan/templates/cms/mypage.html +++ b/froide_govplan/templates/cms/mypage.html @@ -240,12 +240,17 @@ } } -.bg-body-tertiary { - margin-left: -50vw; - margin-right: -50vw; - padding-left: 50vw; - padding-right: 50vw; - } + .bg-body-tertiary { + margin-left: -50vw; + margin-right: -50vw; + padding-left: 50vw; + padding-right: 50vw; + } + + .no-wrap { + white-space: nowrap; + } + {% block extra_css %} {% endblock %} diff --git a/froide_govplan/templates/froide_govplan/base.html b/froide_govplan/templates/froide_govplan/base.html index f0164c1..7ec6ef4 100644 --- a/froide_govplan/templates/froide_govplan/base.html +++ b/froide_govplan/templates/froide_govplan/base.html @@ -190,8 +190,8 @@