styling fixes
This commit is contained in:
parent
a9b2bf3560
commit
71c54a21c0
7 changed files with 35 additions and 25 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -2,16 +2,16 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746783057,
|
"lastModified": 1748162331,
|
||||||
"narHash": "sha256-Ksu/8ra1q2OZSiYlUfB2nA6zucDu7xIbe0twESxQpM4=",
|
"narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "09e24d201f135a1f1751e8c9682ed2ba4564c696",
|
"rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "master",
|
"ref": "nixos-25.05",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
19
flake.nix
19
flake.nix
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
description = "Invoiceplane invoice template development shell";
|
description = "Invoiceplane invoice template development shell";
|
||||||
|
|
||||||
inputs.nixpkgs.url = "nixpkgs/master";
|
inputs.nixpkgs.url = "nixpkgs/nixos-25.05";
|
||||||
|
|
||||||
outputs = { self, nixpkgs, ... }@inputs:
|
outputs = { self, nixpkgs, ... }@inputs:
|
||||||
let
|
let
|
||||||
|
|
@ -22,18 +22,23 @@
|
||||||
(self: super: {
|
(self: super: {
|
||||||
froide-govplan = super.froide-govplan.overrideAttrs (oldAttrs: rec {
|
froide-govplan = super.froide-govplan.overrideAttrs (oldAttrs: rec {
|
||||||
src = ./.;
|
src = ./.;
|
||||||
#pkgs.fetchFromGitHub {
|
|
||||||
# owner = "onny";
|
|
||||||
# repo = "froide-govplan";
|
|
||||||
# rev = "81697ce37cfdee7b5d0f667c50b13062ed9786c3";
|
|
||||||
# hash = "sha256-ooHGlCKgZL+TMh6OtopKtbkV0MhT4udLCOIC+C3Ytdw=";
|
|
||||||
#};
|
|
||||||
postInstall = oldAttrs.postInstall + ''
|
postInstall = oldAttrs.postInstall + ''
|
||||||
rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates
|
rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates
|
||||||
ln -sf /var/lib/froide-govplan/templates $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/
|
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; });
|
||||||
|
}
|
||||||
|
)
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
BIN
froide_govplan/static/froide_govplan/images/teaser_image_1.webp
Normal file
BIN
froide_govplan/static/froide_govplan/images/teaser_image_1.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 197 KiB |
|
|
@ -246,6 +246,11 @@
|
||||||
padding-left: 50vw;
|
padding-left: 50vw;
|
||||||
padding-right: 50vw;
|
padding-right: 50vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.no-wrap {
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
{% block extra_css %}
|
{% block extra_css %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
||||||
|
|
@ -190,8 +190,8 @@
|
||||||
|
|
||||||
<footer class="pt-5 text-body-secondary border-top mt-5">
|
<footer class="pt-5 text-body-secondary border-top mt-5">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row g-4">
|
||||||
<div class="col-12 col-md-8">
|
<div class="col-12 col-md-6 col-lg-8">
|
||||||
<a href="/" class="d-flex align-items-center text-body-emphasis text-decoration-none text-reset mb-3">
|
<a href="/" class="d-flex align-items-center text-body-emphasis text-decoration-none text-reset mb-3">
|
||||||
<img src="{% static 'froide_govplan/images/apple-touch-icon.png' %}" class="bi me-2" height="35">
|
<img src="{% static 'froide_govplan/images/apple-touch-icon.png' %}" class="bi me-2" height="35">
|
||||||
<span class="fs-6">VerwaltungsTracker</span>
|
<span class="fs-6">VerwaltungsTracker</span>
|
||||||
|
|
@ -206,7 +206,7 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6 col-md">
|
<div class="col-6 col-md-3 col-lg-2">
|
||||||
<h5>Über uns</h5>
|
<h5>Über uns</h5>
|
||||||
<ul class="list-unstyled text-small">
|
<ul class="list-unstyled text-small">
|
||||||
<li><a class="link-secondary text-decoration-none" href="{% url 'govplan:about' %}">Über uns</a></li>
|
<li><a class="link-secondary text-decoration-none" href="{% url 'govplan:about' %}">Über uns</a></li>
|
||||||
|
|
@ -214,7 +214,7 @@
|
||||||
<li><a class="link-secondary text-decoration-none" href="{% url 'govplan:support' %}">Unterstützen</a></li>
|
<li><a class="link-secondary text-decoration-none" href="{% url 'govplan:support' %}">Unterstützen</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6 col-md">
|
<div class="col-6 col-md-3 col-lg-2">
|
||||||
<h5>Rechtliches</h5>
|
<h5>Rechtliches</h5>
|
||||||
<ul class="list-unstyled text-small">
|
<ul class="list-unstyled text-small">
|
||||||
<li><a class="link-secondary text-decoration-none" href="{% url 'govplan:privacy' %}">Datenchutzerklärung</a></li>
|
<li><a class="link-secondary text-decoration-none" href="{% url 'govplan:privacy' %}">Datenchutzerklärung</a></li>
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
|
|
||||||
{% get_plan_progress object_list as progress %}
|
{% get_plan_progress object_list as progress %}
|
||||||
|
|
||||||
<div class="row" style="align-items: center;">
|
<div class="row" style="align-items: center; row-gap: .5rem;">
|
||||||
<div class="col-sm">
|
<div class="col-sm">
|
||||||
<span class="text-body-secondary{% if not instance.extra_classes or "progress-lg" not in instance.extra_classes %}{% endif %}">{{ progress.count }} Vorhaben</span>
|
<span class="no-wrap text-body-secondary{% if not instance.extra_classes or "progress-lg" not in instance.extra_classes %}{% endif %}">{{ progress.count }} Vorhaben</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<div class="progress" {% if "progress-lg" in instance.extra_classes %}style="height: 1.5rem;"{% endif %}>
|
<div class="progress" {% if "progress-lg" in instance.extra_classes %}style="height: 1.5rem;"{% endif %}>
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,7 @@
|
||||||
|
|
||||||
<div class="row featurette">
|
<div class="row featurette">
|
||||||
<div class="col-md-5 d-flex align-items-center justify-content-center order-1 order-md-2 mb-4">
|
<div class="col-md-5 d-flex align-items-center justify-content-center order-1 order-md-2 mb-4">
|
||||||
<img src="{% static 'froide_govplan/images/magnify_pyramid.webp' %}" height="250px">
|
<img src="{% static 'froide_govplan/images/teaser_image_1.webp' %}" height="250px">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-7 order-2 order-md-1">
|
<div class="col-md-7 order-2 order-md-1">
|
||||||
<h2 class="featurette-heading fw-normal lh-1">We’re watching you! <span class="text-body-secondary">Karlsruhe.</span></h2>
|
<h2 class="featurette-heading fw-normal lh-1">We’re watching you! <span class="text-body-secondary">Karlsruhe.</span></h2>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue