Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

alert links #608

Merged
merged 3 commits into from
Nov 4, 2024
Merged

alert links #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5ef213
🩹 add `.alert-link` to links in alerts
krmax44 Nov 1, 2024
265295a
⬆️ upgrade froide
krmax44 Nov 1, 2024
3fa76d2
💄 include froide link-styling
krmax44 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h3>Legen Sie eine neue Spende an</h3>
{% endfor %}
</ul>
<p>
<a href="{{ subscription.get_absolute_url }}">Sie können den Betrag oder den Rhythmus Ihrer Dauerspende auf der Detailseite anpassen.</a>
<a href="{{ subscription.get_absolute_url }}" class="alert-link">Sie können den Betrag oder den Rhythmus Ihrer Dauerspende auf der Detailseite anpassen.</a>
Wenn Sie die Zahlungsart ändern wollen, kündigen Sie Ihre Dauerspende bitte und legen Sie hier eine neue an.
</p>
</div>
Expand Down
8 changes: 5 additions & 3 deletions fragdenstaat_de/templates/foirequest/header/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<li>
Auf Ihre Anfrage wurde mehr als drei Monate nicht geantwortet.
&rarr;
<a href="{% url 'klageautomat-info' pk=object.pk %}">Zum Klageautomat</a>
<a href="{% url 'klageautomat-info' pk=object.pk %}" class="alert-link">Zum Klageautomat</a>
</li>
{% endif %}
{% endblock %}
Expand All @@ -29,12 +29,14 @@
{% if "Umwelt" in object.public_body.category_list %}
<div class="alert alert-info">
🌼 Interesse an Umweltinfos? Wir beraten Aktivist*innen und Initiativen kostenlos bei Anfragen.
<a href="https://fragdenstaat.de/aktionen/klima-helpdesk/">Zum Klima-Helpdesk</a>
<a href="https://fragdenstaat.de/aktionen/klima-helpdesk/"
class="alert-link">Zum Klima-Helpdesk</a>
</div>
{% endif %}
{% if "corona" in object.title|lower or "covid" in object.title|lower or "virus" in object.title|lower or "novavax" in object.title|lower %}
<div class="alert alert-warning text-center">
🦠<a href="https://www.rki.de/DE/Content/InfAZ/N/Neuartiges_Coronavirus/nCoV.html">Allgemeine Infos zum Corona-Virus finden Sie hier beim Robert-Koch-Institut</a>🦠
🦠<a href="https://www.rki.de/DE/Content/InfAZ/N/Neuartiges_Coronavirus/nCoV.html"
class="alert-link">Allgemeine Infos zum Corona-Virus finden Sie hier beim Robert-Koch-Institut</a>🦠
</div>
{% endif %}
{% if object|can_write_foirequest:request and object|foirequest_needs_signature %}
Expand Down
4 changes: 3 additions & 1 deletion frontend/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ $fa-font-path: 'font-awesome/fonts';
@font-face {
font-family: 'FontAwesome';
src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}')
src:
url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}')
format('embedded-opentype'),
url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}')
format('woff2'),
Expand Down Expand Up @@ -108,6 +109,7 @@ $fa-font-path: 'font-awesome/fonts';
@import 'froide/frontend/styles/components/dropdown';
@import 'froide/frontend/styles/components/footer';
@import 'froide/frontend/styles/components/forms';
@import 'froide/frontend/styles/components/links';
@import 'froide/frontend/styles/components/js-switches';
@import 'froide/frontend/styles/components/misc';
@import 'header';
Expand Down
20 changes: 10 additions & 10 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ asgiref==3.8.1
# django
# django-countries
async-timeout==4.0.3
# via fragdenstaat-de (pyproject.toml)
# via
# fragdenstaat-de (pyproject.toml)
# aiohttp
attrs==24.2.0
# via
# aiohttp
Expand Down Expand Up @@ -418,6 +420,8 @@ enmerkar==0.7.1
# via django-prices
et-xmlfile==1.1.0
# via openpyxl
exceptiongroup==1.2.2
# via pytest
factory-boy==3.3.1
# via
# fragdenstaat-de (pyproject.toml)
Expand All @@ -440,7 +444,7 @@ filelock==3.16.0
# virtualenv
fonttools==4.53.1
# via weasyprint
froide @ git+https://github.com/okfde/froide.git@40c2374dd24b1bd4f8d7dd2ba31d8dc3a252d2a1
froide @ git+https://github.com/okfde/froide.git@473c57e3eb8c99fad13635331f37eb6d4dac9bf5
# via fragdenstaat-de (pyproject.toml)
froide-campaign @ git+https://github.com/okfde/froide-campaign.git@55a8a36a2ec9862dc160c1f89ed8250229cf55b2
# via fragdenstaat-de (pyproject.toml)
Expand Down Expand Up @@ -854,7 +858,6 @@ setuptools==74.1.2
# django-cms
# geoip2
# ipython
# torch
six==1.16.0
# via
# bleach
Expand Down Expand Up @@ -907,6 +910,12 @@ tinycss2==1.3.0
# cssselect2
# svglib
# weasyprint
tomli==2.0.2
# via
# djlint
# ipdb
# pytest
# sphinx
torch==2.4.1
# via
# fragdenstaat-de (pyproject.toml)
Expand All @@ -921,12 +930,15 @@ traitlets==5.14.3
# matplotlib-inline
typing-extensions==4.12.2
# via
# asgiref
# dj-database-url
# django-countries
# elasticsearch-dsl
# jwcrypto
# multidict
# psycopg
# pyee
# pypdf
# pytest-factoryboy
# python-docx
# torch
Expand Down
12 changes: 9 additions & 3 deletions requirements-production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ asgiref==3.8.1
# django
# django-countries
async-timeout==4.0.3
# via fragdenstaat-de (pyproject.toml)
# via
# fragdenstaat-de (pyproject.toml)
# aiohttp
# redis
attrs==24.2.0
# via
# aiohttp
Expand Down Expand Up @@ -399,7 +402,7 @@ filelock==3.16.0
# via torch
fonttools==4.53.1
# via weasyprint
froide @ git+https://github.com/okfde/froide.git@40c2374dd24b1bd4f8d7dd2ba31d8dc3a252d2a1
froide @ git+https://github.com/okfde/froide.git@473c57e3eb8c99fad13635331f37eb6d4dac9bf5
# via fragdenstaat-de (pyproject.toml)
froide-campaign @ git+https://github.com/okfde/froide-campaign.git@55a8a36a2ec9862dc160c1f89ed8250229cf55b2
# via fragdenstaat-de (pyproject.toml)
Expand Down Expand Up @@ -727,7 +730,6 @@ setuptools==74.1.2
# via
# django-cms
# geoip2
# torch
six==1.16.0
# via
# bleach
Expand Down Expand Up @@ -764,13 +766,17 @@ torchvision==0.19.1
# via fragdenstaat-de (pyproject.toml)
typing-extensions==4.12.2
# via
# asgiref
# dj-database-url
# django-countries
# elasticsearch-dsl
# jwcrypto
# multidict
# psycopg
# pypdf
# python-docx
# torch
# uvicorn
tzdata==2024.1
# via
# celery
Expand Down
10 changes: 7 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ asgiref==3.8.1
# django
# django-countries
async-timeout==4.0.3
# via fragdenstaat-de (pyproject.toml)
# via
# fragdenstaat-de (pyproject.toml)
# aiohttp
attrs==23.2.0
# via
# aiohttp
Expand Down Expand Up @@ -394,7 +396,7 @@ filelock==3.16.0
# via torch
fonttools==4.53.1
# via weasyprint
froide @ git+https://github.com/okfde/froide.git@40c2374dd24b1bd4f8d7dd2ba31d8dc3a252d2a1
froide @ git+https://github.com/okfde/froide.git@473c57e3eb8c99fad13635331f37eb6d4dac9bf5
# via fragdenstaat-de (pyproject.toml)
froide-campaign @ git+https://github.com/okfde/froide-campaign.git@55a8a36a2ec9862dc160c1f89ed8250229cf55b2
# via fragdenstaat-de (pyproject.toml)
Expand Down Expand Up @@ -709,7 +711,6 @@ setuptools==74.1.2
# via
# django-cms
# geoip2
# torch
six==1.16.0
# via
# bleach
Expand Down Expand Up @@ -746,11 +747,14 @@ torchvision==0.19.1
# via fragdenstaat-de (pyproject.toml)
typing-extensions==4.12.2
# via
# asgiref
# dj-database-url
# django-countries
# elasticsearch-dsl
# jwcrypto
# multidict
# psycopg
# pypdf
# python-docx
# torch
tzdata==2024.1
Expand Down